Applied strict types and type declarations to every PHP file.

Fixed issue where ImportSpecification::setProviderName would not accept null.
Fixed some exception message assertions that were not being applied.

Author: Bilge

src/Cache/CacheItem.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Cache;
 
 use Psr\Cache\CacheItemInterface;
@@ -14,41 +16,47 @@ final class CacheItem implements CacheItemInterface
 
     private $hit;
 
-    private function __construct($key, $value, $hit)
+    private function __construct(string $key, $value, bool $hit)
     {
-        $this->key = "$key";
+        $this->key = $key;
         $this->value = $value;
-        $this->hit = (bool)$hit;
+        $this->hit = $hit;
     }
 
-    public function getKey()
+    public function getKey(): string
     {
         return $this->key;
     }
 
+    /**
+     * @return mixed
+     */
     public function get()
     {
         return $this->value;
     }
 
-    public function isHit()
+    public function isHit(): bool
     {
         return $this->hit;
     }
 
-    public function set($value)
+    /**
+     * @param mixed $value
+     */
+    public function set($value): self
     {
         $this->value = $value;
 
         return $this;
     }
 
-    public function expiresAt($expiration)
+    public function expiresAt($expiration): self
     {
         throw new NotImplementedException;
     }
 
-    public function expiresAfter($time)
+    public function expiresAfter($time): self
     {
         throw new NotImplementedException;
     }

src/Cache/CacheKeyGenerator.php

@@ -1,15 +1,17 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Cache;
 
 interface CacheKeyGenerator
 {
-    const RESERVED_CHARACTERS = '{}()/\@:';
+    public const RESERVED_CHARACTERS = '{}()/\@:';
 
     /**
      * @param string $source
      * @param array $sortedOptions Options sorted by key.
      *
      * @return string A PSR-6 compatible cache key.
      */
-    public function generateCacheKey($source, array $sortedOptions);
+    public function generateCacheKey(string $source, array $sortedOptions): string;
 }

src/Cache/CacheUnavailableException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Cache;
 
 use Psr\Cache\CacheException;
@@ -8,7 +10,7 @@
  */
 final class CacheUnavailableException extends \RuntimeException implements CacheException
 {
-    public static function createUnsupported()
+    public static function createUnsupported(): self
     {
         return new self('Cannot cache: connector does not support caching.');
     }

src/Cache/InvalidArgumentException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Cache;
 
 final class InvalidArgumentException extends \InvalidArgumentException implements \Psr\Cache\InvalidArgumentException

src/Cache/InvalidCacheKeyException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Cache;
 
 class InvalidCacheKeyException extends \RuntimeException implements \Psr\Cache\InvalidArgumentException

src/Cache/JsonCacheKeyGenerator.php

@@ -1,9 +1,11 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Cache;
 
 class JsonCacheKeyGenerator implements CacheKeyGenerator
 {
-    public function generateCacheKey($source, array $sortedOptions)
+    public function generateCacheKey(string $source, array $sortedOptions): string
     {
         return str_replace(
             str_split(self::RESERVED_CHARACTERS),

src/Cache/MemoryCache.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Cache;
 
 use Psr\Cache\CacheItemInterface;
@@ -9,42 +11,45 @@
  */
 class MemoryCache extends \ArrayObject implements CacheItemPoolInterface
 {
+    /**
+     * @param string $key
+     *
+     * @return mixed
+     */
     public function getItem($key)
     {
-        return call_user_func(
-            \Closure::bind(
-                function () use ($key) {
-                    return new self($key, $this->hasItem($key) ? $this[$key] : null, $this->hasItem($key));
-                },
-                $this,
-                CacheItem::class
-            )
-        );
+        return \Closure::bind(
+            function () use ($key): CacheItem {
+                return new self($key, $this->hasItem($key) ? $this[$key] : null, $this->hasItem($key));
+            },
+            $this,
+            CacheItem::class
+        )();
     }
 
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = []): iterable
     {
         foreach ($keys as $key) {
             yield $this->getItem($key);
         }
     }
 
-    public function hasItem($key)
+    public function hasItem($key): bool
     {
         return isset($this[$key]);
     }
 
-    public function clear()
+    public function clear(): void
     {
         $this->exchangeArray([]);
     }
 
-    public function deleteItem($key)
+    public function deleteItem($key): void
     {
         unset($this[$key]);
     }
 
-    public function deleteItems(array $keys)
+    public function deleteItems(array $keys): void
     {
         foreach ($keys as $key) {
             if (!$this->hasItem($key)) {
@@ -55,17 +60,17 @@ public function deleteItems(array $keys)
         }
     }
 
-    public function save(CacheItemInterface $item)
+    public function save(CacheItemInterface $item): void
     {
         $this[$item->getKey()] = $item->get();
     }
 
-    public function saveDeferred(CacheItemInterface $item)
+    public function saveDeferred(CacheItemInterface $item): void
     {
         $this->save($item);
     }
 
-    public function commit()
+    public function commit(): bool
     {
         return true;
     }

src/Cache/NotImplementedException.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Cache;
 
 use Psr\Cache\CacheException;

src/Collection/CountablePorterRecords.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Collection;
 
 use ScriptFUSION\Porter\Specification\ImportSpecification;
@@ -12,7 +14,7 @@ class CountablePorterRecords extends PorterRecords implements \Countable
      * @param int $count
      * @param ImportSpecification $specification
      */
-    public function __construct(RecordCollection $records, $count, ImportSpecification $specification)
+    public function __construct(RecordCollection $records, int $count, ImportSpecification $specification)
     {
         parent::__construct($records, $specification);
 

src/Collection/CountableProviderRecords.php

@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 namespace ScriptFUSION\Porter\Collection;
 
 use ScriptFUSION\Porter\Provider\Resource\ProviderResource;
@@ -12,7 +14,7 @@ class CountableProviderRecords extends ProviderRecords implements \Countable
      * @param int $count
      * @param ProviderResource $resource
      */
-    public function __construct(\Iterator $providerRecords, $count, ProviderResource $resource)
+    public function __construct(\Iterator $providerRecords, int $count, ProviderResource $resource)
     {
         parent::__construct($providerRecords, $resource);