Merge pull request #6 from webalternatif/php83

✨ Add support of PHP 8.3

.github/workflows/test.yml

@@ -16,6 +16,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
     steps:
       - uses: actions/checkout@v2
 
@@ -53,6 +54,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
     steps:
       - uses: actions/checkout@v2
 
@@ -90,6 +92,7 @@ jobs:
           - "8.0"
           - "8.1"
           - "8.2"
+          - "8.3"
     steps:
       - uses: actions/checkout@v2
 

CHANGELOG.md

@@ -1,5 +1,9 @@
 ## v0.4.3 (unreleased)
 
+### ✨ New features
+
+* Add support of PHP 8.3
+
 ### 🐛 Bug fixes
 
 * Use Guzzle's CachingStream to replicate a file ([#5](https://github.com/webalternatif/flysystem-failover-bundle/pull/5))

composer.json

@@ -12,7 +12,7 @@
         }
     ],
     "require": {
-        "php": "8.0.* || 8.1.* || 8.2.*",
+        "php": "8.0.* || 8.1.* || 8.2.* || 8.3.*",
         "guzzlehttp/psr7": "^2.0",
         "league/flysystem": "^3.0",
         "nyholm/dsn": "^2.0",
@@ -31,9 +31,9 @@
         "infection/infection": "^0.25.0",
         "league/flysystem-memory": "^3.0",
         "phpunit/phpunit": "^9.5",
-        "psalm/plugin-phpunit": "^0.15.1",
+        "psalm/plugin-phpunit": "^0.18.4",
         "symfony/serializer": "^5.3",
-        "vimeo/psalm": "^4.10"
+        "vimeo/psalm": "^5.19"
     },
     "conflict": {
         "doctrine/dbal": "<2.13.1"

psalm.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0"?>
 <psalm
     errorLevel="1"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
     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"

src/DependencyInjection/WebfFlysystemFailoverExtension.php

@@ -227,7 +227,7 @@ private function registerMessageRepository(
                         ->setArguments([
                             new Reference(sprintf(
                                 'doctrine.dbal.%s_connection',
-                                $dsn->getHost() ?: 'default'
+                                $dsn->getHost() ?? 'default'
                             )),
                         ])
                 );

src/Flysystem/FailoverAdaptersLocator.php

@@ -11,6 +11,9 @@
 
 /**
  * @template T of FilesystemAdapter
+ *
+ * @template-implements FailoverAdaptersLocatorInterface<T>
+ * @template-implements IteratorAggregate<string, FailoverAdapter<T>>
  */
 class FailoverAdaptersLocator implements FailoverAdaptersLocatorInterface, IteratorAggregate
 {

src/Flysystem/FailoverAdaptersLocatorInterface.php

@@ -4,9 +4,15 @@
 
 namespace Webf\FlysystemFailoverBundle\Flysystem;
 
+use League\Flysystem\FilesystemAdapter;
 use Traversable;
 use Webf\FlysystemFailoverBundle\Exception\FailoverAdapterNotFoundException;
 
+/**
+ * @template T of FilesystemAdapter
+ *
+ * @template-extends Traversable<string, FailoverAdapter<T>>
+ */
 interface FailoverAdaptersLocatorInterface extends Traversable
 {
     /**

src/MessageHandler/ReplicateFileHandler.php

@@ -8,13 +8,19 @@
 use GuzzleHttp\Psr7\StreamWrapper;
 use GuzzleHttp\Psr7\Utils;
 use League\Flysystem\Config;
+use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\FilesystemException;
 use Webf\FlysystemFailoverBundle\Flysystem\FailoverAdaptersLocatorInterface;
 use Webf\FlysystemFailoverBundle\Message\ReplicateFile;
 use Webf\FlysystemFailoverBundle\MessageRepository\MessageRepositoryInterface;
 
 class ReplicateFileHandler implements MessageHandlerInterface
 {
+    /**
+     * @template T of FilesystemAdapter
+     *
+     * @param FailoverAdaptersLocatorInterface<T> $adaptersLocator
+     */
     public function __construct(
         private FailoverAdaptersLocatorInterface $adaptersLocator,
         private MessageRepositoryInterface $messageRepository,

src/Service/SyncService.php

@@ -4,6 +4,7 @@
 
 namespace Webf\FlysystemFailoverBundle\Service;
 
+use League\Flysystem\FilesystemAdapter;
 use League\Flysystem\FilesystemException;
 use League\Flysystem\StorageAttributes;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -28,6 +29,11 @@ class SyncService
     public const EXTRA_FILES_DELETE = 'delete';
     public const EXTRA_FILES_IGNORE = 'ignore';
 
+    /**
+     * @template T of FilesystemAdapter
+     *
+     * @param FailoverAdaptersLocatorInterface<T> $failoverAdaptersLocator
+     */
     public function __construct(
         private EventDispatcherInterface $eventDispatcher,
         private FailoverAdaptersLocatorInterface $failoverAdaptersLocator,
@@ -88,7 +94,7 @@ public function addFile(StorageAttributes $file, int $adapter, int $timeShift):
             {
                 $lastModified = $file->lastModified();
 
-                $this->cache[$adapter][$file->path()] = $lastModified
+                $this->cache[$adapter][$file->path()] = $lastModified !== null
                     ? $lastModified - $timeShift
                     : 0;
             }