24-increase-phpstan-level-to-10

jgivoni · Feb 12, 2025 · b3b7d6b · b3b7d6b
1 parent 9cc9e95
commit b3b7d6b
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/aliases b/aliases
@@ -0,0 +1,6 @@
+# Source this file with `. ./aliases` to use the following shortcuts when developing:
+alias d='docker compose exec -it php "$@"'
+alias php='d php "$@"'
+alias composer='d composer "$@"'
+alias phpstan='d vendor/bin/phpstan analyze "$@"'
+alias phpunit='d vendor/bin/phpunit "$@"'
diff --git a/composer.sh b/composer.sh
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,12 +1,6 @@
 parameters:
-    level: 9
+    level: 10
 
     paths:
         - src
         - tests
-
-    # ignoreErrors:
-    #     - "/no value type specified in iterable type array\\.$/"
-    #     - "/is always (true|false)\\.$/"
-
-    reportUnmatchedIgnoredErrors: false
diff --git a/phpstan.sh b/phpstan.sh
diff --git a/phpunit.sh b/phpunit.sh
diff --git a/src/CacheAdapter.php b/src/CacheAdapter.php
@@ -246,10 +246,10 @@ public function visibility(string $path): FileAttributes
         try {
             return $this->getFileAttributes(
                 path: $path,
-                loader: function () use ($path) {
+                loader: function () use ($path): FileAttributes {
                     return $this->adapter->visibility($path);
                 },
-                attributeAccessor: function (FileAttributes $fileAttributes) {
+                attributeAccessor: function (FileAttributes $fileAttributes): ?string {
                     return $fileAttributes->visibility();
                 },
             );
@@ -266,10 +266,10 @@ public function mimeType(string $path): FileAttributes
         try {
             return $this->getFileAttributes(
                 path: $path,
-                loader: function () use ($path) {
+                loader: function () use ($path): FileAttributes {
                     return $this->adapter->mimeType($path);
                 },
-                attributeAccessor: function (FileAttributes $fileAttributes) {
+                attributeAccessor: function (FileAttributes $fileAttributes): ?string {
                     return $fileAttributes->mimeType();
                 },
             );
@@ -286,10 +286,10 @@ public function lastModified(string $path): FileAttributes
         try {
             return $this->getFileAttributes(
                 path: $path,
-                loader: function () use ($path) {
+                loader: function () use ($path): FileAttributes {
                     return $this->adapter->lastModified($path);
                 },
-                attributeAccessor: function (FileAttributes $fileAttributes) {
+                attributeAccessor: function (FileAttributes $fileAttributes): ?int {
                     return $fileAttributes->lastModified();
                 },
             );
@@ -306,10 +306,10 @@ public function fileSize(string $path): FileAttributes
         try {
             return $this->getFileAttributes(
                 path: $path,
-                loader: function () use ($path) {
+                loader: function () use ($path): FileAttributes {
                     return $this->adapter->fileSize($path);
                 },
-                attributeAccessor: function (FileAttributes $fileAttributes) {
+                attributeAccessor: function (FileAttributes $fileAttributes): ?int {
                     return $fileAttributes->fileSize();
                 },
             );
@@ -331,22 +331,28 @@ public function checksum(string $path, Config $config): string
 
         $metadataKey = isset($algo) ? 'checksum_' . $algo : 'checksum';
 
-        $attributeAccessor = function (StorageAttributes $storageAttributes) use ($metadataKey) {
+        $attributeAccessor = function (StorageAttributes $storageAttributes) use ($metadataKey): ?string {
             if (\is_a($this->adapter, 'League\Flysystem\AwsS3V3\AwsS3V3Adapter')) {
                 // Special optimization for AWS S3, but won't break if adapter not installed
                 $etag = $storageAttributes->extraMetadata()['ETag'] ?? \null;
-                if (isset($etag)) {
-                    $checksum = trim($etag, '" ');
+                if (is_string($etag)) {
+                    return trim($etag, '" ');
                 }
             }
 
-            return $checksum ?? $storageAttributes->extraMetadata()[$metadataKey] ?? \null;
+            $checksum = $storageAttributes->extraMetadata()[$metadataKey] ?? \null;
+
+            if (isset($checksum) && !is_string($checksum)) {
+                throw new RuntimeException('Checksum must be a string.');
+            }
+
+            return $checksum;
         };
 
         try {
             $fileAttributes = $this->getFileAttributes(
                 path: $path,
-                loader: function () use ($path, $config, $metadataKey) {
+                loader: function () use ($path, $config, $metadataKey): FileAttributes {
                     // This part is "mirrored" from FileSystem class to provide the fallback mechanism
                     // and be able to cache the result
                     try {
@@ -363,11 +369,11 @@ public function checksum(string $path, Config $config): string
                 },
                 attributeAccessor: $attributeAccessor
             );
+
+            return $attributeAccessor($fileAttributes) ?? '';
         } catch (RuntimeException $e) {
             throw new UnableToProvideChecksum($e->getMessage(), $path, $e);
         }
-
-        return $attributeAccessor($fileAttributes);
     }
 
     /**

diff --git a/src/CacheItemsTrait.php b/src/CacheItemsTrait.php
@@ -117,8 +117,8 @@ protected static function mergeDirectoryAttributes(
      * Returns FileAttributes from cache if desired attribute is found,
      * or loads the desired missing attribute from the adapter and merges it with the cached attributes.
      *
-     * @param Closure $loader Returns FileAttributes with the desired attribute loaded from adapter
-     * @param Closure $attributeAccessor Returns value of desired attribute from cached item
+     * @param Closure(): FileAttributes $loader Returns FileAttributes with the desired attribute loaded from adapter
+     * @param Closure(FileAttributes): mixed $attributeAccessor Returns value of desired attribute from cached item
      */
     protected function getFileAttributes(
         string $path,