Use php-cs-fixer

.php_cs.dist

@@ -0,0 +1,50 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude(['vendor', 'cache'])
+    ->in([__DIR__])
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules([
+        '@Symfony' => true,
+        '@Symfony:risky' => true,
+        '@PHP71Migration' => true,
+        '@PHP71Migration:risky' => true,
+        '@PHPUnit60Migration:risky' => true,
+        'align_multiline_comment' => true,
+        'array_syntax' => ['syntax' => 'short'],
+        'concat_space' => [
+            'spacing' => 'one'
+        ],
+        'combine_consecutive_issets' => true,
+        'combine_consecutive_unsets' => true,
+        'general_phpdoc_annotation_remove' => [
+            'author',
+            'expectedException',
+            'expectedExceptionMessage',
+        ],
+        'heredoc_to_nowdoc' => true,
+        'linebreak_after_opening_tag' => true,
+        'list_syntax' => ['syntax' => 'short'],
+        'no_superfluous_elseif' => true,
+        'no_unreachable_default_argument_value' => true,
+        'no_useless_else' => true,
+        'no_useless_return' => true,
+        'ordered_class_elements' => true,
+        'ordered_imports' => true,
+        'php_unit_strict' => true,
+        'phpdoc_add_missing_param_annotation' => true,
+        'phpdoc_order' => true,
+        'phpdoc_types_order' => [
+            'null_adjustment' => 'always_last',
+            'sort_algorithm' => 'none',
+        ],
+        'strict_comparison' => true,
+        'strict_param' => true,
+        'void_return' => true,
+    ])
+    ->setFinder($finder)
+    ->setRiskyAllowed(true)
+    ->setUsingCache(false)
+;

.travis.yml

@@ -1,7 +1,6 @@
 language: php
 
 php:
-  - 7.0
   - 7.1
   - 7.2
   - 7.3
@@ -18,11 +17,6 @@ cache:
 matrix:
   allow_failures:
     - env: SYMFONY_VERSION=dev-master
-  exclude:
-    - php: 7.0
-      env: SYMFONY_VERSION=^4.0
-    - php: 7.0
-      env: SYMFONY_VERSION=dev-master
 
 before_install:
   - travis_retry composer selfupdate

DependencyInjection/Compiler/FilesystemPass.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Oneup\FlysystemBundle\DependencyInjection\Compiler;
 
 use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
@@ -8,7 +10,7 @@
 
 class FilesystemPass implements CompilerPassInterface
 {
-    public function process(ContainerBuilder $container)
+    public function process(ContainerBuilder $container): void
     {
         if (!$container->hasDefinition('oneup_flysystem.mount_manager')) {
             return;
@@ -28,7 +30,7 @@ public function process(ContainerBuilder $container)
                 $prefix = $attribute['mount'];
 
                 // add filesystem to the map
-                $mountManager->addMethodCall('mountFilesystem', array($prefix, new Reference($id)));
+                $mountManager->addMethodCall('mountFilesystem', [$prefix, new Reference($id)]);
             }
         }
     }

DependencyInjection/Configuration.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Oneup\FlysystemBundle\DependencyInjection;
 
 use League\Flysystem\AdapterInterface;
@@ -18,7 +20,7 @@ public function __construct(array $adapterFactories, array $cacheFactories)
         $this->cacheFactories = $cacheFactories;
     }
 
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $treeBuilder = new TreeBuilder('oneup_flysystem');
 
@@ -41,7 +43,7 @@ public function getConfigTreeBuilder()
         return $treeBuilder;
     }
 
-    private function addCacheSection(ArrayNodeDefinition $node)
+    private function addCacheSection(ArrayNodeDefinition $node): void
     {
         $cacheNodeBuilder = $node
             ->children()
@@ -59,7 +61,7 @@ private function addCacheSection(ArrayNodeDefinition $node)
         }
     }
 
-    private function addAdapterSection(ArrayNodeDefinition $node)
+    private function addAdapterSection(ArrayNodeDefinition $node): void
     {
         $adapterNodeBuilder = $node
             ->fixXmlConfig('adapter')
@@ -78,12 +80,12 @@ private function addAdapterSection(ArrayNodeDefinition $node)
         }
     }
 
-    private function addFilesystemSection(ArrayNodeDefinition $node)
+    private function addFilesystemSection(ArrayNodeDefinition $node): void
     {
-        $supportedVisibilities = array(
+        $supportedVisibilities = [
             AdapterInterface::VISIBILITY_PRIVATE,
             AdapterInterface::VISIBILITY_PUBLIC,
-        );
+        ];
 
         $node
             ->fixXmlConfig('filesystem')
@@ -95,7 +97,7 @@ private function addFilesystemSection(ArrayNodeDefinition $node)
                         ->booleanNode('disable_asserts')
                             ->defaultFalse()
                         ->end()
-                        ->arrayNode('plugins')->treatNullLike(array())->prototype('scalar')->end()->end()
+                        ->arrayNode('plugins')->treatNullLike([])->prototype('scalar')->end()->end()
                         ->scalarNode('adapter')->isRequired()->end()
                         ->scalarNode('cache')->defaultNull()->end()
                         ->scalarNode('alias')->defaultNull()->end()

DependencyInjection/Factory/Adapter/AwsS3V2Factory.php

@@ -1,21 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Oneup\FlysystemBundle\DependencyInjection\Factory\Adapter;
 
+use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
 class AwsS3V2Factory implements AdapterFactoryInterface
 {
-    public function getKey()
+    public function getKey(): string
     {
         return 'awss3v2';
     }
 
-    public function create(ContainerBuilder $container, $id, array $config)
+    public function create(ContainerBuilder $container, $id, array $config): void
     {
         $definition = $container
             ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.awss3v2'))
@@ -26,7 +28,7 @@ public function create(ContainerBuilder $container, $id, array $config)
         ;
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()

DependencyInjection/Factory/Adapter/AwsS3V3Factory.php

@@ -1,21 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Oneup\FlysystemBundle\DependencyInjection\Factory\Adapter;
 
+use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
 class AwsS3V3Factory implements AdapterFactoryInterface
 {
-    public function getKey()
+    public function getKey(): string
     {
         return 'awss3v3';
     }
 
-    public function create(ContainerBuilder $container, $id, array $config)
+    public function create(ContainerBuilder $container, $id, array $config): void
     {
         $definition = $container
             ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.awss3v3'))
@@ -26,7 +28,7 @@ public function create(ContainerBuilder $container, $id, array $config)
         ;
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()

DependencyInjection/Factory/Adapter/CustomAdapterFactory.php

@@ -1,24 +1,26 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Oneup\FlysystemBundle\DependencyInjection\Factory\Adapter;
 
 use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class CustomAdapterFactory implements AdapterFactoryInterface
 {
-    public function getKey()
+    public function getKey(): string
     {
         return 'custom';
     }
 
-    public function create(ContainerBuilder $container, $id, array $config)
+    public function create(ContainerBuilder $container, $id, array $config): void
     {
         $container->setAlias($id, $config['service']);
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()

DependencyInjection/Factory/Adapter/DropboxFactory.php

@@ -1,21 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Oneup\FlysystemBundle\DependencyInjection\Factory\Adapter;
 
+use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
 class DropboxFactory implements AdapterFactoryInterface
 {
-    public function getKey()
+    public function getKey(): string
     {
         return 'dropbox';
     }
 
-    public function create(ContainerBuilder $container, $id, array $config)
+    public function create(ContainerBuilder $container, $id, array $config): void
     {
         $definition = $container
             ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.dropbox'))
@@ -24,7 +26,7 @@ public function create(ContainerBuilder $container, $id, array $config)
         ;
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()

DependencyInjection/Factory/Adapter/FallbackFactory.php

@@ -1,21 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Oneup\FlysystemBundle\DependencyInjection\Factory\Adapter;
 
+use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ChildDefinition;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Reference;
-use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 
 class FallbackFactory implements AdapterFactoryInterface
 {
-    public function getKey()
+    public function getKey(): string
     {
         return 'fallback';
     }
 
-    public function create(ContainerBuilder $container, $id, array $config)
+    public function create(ContainerBuilder $container, $id, array $config): void
     {
         $definition = $container
             ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.fallback'))
@@ -25,7 +27,7 @@ public function create(ContainerBuilder $container, $id, array $config)
         ;
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()

DependencyInjection/Factory/Adapter/FtpFactory.php

@@ -1,28 +1,30 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Oneup\FlysystemBundle\DependencyInjection\Factory\Adapter;
 
+use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
 use Symfony\Component\Config\Definition\Builder\NodeDefinition;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ChildDefinition;
-use Oneup\FlysystemBundle\DependencyInjection\Factory\AdapterFactoryInterface;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
 
 class FtpFactory implements AdapterFactoryInterface
 {
-    public function getKey()
+    public function getKey(): string
     {
         return 'ftp';
     }
 
-    public function create(ContainerBuilder $container, $id, array $config)
+    public function create(ContainerBuilder $container, $id, array $config): void
     {
         $definition = $container
             ->setDefinition($id, new ChildDefinition('oneup_flysystem.adapter.ftp'))
             ->replaceArgument(0, $config)
         ;
     }
 
-    public function addConfiguration(NodeDefinition $node)
+    public function addConfiguration(NodeDefinition $node): void
     {
         $node
             ->children()
@@ -37,7 +39,7 @@ public function addConfiguration(NodeDefinition $node)
                 ->scalarNode('permPrivate')->defaultValue(0000)->end()
                 ->scalarNode('permPublic')->defaultNull(0744)->end()
                 ->booleanNode('passive')->defaultTrue()->end()
-                ->scalarNode('transferMode')->defaultValue(defined('FTP_BINARY') ? FTP_BINARY : null)->end()
+                ->scalarNode('transferMode')->defaultValue(\defined('FTP_BINARY') ? FTP_BINARY : null)->end()
                 ->scalarNode('systemType')->defaultNull()->end()
                 ->booleanNode('ignorePassiveAddress')->defaultNull()->end()
                 ->booleanNode('recurseManually')->defaultFalse()->end()