Merge pull request #161 from jackalope/php8

allow php 8

.travis.yml

@@ -6,6 +6,7 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - nightly
 
 sudo: false
 

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.4.1
+-----
+
+* Allow PHP 8.0
+
 1.4
 ---
 

composer.json

@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": "^7.2",
+        "php": "^7.2 || ^8.0",
         "ext-xml":"*",
         "ext-dom": "*",
         "ext-curl":"*",
@@ -28,9 +28,9 @@
     },
     "require-dev": {
         "psr/log": "~1.0",
-        "phpcr/phpcr-api-tests": "2.1.21",
+        "phpcr/phpcr-api-tests": "2.1.22",
         "symfony/console": "^2.3 || ^3.4 || ^4.3 || ^5.0",
-	"phpunit/phpunit": "^7.5"
+        "phpunit/phpunit": "^7.5 || ^8.0 || ^9.0"
     },
     "autoload": {
         "psr-0": { "Jackalope\\": "src/" }

phpunit.xml.dist

@@ -6,7 +6,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="true"
          bootstrap="tests/bootstrap.php">
     <php>
         <var name="jackrabbit.uri" value="http://localhost:8080/server" />

src/Jackalope/Transport/Jackrabbit/Client.php

@@ -167,7 +167,7 @@ class Client extends BaseTransport implements JackrabbitClientInterface
 
     /**
      * A list of additional HTTP headers to be sent on each request
-     * @var array[]string
+     * @var string[]
      */
     protected $defaultHeaders = array();
 
@@ -199,7 +199,7 @@ class Client extends BaseTransport implements JackrabbitClientInterface
      *
      * This is our exception to the rule that nothing may be cached in transport.
      *
-     * @var array of strings as returned by getRepositoryDescriptors
+     * @var string[] as returned by getRepositoryDescriptors
      */
     protected $descriptors = null;
 
@@ -293,6 +293,7 @@ protected function getRequest($method, $uri, $addWorkspacePathToUri = true)
             }
         }
 
+        /** @var Request $request */
         $request = $this->factory->get('Transport\\Jackrabbit\\Request', array($this, $curl, $method, $uri));
 
         $request->setCredentials($this->credentials);

tests/Jackalope/Jackrabbit/Query/QOM/QueryObjectModelFactoryTest.php

@@ -20,13 +20,13 @@ class QueryObjectModelFactoryTest extends TestCase
      */
     protected $qb;
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->qf = new QueryObjectModelFactory(new Factory());
         $this->qb = new QueryBuilder($this->qf);
     }
 
-    public function testStatements()
+    public function testStatements(): void
     {
         //simple query, should be sql
         $this->qb->from($this->qf->selector('nt:base', "nt:base"));

tests/Jackalope/Test/JackrabbitTestCase.php

@@ -6,7 +6,7 @@
 
 abstract class JackrabbitTestCase extends TestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();