Introduce and apply automatic code style fixes

Author: helhum

.gitattributes

@@ -0,0 +1,5 @@
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.php_cs.dist export-ignore
+/.travis.yml export-ignore
+/tests

.gitignore

@@ -1,2 +1,3 @@
-vendor
-composer.lock
+/.php_cs.cache
+/vendor
+/composer.lock

.php_cs.dist

@@ -0,0 +1,49 @@
+<?php
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setRules([
+        '@PSR2' => true,
+        'concat_space' => [
+            'spacing' => 'one',
+        ],
+        'function_typehint_space' => true,
+        'hash_to_slash_comment' => true,
+        'lowercase_cast' => true,
+        'ordered_imports' => true,
+        'native_function_casing' => true,
+        'no_alias_functions' => true,
+        'no_blank_lines_after_phpdoc' => true,
+        'no_leading_namespace_whitespace' => true,
+        'no_trailing_comma_in_singleline_array' => true,
+        'no_singleline_whitespace_before_semicolons' => true,
+        'no_unused_imports' => true,
+        'no_whitespace_in_blank_line' => true,
+        'no_empty_statement' => true,
+        'no_extra_consecutive_blank_lines' => [
+            'continue',
+            'curly_brace_block',
+            'extra',
+            'parenthesis_brace_block',
+            'square_brace_block',
+            'throw',
+        ],
+        'no_short_bool_cast' => true,
+        'no_unneeded_control_parentheses' => [
+            'break',
+            'clone',
+            'continue',
+            'echo_print',
+            'return',
+            'switch_case',
+        ],
+        'phpdoc_no_package' => true,
+        'phpdoc_scalar' => true,
+        'self_accessor' => true,
+        'single_quote' => true,
+        'whitespace_after_comma_in_array' => true,
+    ])
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->exclude('vendor')
+            ->in(__DIR__)
+    );

.travis.yml

@@ -6,23 +6,20 @@ matrix:
     - php: 5.3
       dist: precise
     - php: 5.5
+      dist: precise
     - php: 5.6
     - php: 7
     - php: 7.1
     - php: 7.2
+    - php: 7.3
 
 sudo: false
 
 cache:
   directories:
     - $HOME/.composer/cache
 
-env:
-  global:
-    secure: hL/ws+UJCh7H910RdJiT8A/TJ1DohXP1HnHbO7xhXYMA0PCgbPNDrRk8gD216IKqv+Zq1Pt7szDWlK017d7gwKhk1QJkRho96O9ZpEm795ARg7TR21sHx9jjvznD7cuL7c/nWyfIscEE3D9Bm+xn9IPxG6rYegYEBR1X9e1cGfM=
-
 before_script:
-  - if [ "$GITHUB_COMPOSER_AUTH" ]; then composer config -g github-oauth.github.com $GITHUB_COMPOSER_AUTH; fi
   - composer install
 
 script:

composer.json

@@ -17,15 +17,15 @@
         "psr-4": { "TYPO3\\ClassAliasLoader\\": "src/"}
     },
     "autoload-dev": {
-        "psr-4": { "TYPO3\\ClassAliasLoader\\Tests\\": "tests/"}
+        "psr-4": { "TYPO3\\ClassAliasLoader\\Test\\": "tests/"}
     },
     "require": {
         "php": ">=5.3.7",
         "composer-plugin-api": "^1.0"
     },
     "require-dev": {
-        "composer/composer": "dev-master",
-        "mikey179/vfsstream": "1.4.*@dev",
+        "composer/composer": "^1.1@dev",
+        "mikey179/vfsstream": "~1.4.0@dev",
         "phpunit/phpunit": "^4.8"
     },
     "replace": {
@@ -34,7 +34,7 @@
     "extra": {
         "class": "TYPO3\\ClassAliasLoader\\Plugin",
         "branch-alias": {
-            "dev-master": "1.0.x-dev"
+            "dev-master": "1.1.x-dev"
         }
     }
 }

src/ClassAliasLoader.php

@@ -55,7 +55,7 @@ public function setAliasMap(array $aliasMap)
     }
 
     /**
-     * @param boolean $caseSensitiveClassLoading
+     * @param bool $caseSensitiveClassLoading
      */
     public function setCaseSensitiveClassLoading($caseSensitiveClassLoading)
     {
@@ -126,7 +126,8 @@ public function loadClassWithAlias($className)
      * @param string $className
      * @return bool|null
      */
-    public function loadClass($className) {
+    public function loadClass($className)
+    {
         $classFound = $this->composerClassLoader->loadClass($className);
         if (!$classFound && !$this->caseSensitiveClassLoading) {
             $classFound = $this->composerClassLoader->loadClass(strtolower($className));
@@ -153,7 +154,7 @@ protected function getOriginalClassName($aliasOrClassName)
             return $this->aliasMap['aliasToClassNameMapping'][$lowerCasedClassName];
         }
         // No alias registered for this class name, return and remember that info
-        return $this->aliasMap['classNameToAliasMapping'][$aliasOrClassName] = NULL;
+        return $this->aliasMap['classNameToAliasMapping'][$aliasOrClassName] = null;
     }
 
     /**
@@ -203,5 +204,4 @@ public function __call($method, $arguments)
 
         return call_user_func_array(array($this->composerClassLoader, $method), $arguments);
     }
-
 }

src/ClassAliasMap.php

@@ -30,7 +30,8 @@ class ClassAliasMap
      * @param string $classNameOrAlias
      * @return string
      */
-    public static function getClassNameForAlias($classNameOrAlias) {
+    public static function getClassNameForAlias($classNameOrAlias)
+    {
         if (!static::$classAliasLoader) {
             return $classNameOrAlias;
         }
@@ -72,5 +73,4 @@ public static function setClassAliasLoader(ClassAliasLoader $classAliasLoader)
         }
         static::$classAliasLoader = $classAliasLoader;
     }
-
 }

src/ClassAliasMapGenerator.php

@@ -33,7 +33,7 @@ class ClassAliasMapGenerator
     /**
      * @var IOInterface
      */
-    protected $IO;
+    protected $io;
 
     /**
      * @var bool
@@ -42,13 +42,13 @@ class ClassAliasMapGenerator
 
     /**
      * @param Composer $composer
-     * @param IOInterface $IO
+     * @param IOInterface $io
      * @param bool $optimizeAutoloadFiles
      */
-    public function __construct(Composer $composer, IOInterface $IO = null, $optimizeAutoloadFiles = false)
+    public function __construct(Composer $composer, IOInterface $io = null, $optimizeAutoloadFiles = false)
     {
         $this->composer = $composer;
-        $this->IO = $IO ?: new NullIO();
+        $this->io = $io ?: new NullIO();
         $this->optimizeAutoloadFiles = $optimizeAutoloadFiles;
     }
 
@@ -79,15 +79,15 @@ public function generateAliasMap()
         foreach ($packageMap as $item) {
             /** @var PackageInterface $package */
             list($package, $installPath) = $item;
-            $aliasLoaderConfig = new \TYPO3\ClassAliasLoader\Config($package, $this->IO);
+            $aliasLoaderConfig = new \TYPO3\ClassAliasLoader\Config($package, $this->io);
             if ($aliasLoaderConfig->get('class-alias-maps') !== null) {
                 if (!is_array($aliasLoaderConfig->get('class-alias-maps'))) {
                     throw new \Exception('Configuration option "class-alias-maps" must be an array');
                 }
                 foreach ($aliasLoaderConfig->get('class-alias-maps') as $mapFile) {
                     $mapFilePath = ($installPath ?: $basePath) . '/' . $filesystem->normalizePath($mapFile);
                     if (!is_file($mapFilePath)) {
-                        $this->IO->writeError(sprintf('The class alias map file "%s" configured in package "%s" was not found!', $mapFile, $package->getName()));
+                        $this->io->writeError(sprintf('The class alias map file "%s" configured in package "%s" was not found!', $mapFile, $package->getName()));
                     } else {
                         $packageAliasMap = require $mapFilePath;
                         if (!is_array($packageAliasMap)) {
@@ -117,7 +117,7 @@ public function generateAliasMap()
         }
 
         $caseSensitiveClassLoadingString = $caseSensitiveClassLoading ? 'true' : 'false';
-        $this->IO->write('<info>Generating ' . ($classAliasMappingFound ? '' : 'empty ') . 'class alias map file</info>');
+        $this->io->write('<info>Generating ' . ($classAliasMappingFound ? '' : 'empty ') . 'class alias map file</info>');
         $this->generateAliasMapFile($aliasToClassNameMapping, $classNameToAliasMapping, $targetDir);
 
         $suffix = null;
@@ -165,14 +165,14 @@ public static function initializeClassAliasLoader(\$composerClassLoader) {
         file_put_contents($targetDir . '/autoload_alias_loader_real.php', $aliasLoaderInitClassContent);
 
         if (!$caseSensitiveClassLoading) {
-            $this->IO->write('<info>Re-writing class map to support case insensitive class loading</info>');
+            $this->io->write('<info>Re-writing class map to support case insensitive class loading</info>');
             if (!$this->optimizeAutoloadFiles) {
-                $this->IO->write('<warning>Case insensitive class loading only works reliably if you use the optimize class loading feature of composer</warning>');
+                $this->io->write('<warning>Case insensitive class loading only works reliably if you use the optimize class loading feature of composer</warning>');
             }
             $this->rewriteClassMapWithLowerCaseClassNames($targetDir);
         }
 
-        $this->IO->write('<info>Inserting class alias loader into main autoload.php file</info>');
+        $this->io->write('<info>Inserting class alias loader into main autoload.php file</info>');
         $this->modifyMainAutoloadFile($vendorPath . '/autoload.php', $suffix);
 
         return true;
@@ -200,7 +200,6 @@ protected function modifyMainAutoloadFile($autoloadFile, $suffix)
 EOF;
 
         file_put_contents($autoloadFile, $autoloadFileContent);
-
     }
 
     /**
@@ -237,18 +236,17 @@ protected function rewriteClassMapWithLowerCaseClassNames($targetDir)
         file_put_contents($targetDir . '/autoload_classmap.php', $classMapContents);
     }
 
-
     /**
-     * Extracts the bas path out of composer config
+     * Extracts the base path out of composer config
      *
      * @param \Composer\Config $config
      * @return mixed
      */
-    protected function extractBasePath(\Composer\Config $config) {
+    protected function extractBasePath(\Composer\Config $config)
+    {
         $reflectionClass = new \ReflectionClass($config);
         $reflectionProperty = $reflectionClass->getProperty('baseDir');
         $reflectionProperty->setAccessible(true);
         return $reflectionProperty->getValue($config);
     }
-
 }

src/Config.php

@@ -30,18 +30,18 @@ class Config
         'autoload-case-sensitivity' => true
     );
 
-     /**
-     * @var IOInterface
-     */
-    protected $IO;
+    /**
+    * @var IOInterface
+    */
+    protected $io;
 
     /**
      * @param PackageInterface $package
-     * @param IOInterface $IO
+     * @param IOInterface $io
      */
-    public function __construct(PackageInterface $package, IOInterface $IO = null)
+    public function __construct(PackageInterface $package, IOInterface $io = null)
     {
-        $this->IO = $IO ?: new NullIO();
+        $this->io = $io ?: new NullIO();
         $this->setAliasLoaderConfigFromPackage($package);
     }
 
@@ -69,7 +69,6 @@ public function get($configKey)
         return $value;
     }
 
-
     /**
      * @param PackageInterface $package
      */
@@ -123,9 +122,8 @@ protected function handleDeprecatedConfigurationInPackage(PackageInterface $pack
             }
         }
         if (!empty($messages)) {
-            $this->IO->writeError($messages);
+            $this->io->writeError($messages);
         }
         return $extraConfig;
     }
-
 }

src/Plugin.php

@@ -11,9 +11,9 @@
  */
 
 use Composer\Composer;
+use Composer\EventDispatcher\EventSubscriberInterface;
 use Composer\IO\IOInterface;
 use Composer\Plugin\PluginInterface;
-use Composer\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Class Plugin
@@ -87,5 +87,4 @@ public function onPostAutoloadDump(\Composer\Script\Event $event)
 
         return $aliasMapGenerator->generateAliasMap();
     }
-
 }