PHPStan level max

Makefile

@@ -17,7 +17,7 @@ php-cs-fixer:
 
 PHONY: phpstan
 phpstan:
-	vendor/bin/phpstan analyse --level=5 lib/
+	vendor/bin/phpstan analyse --level=max lib/
 
 .PHONY: changelog
 changelog:

README.md

@@ -34,8 +34,9 @@ To run all the tests you'll need to have redis installed (redis tests wil be ski
 Running the tests:
 
 ```
-$ phpunit
+$ make test
 ```
+
 ## License
 
 MIT, see LICENSE.

lib/Qandidate/Toggle/Condition.php

@@ -21,5 +21,5 @@ abstract class Condition
     /**
      * @return bool True, if the condition holds for the given context
      */
-    abstract public function holdsFor(Context $context);
+    abstract public function holdsFor(Context $context): bool;
 }

lib/Qandidate/Toggle/Context.php

@@ -19,7 +19,9 @@
  */
 class Context
 {
-    /** @var array */
+    /**
+     * @var array
+     */
     private $values = [];
 
     /**
@@ -47,18 +49,13 @@ public function set($key, $value)
 
     /**
      * @param int|string $key
-     *
-     * @return bool
      */
-    public function has($key)
+    public function has($key): bool
     {
         return array_key_exists($key, $this->values);
     }
 
-    /**
-     * @return array|mixed[]
-     */
-    public function toArray()
+    public function toArray(): array
     {
         return $this->values;
     }

lib/Qandidate/Toggle/ContextFactory.php

@@ -30,8 +30,5 @@
  */
 abstract class ContextFactory
 {
-    /**
-     * @return Context
-     */
-    abstract public function createContext();
+    abstract public function createContext(): Context;
 }

lib/Qandidate/Toggle/ExpressionCondition.php

@@ -21,14 +21,17 @@
  */
 class ExpressionCondition extends Condition
 {
+    /**
+     * @var string
+     */
     protected $expression;
-    protected $language;
 
     /**
-     * @param string             $expression The expression to be evaluated
-     * @param ExpressionLanguage $language   The instance of the Expression Language
+     * @var ExpressionLanguage
      */
-    public function __construct($expression, ExpressionLanguage $language)
+    protected $language;
+
+    public function __construct(string $expression, ExpressionLanguage $language)
     {
         $this->expression = $expression;
         $this->language = $language;
@@ -37,7 +40,7 @@ public function __construct($expression, ExpressionLanguage $language)
     /**
      * {@inheritdoc}
      */
-    public function holdsFor(Context $context)
+    public function holdsFor(Context $context): bool
     {
         return true === $this->language->evaluate($this->expression, $context->toArray());
     }

lib/Qandidate/Toggle/Operator.php

@@ -23,5 +23,5 @@ abstract class Operator
      *
      * @return bool True, if the operator applies to the argument
      */
-    abstract public function appliesTo($argument);
+    abstract public function appliesTo($argument): bool;
 }

lib/Qandidate/Toggle/Operator/EqualTo.php

@@ -18,7 +18,7 @@ class EqualTo extends EqualityOperator
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return $argument === $this->value;
     }

lib/Qandidate/Toggle/Operator/GreaterThan.php

@@ -18,7 +18,7 @@ class GreaterThan extends EqualityOperator
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return $argument > $this->value;
     }

lib/Qandidate/Toggle/Operator/GreaterThanEqual.php

@@ -18,7 +18,7 @@ class GreaterThanEqual extends EqualityOperator
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return $argument >= $this->value;
     }

lib/Qandidate/Toggle/Operator/HasIntersection.php

@@ -15,6 +15,9 @@
 
 class HasIntersection extends EqualityOperator
 {
+    /**
+     * @var array
+     */
     private $values;
 
     public function __construct(array $values)
@@ -25,16 +28,13 @@ public function __construct(array $values)
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return null !== $argument
             && array_intersect($argument, $this->values);
     }
 
-    /**
-     * @return array
-     */
-    public function getValues()
+    public function getValues(): array
     {
         return $this->values;
     }

lib/Qandidate/Toggle/Operator/InSet.php

@@ -17,6 +17,9 @@
 
 class InSet extends Operator
 {
+    /**
+     * @var array
+     */
     private $values;
 
     public function __construct(array $values)
@@ -27,16 +30,13 @@ public function __construct(array $values)
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return null !== $argument
             && in_array($argument, $this->values);
     }
 
-    /**
-     * @return array
-     */
-    public function getValues()
+    public function getValues(): array
     {
         return $this->values;
     }

lib/Qandidate/Toggle/Operator/LessThan.php

@@ -18,7 +18,7 @@ class LessThan extends EqualityOperator
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return $argument < $this->value;
     }

lib/Qandidate/Toggle/Operator/LessThanEqual.php

@@ -18,7 +18,7 @@ class LessThanEqual extends EqualityOperator
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return $argument <= $this->value;
     }

lib/Qandidate/Toggle/Operator/MatchesRegex.php

@@ -18,7 +18,7 @@ class MatchesRegex extends EqualityOperator
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return (bool) preg_match($this->value, $argument);
     }

lib/Qandidate/Toggle/Operator/NotInSet.php

@@ -18,7 +18,7 @@ class NotInSet extends InSet
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         return !parent::appliesTo($argument);
     }

lib/Qandidate/Toggle/Operator/Percentage.php

@@ -17,7 +17,14 @@
 
 class Percentage extends Operator
 {
+    /**
+     * @var int
+     */
     private $percentage;
+
+    /**
+     * @var int
+     */
     private $shift;
 
     public function __construct(int $percentage, int $shift = 0)
@@ -29,20 +36,20 @@ public function __construct(int $percentage, int $shift = 0)
     /**
      * {@inheritdoc}
      */
-    public function appliesTo($argument)
+    public function appliesTo($argument): bool
     {
         $asPercentage = (int) $argument % 100;
 
         return $asPercentage >= $this->shift &&
-            $asPercentage < (int) ($this->percentage + $this->shift);
+            $asPercentage < ($this->percentage + $this->shift);
     }
 
-    public function getPercentage()
+    public function getPercentage(): int
     {
         return $this->percentage;
     }
 
-    public function getShift()
+    public function getShift(): int
     {
         return $this->shift;
     }

lib/Qandidate/Toggle/OperatorCondition.php

@@ -28,7 +28,7 @@ class OperatorCondition extends Condition
      * @param string   $key      Name of the value
      * @param Operator $operator Operator to run
      */
-    public function __construct($key, Operator $operator)
+    public function __construct(string $key, Operator $operator)
     {
         $this->key = $key;
         $this->operator = $operator;
@@ -37,7 +37,7 @@ public function __construct($key, Operator $operator)
     /**
      * {@inheritdoc}
      */
-    public function holdsFor(Context $context)
+    public function holdsFor(Context $context): bool
     {
         if (!$context->has($this->key)) {
             return false;
@@ -48,18 +48,12 @@ public function holdsFor(Context $context)
         return $this->operator->appliesTo($argument);
     }
 
-    /**
-     * @return string
-     */
-    public function getKey()
+    public function getKey(): string
     {
         return $this->key;
     }
 
-    /**
-     * @return Operator
-     */
-    public function getOperator()
+    public function getOperator(): Operator
     {
         return $this->operator;
     }

lib/Qandidate/Toggle/Serializer/InMemoryCollectionSerializer.php

@@ -17,10 +17,7 @@
 
 class InMemoryCollectionSerializer
 {
-    /**
-     * @return InMemoryCollection
-     */
-    public function deserialize(array $data)
+    public function deserialize(array $data): InMemoryCollection
     {
         $collection = new InMemoryCollection();
         $serializer = new ToggleSerializer(new OperatorConditionSerializer(new OperatorSerializer()));
@@ -34,10 +31,7 @@ public function deserialize(array $data)
         return $collection;
     }
 
-    /**
-     * @return array
-     */
-    public function serialize(InMemoryCollection $toggleCollection)
+    public function serialize(InMemoryCollection $toggleCollection): array
     {
         $serializer = new ToggleSerializer(new OperatorConditionSerializer(new OperatorSerializer()));
         $ret = [];

lib/Qandidate/Toggle/Serializer/OperatorConditionSerializer.php

@@ -21,6 +21,9 @@
  */
 class OperatorConditionSerializer
 {
+    /**
+     * @var OperatorSerializer
+     */
     private $operatorSerializer;
 
     public function __construct(OperatorSerializer $operatorSerializer)
@@ -37,10 +40,7 @@ public function serialize(OperatorCondition $condition): array
         ];
     }
 
-    /**
-     * @return OperatorCondition
-     */
-    public function deserialize(array $condition)
+    public function deserialize(array $condition): OperatorCondition
     {
         $this->assertHasKey('name', $condition);
         $this->assertHasKey('key', $condition);
@@ -55,7 +55,7 @@ public function deserialize(array $condition)
         return new OperatorCondition($condition['key'], $operator);
     }
 
-    private function assertHasKey($key, array $data)
+    private function assertHasKey(string $key, array $data): void
     {
         if (!array_key_exists($key, $data)) {
             throw new RuntimeException(sprintf('Missing key "%s" in data.', $key));

lib/Qandidate/Toggle/Serializer/OperatorSerializer.php

@@ -59,10 +59,7 @@ public function serialize(Operator $operator): array
         }
     }
 
-    /**
-     * @return Operator
-     */
-    public function deserialize(array $operator)
+    public function deserialize(array $operator): Operator
     {
         $this->assertHasKey('name', $operator);
 
@@ -114,7 +111,7 @@ public function deserialize(array $operator)
         }
     }
 
-    private function assertHasKey($key, array $data)
+    private function assertHasKey(string $key, array $data): void
     {
         if (!array_key_exists($key, $data)) {
             throw new RuntimeException(sprintf('Missing key "%s" in data.', $key));