CS

Author: Toflar

src/DataStore/DataStoreInterface.php

@@ -6,13 +6,13 @@ interface DataStoreInterface
 {
     public function add(int $state, string $string): void;
 
-    public function remove(int $state, string $string): void;
-
     /**
      * Returns the matching strings per state. Key is the state and the value is an array of matching strings
      * for that state.
      *
      * @return array<int,array<string>>
      */
     public function getForStates(array $states = []): array;
+
+    public function remove(int $state, string $string): void;
 }

src/DataStore/InMemoryDataStore.php

@@ -14,6 +14,16 @@ public function add(int $state, string $string): void
         $this->data[$state][] = $string;
     }
 
+    public function all(): array
+    {
+        return $this->data;
+    }
+
+    public function getForStates(array $states = []): array
+    {
+        return array_intersect_key($this->data, array_flip($states));
+    }
+
     public function remove(int $state, string $string): void
     {
         $updated = array_values(array_diff($this->data[$state] ?? [], [$string]));
@@ -24,14 +34,4 @@ public function remove(int $state, string $string): void
             unset($this->data[$state]);
         }
     }
-
-    public function all(): array
-    {
-        return $this->data;
-    }
-
-    public function getForStates(array $states = []): array
-    {
-        return array_intersect_key($this->data, array_flip($states));
-    }
 }

src/DataStore/NullDataStore.php

@@ -9,13 +9,13 @@ public function add(int $state, string $string): void
         // noop
     }
 
-    public function remove(int $state, string $string): void
+    public function getForStates(array $states = []): array
     {
-        // noop
+        return [];
     }
 
-    public function getForStates(array $states = []): array
+    public function remove(int $state, string $string): void
     {
-        return [];
+        // noop
     }
 }

src/StateSet/InMemoryStateSet.php

@@ -17,11 +17,6 @@ public function add(int $state): void
         $this->states[$state] = true;
     }
 
-    public function remove(int $state): void
-    {
-        unset($this->states[$state]);
-    }
-
     public function all(): array
     {
         return array_keys($this->states);
@@ -31,4 +26,9 @@ public function has(int $state): bool
     {
         return isset($this->states[$state]);
     }
+
+    public function remove(int $state): void
+    {
+        unset($this->states[$state]);
+    }
 }

src/StateSet/StateSetInterface.php

@@ -6,12 +6,12 @@ interface StateSetInterface
 {
     public function add(int $state): void;
 
-    public function remove(int $state): void;
-
     /**
      * @return array<int>
      */
     public function all(): array;
 
     public function has(int $state): bool;
+
+    public function remove(int $state): void;
 }

src/StateSetIndex.php

@@ -218,20 +218,6 @@ public function removeFromIndex(array $strings): void
         }
     }
 
-    /**
-     * Returns true if a state exists that follows the given state
-     */
-    private function hasNextState(int $state): bool
-    {
-        for ($c = 1; $c <= $this->config->getAlphabetSize(); ++$c) {
-            if ($this->stateSet->has($state * $this->config->getAlphabetSize() + $c)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     private function getReachableStates(int $startState, int $editDistance, int $currentDistance = 0): CostAnnotatedStateSet
     {
         $reachable = new CostAnnotatedStateSet();
@@ -257,6 +243,20 @@ private function getReachableStates(int $startState, int $editDistance, int $cur
         return $reachable;
     }
 
+    /**
+     * Returns true if a state exists that follows the given state
+     */
+    private function hasNextState(int $state): bool
+    {
+        for ($c = 1; $c <= $this->config->getAlphabetSize(); ++$c) {
+            if ($this->stateSet->has($state * $this->config->getAlphabetSize() + $c)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param \Closure(int) $closure
      */