More tests for backticks and remove redundant check

Author: Wout Gevaert

src/Traits/EscapeTrait.php

@@ -33,18 +33,16 @@ trait EscapeTrait
 {
     /**
      * Escapes a 'name' if it needs to be escaped.
+     * @see https://neo4j.com/docs/cypher-manual/4.4/syntax/naming
      * A 'name' in cypher is any string that should be included directly in a cypher query,
      * such as variable names, labels, property names and relation types
      *
-     * Note that empty strings are usually not allowed as names, so these should not be passed to this function.
-     * However, some neo4j versions do not crash on empty string as variable name, so let's just escape them anyways.
-     *
      * @param string $name
      * @return string
      */
     public static function escape(string $name): string
     {
-        if ($name !== '' && preg_match('/^\p{L}[\p{L}\d_]*$/u', $name)) {
+        if (preg_match('/^\p{L}[\p{L}\d_]*$/u', $name)) {
             return $name;
         }
 
@@ -57,7 +55,6 @@ public static function escape(string $name): string
      */
     public static function escapeRaw($name)
     {
-
         // Escape backticks that are included in $name by doubling them.
         $name = str_replace('`', '``', $name);
 

tests/Unit/Patterns/NodeTest.php

@@ -48,6 +48,7 @@ public function testEmptyNode(): void
         $this->assertSame($name, $node->getVariable());
     }
 
+    // Further tests can be found in Traits/EscapeTraitTest
     public function testBacktickIsEscaped(): void
     {
         $node = new Node();

tests/Unit/Traits/EscapeTraitTest.php

@@ -65,11 +65,6 @@ public function testUnsafeValueIsEscaped(string $value)
         $this->assertSame($expected, $actual);
     }
 
-    public function testValueWithBacktickIsProperlyEscaped()
-    {
-        $this->assertSame('`foo``bar`', $this->trait->escape("foo`bar"));
-    }
-
     public function provideSafeValueIsNotEscapedData(): array
     {
         return [
@@ -104,4 +99,23 @@ public function provideUnsafeValueIsEscapedData(): array
             ['2'],
         ];
     }
+
+    /**
+     * @dataProvider provideValueWithBacktickIsProperlyEscapedData
+     */
+    public function testValueWithBacktickIsProperlyEscaped($input, $expected)
+    {
+        $this->assertSame('`foo``bar`', $this->trait->escape("foo`bar"));
+    }
+
+    public function provideValueWithBacktickIsProperlyEscapedData(): array
+    {
+        return [
+            ['foo`bar','`foo``bar`'],
+            ['`foo','```foo`'],
+            ['foo`','`foo```'],
+            ['foo``bar','`foo````bar`'],
+            ['`foo`','```foo```'],
+        ];
+    }
 }