Refactor

Author: ethan-snowshoe

src/Document/Document.php

@@ -23,6 +23,18 @@ public function __construct($id = null)
         $this->id = $id ?? uniqid(true);
     }
 
+    protected function addFieldsToProperties($properties): array
+    {
+        /** @var FieldInterface $field */
+        foreach (get_object_vars($this) as $field) {
+            if ($field instanceof FieldInterface && !is_null($field->getValue())) {
+                $properties[] = $field->getName();
+                $properties[] = $field->getValue();
+            }
+        }
+        return $properties;
+    }
+
     public function getHashDefinition(array $prefixes = null): array
     {
         $id = $this->getId();
@@ -45,15 +57,7 @@ public function getHashDefinition(array $prefixes = null): array
             $properties[] = 'REPLACE';
         }
 
-        /** @var FieldInterface $field */
-        foreach (get_object_vars($this) as $field) {
-            if ($field instanceof FieldInterface && !is_null($field->getValue())) {
-                $properties[] = $field->getName();
-                $properties[] = $field->getValue();
-            }
-        }
-
-        return $properties;
+        return $this->addFieldsToProperties($properties);
     }
 
     public function getDefinition(): array
@@ -91,14 +95,7 @@ public function getDefinition(): array
 
         $properties[] = 'FIELDS';
 
-        /** @var FieldInterface $field */
-        foreach (get_object_vars($this) as $field) {
-            if ($field instanceof FieldInterface && !is_null($field->getValue())) {
-                $properties[] = $field->getName();
-                $properties[] = $field->getValue();
-            }
-        }
-        return $properties;
+        return $this->addFieldsToProperties($properties);
     }
 
     public function getId(): string

tests/RediSearch/IndexTest.php

@@ -733,7 +733,7 @@ public function testSetStopWordsOnCreateIndex()
         $this->assertEquals(1, $result->getCount());
     }
 
-    public function testWithPrefix()
+    public function testShouldNotSearchEveryIndexWhenAPrefixIsSpecified()
     {
         $expectedFirstResult = 'Jack';
         $firstPrefix = 'Foo';
@@ -757,16 +757,14 @@ public function testWithPrefix()
         $this->assertEquals($expectedFirstResult, $firstResult->getDocuments()[0]->name);
     }
 
-    public function testWithoutPrefix()
+    public function testShouldSearchEveryIndexWhenAPrefixIsNotSpecified()
     {
         $expectedDocuments = 1;
         $expectedName = 'Jack';
-        $firstIndex = (new Index($this->redisClient, 'first'))
-            ->addTextField('name');
+        $firstIndex = (new Index($this->redisClient, 'first'))->addTextField('name');
         $firstIndex->create();
         $firstIndex->add([new TextField('name', $expectedName)]);
-        $secondIndex = (new Index($this->redisClient, 'second'))
-            ->addTextField('name');
+        $secondIndex = (new Index($this->redisClient, 'second'))->addTextField('name');
         $secondIndex->create();
 
         $firstResult = $firstIndex->search($expectedName);