Merge pull request #163 from phpcr/php71_fix

fix php 7 support

Author: dbu

.travis.yml

@@ -4,6 +4,8 @@ php:
   - 5.4
   - 5.5
   - 5.6
+  - 7.0
+  - 7.1
   - hhvm
 
 env:
@@ -15,6 +17,9 @@ matrix:
   include:
     - php: 5.3
       env: PACKAGE_VERSION=low
+  allow_failures:
+    - php: 7.0
+    - php: 7.1
 
 before_script:
   - composer selfupdate

composer.json

@@ -27,7 +27,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": "^5.3.3|7.0.x|7.1.x",
         "phpcr/phpcr": "~2.1.0",
         "symfony/console": "~2.3|~3.0"
     },

src/PHPCR/Util/QOM/Sql2Scanner.php

@@ -159,12 +159,12 @@ protected function scan($sql2)
             $token = strtok(" \n\t");
         }
 
-        $regexp = '';
+        $regexpTokens = array();
         foreach ($tokens as $token) {
-            $regexp[] = preg_quote($token, '/');
+            $regexpTokens[] = preg_quote($token, '/');
         }
 
-        $regexp = '/^'.implode('([ \t\n]+)', $regexp).'$/';
+        $regexp = '/^'.implode('([ \t\n]+)', $regexpTokens).'$/';
         preg_match($regexp, $sql2, $this->delimiters);
         $this->delimiters[0] = '';
 

tests/PHPCR/Tests/Util/ValueConverterTest.php

@@ -52,7 +52,7 @@ public function dataConversionMatrix()
         ;
         $nodemock
             ->expects($this->any())
-            ->method('isNodetype')
+            ->method('isNodeType')
             ->with('mix:referenceable')
             ->will($this->returnValue(true))
         ;
@@ -406,7 +406,7 @@ public function testConvertNonrefNode()
         ;
         $nodemock
             ->expects($this->once())
-            ->method('isNodetype')
+            ->method('isNodeType')
             ->with('mix:referenceable')
             ->will($this->returnValue(false))
         ;