the cnd parser has been fixed

Author: dbu

composer.json

@@ -36,10 +36,5 @@
             "PHPCR\\Test\\": "inc/",
             "PHPCR\\Tests\\": "tests/"
         }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "2.1-dev"
-        }
     }
 }

tests/PhpcrUtils/CndParserTest.php

@@ -111,14 +111,6 @@ public function testErrorNoFile()
      */
     public function testScannerErrorComment()
     {
-        /**
-         * Remove this PHP7 only condition after PHPCR-Utils #168
-         * (https://github.com/phpcr/phpcr-utils/issues/168) is closed
-         */
-        if (PHP_MAJOR_VERSION >= 7) {
-            $this->markTestSkipped();
-        }
-
         $this->expectException(ScannerException::class);
 
         $cnd = <<<EOT

tests/Query/QOM/QomTestQueries.php

@@ -442,8 +442,10 @@ public static function getQueries(QueryObjectModelFactoryInterface $factory)
             $factory->createQuery(
                 $factory->selector('file', 'nt:file'),
                 $factory->sameNode('file', '/home node'),
-                array(),
-                array());
+                [],
+                []
+            )
+        ;
 
         /*
         * 6.7.21. ChildNode