Merge pull request #199 from phpcr/cnd-parser-fixed

the cnd parser has been fixed

Author: dbu

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

@@ -444,7 +444,8 @@ public static function getQueries(QueryObjectModelFactoryInterface $factory)
                 $factory->sameNode('file', '/home node'),
                 [],
                 []
-            );
+            )
+        ;
 
         /*
         * 6.7.21. ChildNode