Fix non-string env vars handling

Author: tgalopin

composer.json

@@ -38,6 +38,7 @@
         "phpunit/phpunit": "^7.4",
         "spatie/flysystem-dropbox": "^1.0",
         "superbalist/flysystem-google-storage": "^7.2",
+        "symfony/dotenv": "^4.2",
         "symfony/var-dumper": "^4.1",
         "symfony/yaml": "^4.2"
     },

src/Adapter/Builder/FtpAdapterDefinitionBuilder.php

@@ -44,19 +44,19 @@ protected function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('password', 'string');
 
         $resolver->setDefault('port', 21);
-        $resolver->setAllowedTypes('port', 'int');
+        $resolver->setAllowedTypes('port', 'scalar');
 
         $resolver->setDefault('root', '');
         $resolver->setAllowedTypes('root', 'string');
 
         $resolver->setDefault('passive', true);
-        $resolver->setAllowedTypes('passive', 'boolean');
+        $resolver->setAllowedTypes('passive', 'scalar');
 
         $resolver->setDefault('ssl', false);
-        $resolver->setAllowedTypes('ssl', 'boolean');
+        $resolver->setAllowedTypes('ssl', 'scalar');
 
         $resolver->setDefault('timeout', 90);
-        $resolver->setAllowedTypes('timeout', 'int');
+        $resolver->setAllowedTypes('timeout', 'scalar');
     }
 
     protected function configureDefinition(Definition $definition, array $options)

src/Adapter/Builder/LocalAdapterDefinitionBuilder.php

@@ -38,26 +38,26 @@ protected function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('directory', 'string');
 
         $resolver->setDefault('lock', 0);
-        $resolver->setAllowedTypes('lock', 'int');
+        $resolver->setAllowedTypes('lock', 'scalar');
 
         $resolver->setDefault('skip_links', false);
-        $resolver->setAllowedTypes('skip_links', 'boolean');
+        $resolver->setAllowedTypes('skip_links', 'scalar');
 
         $resolver->setDefault('permissions', function (OptionsResolver $subResolver) {
             $subResolver->setDefault('file', function (OptionsResolver $permsResolver) {
                 $permsResolver->setDefault('public', 0644);
-                $permsResolver->setAllowedTypes('public', 'int');
+                $permsResolver->setAllowedTypes('public', 'scalar');
 
                 $permsResolver->setDefault('private', 0600);
-                $permsResolver->setAllowedTypes('private', 'int');
+                $permsResolver->setAllowedTypes('private', 'scalar');
             });
 
             $subResolver->setDefault('dir', function (OptionsResolver $permsResolver) {
                 $permsResolver->setDefault('public', 0755);
-                $permsResolver->setAllowedTypes('public', 'int');
+                $permsResolver->setAllowedTypes('public', 'scalar');
 
                 $permsResolver->setDefault('private', 0700);
-                $permsResolver->setAllowedTypes('private', 'int');
+                $permsResolver->setAllowedTypes('private', 'scalar');
             });
         });
     }

src/Adapter/Builder/SftpAdapterDefinitionBuilder.php

@@ -46,7 +46,7 @@ protected function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('password', 'string');
 
         $resolver->setDefault('port', 22);
-        $resolver->setAllowedTypes('port', 'int');
+        $resolver->setAllowedTypes('port', 'scalar');
 
         $resolver->setDefault('root', '');
         $resolver->setAllowedTypes('root', 'string');
@@ -55,7 +55,7 @@ protected function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('private_key', ['string', 'null']);
 
         $resolver->setDefault('timeout', 90);
-        $resolver->setAllowedTypes('timeout', 'int');
+        $resolver->setAllowedTypes('timeout', 'scalar');
     }
 
     protected function configureDefinition(Definition $definition, array $options)

src/Adapter/Builder/WebdavAdapterDefinitionBuilder.php

@@ -44,7 +44,7 @@ protected function configureOptions(OptionsResolver $resolver)
         $resolver->setAllowedTypes('prefix', 'string');
 
         $resolver->setDefault('use_stream_copy', true);
-        $resolver->setAllowedTypes('use_stream_copy', 'boolean');
+        $resolver->setAllowedTypes('use_stream_copy', 'scalar');
     }
 
     protected function configureDefinition(Definition $definition, array $options)

tests/DependencyInjection/FlysytemExtensionTest.php

@@ -20,12 +20,18 @@
 use PHPUnit\Framework\TestCase;
 use Sabre\DAV\Client as WebDAVClient;
 use Spatie\Dropbox\Client as DropboxClient;
+use Symfony\Component\Dotenv\Dotenv;
 use Tests\League\FlysystemBundle\Kernel\FlysystemAppKernel;
 
 class FlysytemExtensionTest extends TestCase
 {
     public function testCreateFileystems()
     {
+        (new Dotenv())->populate([
+            'AWS_BUCKET' => 'bucket-name',
+            'FTP_PORT' => 21,
+        ]);
+
         $kernel = new FlysystemAppKernel('test', true);
         $kernel->setAdapterClients($this->getClientMocks());
         $kernel->boot();

tests/Kernel/FrameworkAppKernel.php

@@ -31,7 +31,12 @@ public function registerContainerConfiguration(LoaderInterface $loader)
         $loader->load(function (ContainerBuilder $container) {
             $container->loadFromExtension('framework', ['secret' => '$ecret']);
             $container->loadFromExtension('flysystem', [
-                'storages' => ['uploads.storage' => ['adapter' => 'local', 'options' => ['directory' => __DIR__]]],
+                'storages' => [
+                    'uploads.storage' => [
+                        'adapter' => 'local',
+                        'options' => ['directory' => __DIR__],
+                    ],
+                ],
             ]);
         });
     }

tests/Kernel/config/flysystem.yaml

@@ -4,7 +4,7 @@ flysystem:
             adapter: 'aws'
             options:
                 client: 'aws_client_service'
-                bucket: 'bucket_name'
+                bucket: '%env(AWS_BUCKET)%'
                 prefix: 'optional/path/prefix'
 
         fs_azure:
@@ -35,7 +35,7 @@ flysystem:
                 host: 'ftp.example.com'
                 username: 'username'
                 password: 'password'
-                port: 21
+                port: '%env(FTP_PORT)%'
                 root: '/path/to/root'
                 passive: true
                 ssl: true