Merge pull request #25 from WikibaseSolutions/valid-identifier

Make sure identifier starts with letter

Author: marijnvanwezel

src/Variable.php

@@ -157,6 +157,6 @@ public function toQuery(): string
      */
     private static function generateUUID(int $length): string
     {
-        return substr(bin2hex(openssl_random_pseudo_bytes(ceil($length / 2))), 0, $length);
+        return 'var' . substr(bin2hex(openssl_random_pseudo_bytes(ceil($length / 2))), 0, $length);
     }
 }

tests/Unit/Patterns/NodeTest.php

@@ -204,7 +204,7 @@ public function testPropertyWithoutName()
     {
         $node = new Node();
 
-        $this->assertMatchesRegularExpression("/^[0-9a-f]+\.foo$/", $node->property('foo')->toQuery());
+        $this->assertMatchesRegularExpression("/^var[0-9a-f]+\.foo$/", $node->property('foo')->toQuery());
     }
 
     public function provideOnlyLabelData(): array

tests/Unit/QueryTest.php

@@ -96,7 +96,7 @@ public function testVariableEmpty()
     {
         $this->assertInstanceOf(Variable::class, Query::variable());
 
-        $this->assertMatchesRegularExpression('/[0-9a-f]+/', Query::variable()->toQuery());
+        $this->assertMatchesRegularExpression('/var[0-9a-f]+/', Query::variable()->toQuery());
     }
 
     public function testParameter()
@@ -241,7 +241,7 @@ public function testReturningWithNode()
 
         $statement = (new Query())->returning($node)->build();
 
-        $this->assertMatchesRegularExpression("/(RETURN [0-9a-f]+)/", $statement);
+        $this->assertMatchesRegularExpression("/(RETURN var[0-9a-f]+)/", $statement);
 
         $node = Query::node("m");
         $node->named('example');
@@ -408,7 +408,7 @@ public function testWithWithNode()
 
         $statement = (new Query())->with($node)->build();
 
-        $this->assertMatchesRegularExpression("/(WITH [0-9a-f]+)/", $statement);
+        $this->assertMatchesRegularExpression("/(WITH var[0-9a-f]+)/", $statement);
 
         $node = Query::node("m");
         $node->named('example');
@@ -886,7 +886,7 @@ public function testAutomaticIdentifierGeneration()
     {
         $node = Query::node();
 
-        $this->assertMatchesRegularExpression('/[0-9a-f]+\.foo/', $node->property('foo')->toQuery());
+        $this->assertMatchesRegularExpression('/var[0-9a-f]+\.foo/', $node->property('foo')->toQuery());
 
         $node->named('foo');
 
@@ -895,7 +895,7 @@ public function testAutomaticIdentifierGeneration()
         $node = Query::node();
         $statement = Query::new()->match($node)->returning($node)->build();
 
-        $this->assertMatchesRegularExpression('/MATCH \([0-9a-f]+\) RETURN [0-9a-f]+/', $statement);
+        $this->assertMatchesRegularExpression('/MATCH \(var[0-9a-f]+\) RETURN var[0-9a-f]+/', $statement);
 
         $node = Query::node();
 

tests/Unit/VariableTest.php

@@ -46,11 +46,11 @@ public function testEmptyConstructor()
     {
         $variable = new Variable();
 
-        $this->assertMatchesRegularExpression('/[0-9a-f]+/', $variable->toQuery());
+        $this->assertMatchesRegularExpression('/var[0-9a-f]+/', $variable->toQuery());
 
         $variable = new Variable(null);
 
-        $this->assertMatchesRegularExpression('/[0-9a-f]+/', $variable->toQuery());
+        $this->assertMatchesRegularExpression('/var[0-9a-f]+/', $variable->toQuery());
     }
 
     /**