PHP 7.0 compatibility

Author: mateuszsip

src/Matcher/ArrayMatcher.php

@@ -72,15 +72,15 @@ public function canMatch($pattern) : bool
 
     public function supportedModifiers(): array
     {
-        return \array_keys(self::SUPPORTED_MODIFIERS);
+        return self::SUPPORTED_MODIFIERS;
     }
 
-    public function getMatchers(): iterable
+    public function getMatchers(): array
     {
         return [$this->propertyMatcher];
     }
 
-    public function applyModifier(MatcherModifier $modifier): void
+    public function applyModifier(MatcherModifier $modifier)
     {
         switch ($modifier->getName()) {
             case IgnoreExtraKeys::NAME:

src/Matcher/ChainMatcher.php

@@ -61,12 +61,12 @@ public function supportedModifiers(): array
         return \array_keys(ModifiersRegistry::BUILT_IN_MODIFIERS);
     }
 
-    public function getMatchers(): iterable
+    public function getMatchers(): array
     {
         return $this->matchers;
     }
 
-    public function applyModifier(MatcherModifier $modifier): void
+    public function applyModifier(MatcherModifier $modifier)
     {
 
     }

src/Matcher/JsonMatcher.php

@@ -79,12 +79,12 @@ public function supportedModifiers(): array
         return \array_keys(self::SUPPORTED_MODIFIERS);
     }
 
-    public function getMatchers(): iterable
+    public function getMatchers(): array
     {
         return [$this->matcher];
     }
 
-    public function applyModifier(MatcherModifier $modifier): void
+    public function applyModifier(MatcherModifier $modifier)
     {
     }
 

src/Matcher/ModifiableMatcher.php

@@ -34,7 +34,7 @@ public function supportsModifier(MatcherModifier $modifier): bool
         return \in_array($modifier->getName(), $this->supportedModifiers(), true);
     }
 
-    public function modify(MatcherModifier $modifier): void
+    public function modify(MatcherModifier $modifier)
     {
         foreach ($this->getMatchers() as $matcher) {
             if ($matcher instanceof ModifiableValueMatcher && $matcher->supportsModifier($modifier)) {
@@ -47,9 +47,12 @@ public function modify(MatcherModifier $modifier): void
     abstract public function supportedModifiers(): array;
 
     /**
-     * @return iterable|ValueMatcher[]
+     * @return ValueMatcher[]
      */
-    abstract public function getMatchers(): iterable;
+    abstract public function getMatchers(): array;
 
-    abstract public function applyModifier(MatcherModifier $modifier): void;
+    /**
+     * @return void
+     */
+    abstract public function applyModifier(MatcherModifier $modifier);
 }

src/Matcher/ModifiableValueMatcher.php

@@ -7,7 +7,10 @@
 
 interface ModifiableValueMatcher extends ValueMatcher
 {
-    public function supportsModifier(MatcherModifier $modifier) : bool;
+    public function supportsModifier(MatcherModifier $modifier): bool;
 
-    public function modify(MatcherModifier $modifier) : void;
+    /**
+     * @return void
+     */
+    public function modify(MatcherModifier $modifier);
 }

src/Matcher/ValueMatcher.php

@@ -4,8 +4,6 @@
 
 namespace Coduo\PHPMatcher\Matcher;
 
-use Coduo\PHPMatcher\Matcher\Modifier\MatcherModifier;
-
 interface ValueMatcher
 {
     /**

src/Parser/ModifiersRegistry.php

@@ -14,7 +14,7 @@ final class ModifiersRegistry
      */
     private $modifiers = [];
 
-    public const BUILT_IN_MODIFIERS = [
+    const BUILT_IN_MODIFIERS = [
         Modifier\IgnoreExtraKeys::NAME => Modifier\IgnoreExtraKeys::class,
         Modifier\CaseInsensitive::NAME => Modifier\CaseInsensitive::class
     ];
@@ -24,7 +24,10 @@ public function __construct()
         $this->modifiers = self::BUILT_IN_MODIFIERS;
     }
 
-    public function register(string $name, string $class): void
+    /**
+     * @return void
+     */
+    public function register(string $name, string $class)
     {
         if (!\class_exists($class) || \is_a($class, Modifier\MatcherModifier::class, true)) {
             throw new UnknownModifierClassException($name, $class);

tests/Matcher/InterceptingModifiableMatcher.php

@@ -17,12 +17,12 @@ public function supportedModifiers(): array
         return \array_keys(ModifiersRegistry::BUILT_IN_MODIFIERS);
     }
 
-    public function getMatchers(): iterable
+    public function getMatchers(): array
     {
         return [];
     }
 
-    public function applyModifier(MatcherModifier $modifier): void
+    public function applyModifier(MatcherModifier $modifier)
     {
         $this->applied[] = $modifier;
     }