Fix tests for Symfony 6

Author: tgalopin

phpunit.xml.dist

@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/6.1/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php">
-  <php>
-    <ini name="error_reporting" value="-1" />
-    <env name="SHELL_VERBOSITY" value="-1" />
-    <env name="SYMFONY_DEPRECATIONS_HELPER" value="9999" />
-  </php>
+    <php>
+        <ini name="error_reporting" value="-1"/>
+        <env name="SHELL_VERBOSITY" value="-1"/>
+        <env name="SYMFONY_DEPRECATIONS_HELPER" value="9999"/>
+    </php>
 
-  <testsuites>
-    <testsuite name="FlysystemBundle Test Suite">
-      <directory>tests/</directory>
-    </testsuite>
-  </testsuites>
+    <testsuites>
+        <testsuite name="FlysystemBundle Test Suite">
+            <directory>tests/</directory>
+        </testsuite>
+    </testsuites>
 
-  <filter>
-    <whitelist>
-      <directory>./src/</directory>
-    </whitelist>
-  </filter>
+    <coverage>
+        <include>
+            <directory>./src/</directory>
+        </include>
+    </coverage>
 </phpunit>

src/Adapter/Builder/LocalAdapterDefinitionBuilder.php

@@ -70,7 +70,16 @@ protected function configureDefinition(Definition $definition, array $options)
         $definition->setArgument(1,
             (new Definition(PortableVisibilityConverter::class))
             ->setFactory([PortableVisibilityConverter::class, 'fromArray'])
-            ->addArgument($options['permissions'])
+            ->addArgument([
+                'file' => [
+                    'public' => (int) $options['permissions']['file']['public'],
+                    'private' => (int) $options['permissions']['file']['private'],
+                ],
+                'dir' => [
+                    'public' => (int) $options['permissions']['dir']['public'],
+                    'private' => (int) $options['permissions']['dir']['private'],
+                ],
+            ])
             ->setShared(false)
         );
         $definition->setArgument(2, $options['lock']);

src/DependencyInjection/Configuration.php

@@ -21,7 +21,7 @@
  */
 class Configuration implements ConfigurationInterface
 {
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('flysystem');
         $rootNode = $treeBuilder->getRootNode();

tests/Kernel/AppKernelTrait.php

@@ -13,12 +13,12 @@
 
 trait AppKernelTrait
 {
-    public function getCacheDir()
+    public function getCacheDir(): string
     {
         return $this->createTmpDir('cache');
     }
 
-    public function getLogDir()
+    public function getLogDir(): string
     {
         return $this->createTmpDir('logs');
     }

tests/Kernel/EmptyAppKernel.php

@@ -20,7 +20,7 @@ class EmptyAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FlysystemBundle()];
     }

tests/Kernel/FlysystemAppKernel.php

@@ -24,7 +24,7 @@ class FlysystemAppKernel extends Kernel
 
     private $adapterClients = [];
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new FlysystemBundle()];
     }

tests/Kernel/FrameworkAppKernel.php

@@ -21,7 +21,7 @@ class FrameworkAppKernel extends Kernel
 {
     use AppKernelTrait;
 
-    public function registerBundles()
+    public function registerBundles(): iterable
     {
         return [new FrameworkBundle(), new FlysystemBundle()];
     }

tests/Kernel/config/flysystem.yaml

@@ -69,6 +69,3 @@ flysystem:
                 privateKey: 'path/to/or/contents/of/privatekey'
                 root: '/path/to/root'
                 timeout: 10
-                directoryPerm: 0755
-                permPrivate: 0700
-                permPublic: 0744