Merge remote-tracking branch 'upstream/3.1.x' into 3.0.x-into-3.1.x-sync

# Conflicts: # .laminas-ci.json # composer.lock
laminas · Jan 23, 2025 · a9a0ffb · a9a0ffb
2 parents 37f0c2b + 5f1329a
commit a9a0ffb
Show file tree

Hide file tree

Showing 8 changed files with 178 additions and 123 deletions.
diff --git a/.laminas-ci.json b/.laminas-ci.json
@@ -1,6 +1,6 @@
 {
+  "backwardCompatibilityCheck": true,
   "ignore_php_platform_requirements": {
     "8.4": true
-  },
-  "backwardCompatibilityCheck": true
+  }
 }
diff --git a/composer.json b/composer.json
@@ -19,9 +19,9 @@
         "ext-posix": "*",
         "laminas/laminas-cache-storage-adapter-benchmark": "^2.0",
         "laminas/laminas-cache-storage-adapter-test": "^4.1",
-        "laminas/laminas-coding-standard": "~2.4",
+        "laminas/laminas-coding-standard": "~3.0",
         "laminas/laminas-serializer": "^3.0",
-        "phpunit/phpunit": "^10.5",
+        "phpunit/phpunit": "^10.5.35",
         "psalm/plugin-phpunit": "^0.19.0",
         "vimeo/psalm": "^5.18"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Filesystem.php b/src/Filesystem.php
@@ -104,8 +104,8 @@ final class Filesystem extends AbstractMetadataCapableAdapter implements
      */
     private string $lastFileSpec = '';
 
-    private FilesystemInteractionInterface $filesystem;
-    private ClockInterface $clock;
+    private readonly FilesystemInteractionInterface $filesystem;
+    private readonly ClockInterface $clock;
 
     /**
      * @param  null|iterable<string,mixed>|FilesystemOptions $options

diff --git a/src/Filesystem/Exception/MetadataException.php b/src/Filesystem/Exception/MetadataException.php
@@ -16,7 +16,7 @@ final class MetadataException extends RuntimeException
     public const METADATA_MTIME    = 'mtime';
     public const METADATA_FILESIZE = 'filesize';
 
-    private ErrorException $error;
+    private readonly ErrorException $error;
 
     /**
      * @psalm-param MetadataException::METADATA_* $metadata

diff --git a/src/Filesystem/Exception/UnlinkException.php b/src/Filesystem/Exception/UnlinkException.php
@@ -11,7 +11,7 @@
 
 final class UnlinkException extends RuntimeException
 {
-    private ErrorException $error;
+    private readonly ErrorException $error;
 
     public function __construct(string $path, ErrorException $error)
     {

diff --git a/src/FilesystemIterator.php b/src/FilesystemIterator.php
@@ -16,11 +16,6 @@
  */
 final class FilesystemIterator implements IteratorInterface
 {
-    /**
-     * The Filesystem storage instance
-     */
-    private Filesystem $storage;
-
     /**
      * The iterator mode
      *
@@ -31,24 +26,26 @@ final class FilesystemIterator implements IteratorInterface
     /**
      * The GlobIterator instance
      */
-    private GlobIterator $globIterator;
-
-    /**
-     * The namespace sprefix
-     */
-    private string $prefix;
+    private readonly GlobIterator $globIterator;
 
     /**
      * String length of namespace prefix
      */
-    private int $prefixLength;
-
-    public function __construct(Filesystem $storage, string $path, string $prefix)
-    {
-        $this->storage      = $storage;
+    private readonly int $prefixLength;
+
+    public function __construct(
+        /**
+         * The Filesystem storage instance
+         */
+        private readonly Filesystem $storage,
+        string $path,
+        /**
+         * The namespace sprefix
+         */
+        private readonly string $prefix
+    ) {
         $this->globIterator = new GlobIterator($path, GlobIterator::KEY_AS_FILENAME);
-        $this->prefix       = $prefix;
-        $this->prefixLength = strlen($prefix);
+        $this->prefixLength = strlen($this->prefix);
     }
 
     /**

diff --git a/test/unit/FilesystemOptionsTest.php b/test/unit/FilesystemOptionsTest.php
@@ -21,6 +21,7 @@
 use function realpath;
 use function rmdir;
 use function str_replace;
+use function str_starts_with;
 use function strpos;
 use function substr;
 use function sys_get_temp_dir;
@@ -42,7 +43,6 @@ final class FilesystemOptionsTest extends AbstractAdapterOptionsTest
     protected string $keyPattern = FilesystemOptions::KEY_PATTERN;
 
     /**
-     * @param array $out
      * @psalm-assert list<string> $out
      */
     private static function assertAllString(array $out): void
@@ -99,7 +99,7 @@ public function testNormalizeCacheDir(): void
 
     public function testSetCacheDirNotWritableException(): void
     {
-        if (substr(PHP_OS, 0, 3) === 'WIN') {
+        if (str_starts_with(PHP_OS, 'WIN')) {
             self::markTestSkipped('Not testable on windows');
         } else {
             $out = [];
@@ -131,7 +131,7 @@ public function testSetCacheDirNotWritableException(): void
 
     public function testSetCacheDirNotReadableException(): void
     {
-        if (substr(PHP_OS, 0, 3) === 'WIN') {
+        if (str_starts_with(PHP_OS, 'WIN')) {
             self::markTestSkipped('Not testable on windows');
         } else {
             @exec('whoami 2>&1', $out, $ret);