Make php7.4 the minimum requirement, update dependencies, add psalm

Author: l-x

.travis.yml

@@ -1,9 +1,7 @@
 language: php
 
 php:
-  - "7.2"
-  - "7.3"
-  - "7.4snapshot"
+  - "7.4"
   - "nightly"
 
 matrix:
@@ -12,6 +10,7 @@ matrix:
 
 script:
   - composer tests
+  - composer psalm
 
 install:
   - travis_retry composer install --no-interaction --prefer-source

composer.json

@@ -13,11 +13,11 @@
         "scn/hydrator-property-values": "Provides a set of easy-to-use property callbacks"
     },
     "require": {
-        "php": "^7.2|^7.3|^7.4"
+        "php": "^7.4|^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.2",
-        "infection/infection": "^0.13.4"
+        "phpunit/phpunit": "^9.4",
+        "vimeo/psalm": "^3.17"
     },
     "autoload": {
       "psr-0": {
@@ -31,6 +31,7 @@
     },
     "scripts": {
       "tests": "@php vendor/bin/phpunit tests/",
+      "psalm": "@php vendor/bin/psalm --no-suggestions --show-info=true --long-progress --stats",
       "coverage": "@php vendor/bin/phpunit tests/ --coverage-html build/coverage"
     }
 }

psalm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+        errorLevel="2"
+        resolveFromConfigFile="true"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="https://getpsalm.org/schema/config"
+        xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src"/>
+        <ignoreFiles>
+            <directory name="vendor"/>
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/Scn/Hydrator/Configuration/ExtractorConfigInterface.php

@@ -6,5 +6,8 @@
 
 interface ExtractorConfigInterface
 {
+    /**
+     * @return array<array-key, callable>
+     */
     public function getExtractorProperties(): array;
 }

src/Scn/Hydrator/Configuration/GenericExtractorConfig.php

@@ -8,15 +8,21 @@ final class GenericExtractorConfig implements ExtractorConfigInterface
 {
 
     /**
-     * @var array
+     * @var array<array-key, callable>
      */
-    private $properties;
+    private array $properties;
 
+    /**
+     * @param array<array-key, callable> $propertyMapping
+     */
     public function __construct(array $propertyMapping)
     {
         $this->properties = $propertyMapping;
     }
 
+    /**
+     * @return array<array-key, callable>
+     */
     public function getExtractorProperties(): array
     {
         return $this->properties;

src/Scn/Hydrator/Configuration/GenericHydratorConfig.php

@@ -8,15 +8,21 @@ final class GenericHydratorConfig implements HydratorConfigInterface
 {
 
     /**
-     * @var array
+     * @var array<array-key, callable>
      */
-    private $properties;
+    private array $properties;
 
+    /**
+     * @param array<array-key, callable> $propertyMapping
+     */
     public function __construct(array $propertyMapping)
     {
         $this->properties = $propertyMapping;
     }
 
+    /**
+     * @return array<array-key, callable>
+     */
     public function getHydratorProperties(): array
     {
         return $this->properties;

src/Scn/Hydrator/Configuration/HydratorConfigInterface.php

@@ -6,5 +6,8 @@
 
 interface HydratorConfigInterface
 {
+    /**
+     * @return array<array-key, callable>
+     */
     public function getHydratorProperties(): array;
 }

src/Scn/Hydrator/Hydrator.php

@@ -12,13 +12,20 @@ final class Hydrator implements HydratorInterface
 {
 
     public const NO_STRICT_KEYS = 0b00000001;
-    public const IGNORE_KEYS =    0b00000010;
-    public const DEFAULT =        0b00000000;
+    public const IGNORE_KEYS = 0b00000010;
+    public const DEFAULT = 0b00000000;
 
+    /**
+     * @param callable $callback
+     * @param object $entity
+     * @param mixed ...$args
+     *
+     * @return mixed
+     */
     private function invoke(callable $callback, object $entity, ...$args)
     {
         if ($callback instanceof \Closure) {
-            $callback = $callback->bindTo($entity, $entity);
+            $callback = $callback->bindTo($entity, $entity) ?: $callback;
         }
 
         return call_user_func_array($callback, $args);
@@ -33,7 +40,7 @@ public function hydrate(
         $hydratorProperties = $config->getHydratorProperties();
 
         if ($flags & static::IGNORE_KEYS) {
-            $data = array_combine(array_keys($hydratorProperties),$data);
+            $data = array_combine(array_keys($hydratorProperties), $data);
         }
 
         if (~$flags & static::NO_STRICT_KEYS) {
@@ -54,6 +61,7 @@ public function extract(ExtractorConfigInterface $config, object $entity): array
         $data = [];
 
         foreach ($config->getExtractorProperties() as $propertyName => $get) {
+            /** @psalm-suppress MixedAssignment */
             $data[$propertyName] = $this->invoke($get, $entity, $propertyName);
         }
 

src/Scn/Hydrator/HydratorInterface.php

@@ -9,7 +9,6 @@
 
 interface HydratorInterface
 {
-
     public function hydrate(HydratorConfigInterface $config, object $entity, array $data, int $flags = 0): void;
 
     public function extract(ExtractorConfigInterface $config, object $entity): array;