Merge pull request #166 from anime-db/analysis-8Lmyak

Applied fixes from StyleCI
anime-db · Sep 3, 2016 · d50e09f · d50e09f
2 parents 83ad491 + 9a14315
commit d50e09f
Show file tree

Hide file tree

Showing 86 changed files with 492 additions and 619 deletions.
diff --git a/app/AppCache.php b/app/AppCache.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 require_once __DIR__.'/AppKernel.php';
 
 use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
@@ -29,7 +27,7 @@ public function registerBundles()
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
             new Avalanche\Bundle\ImagineBundle\AvalancheImagineBundle(),
-            new AnimeDb\Bundle\AnimeDbBundle\AnimeDbAnimeDbBundle()
+            new AnimeDb\Bundle\AnimeDbBundle\AnimeDbAnimeDbBundle(),
         ];
         // connection the bandles to be installed in the future
         $bundles = array_merge($bundles, include __DIR__.'/bundles.php');

diff --git a/app/autoload.php b/app/autoload.php
@@ -1,4 +1,5 @@
 <?php
+
 use Doctrine\Common\Annotations\AnnotationRegistry;
 
 /* @var $loader \Composer\Autoload\ClassLoader */
@@ -11,6 +12,6 @@
     $loader->add('', __DIR__.'/../vendor/symfony/symfony/src/Symfony/Component/Locale/Resources/stubs');
 }
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;
diff --git a/app/router.php b/app/router.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 if (PHP_SAPI != 'cli-server') { // run not in cli-server
     echo 'This script can be run from the CLI-server only.';
+
     return true;
 } elseif ($_SERVER['SCRIPT_NAME'] == '/update.log' || $_SERVER['SCRIPT_NAME'] == '/app_dev.php') {
     return false; // immediately return the update log or dev
 } else {
     include __DIR__.'/../web/app.php';
+
     return true;
 }
diff --git a/src/AnimeDbAnimeDbBundle.php b/src/AnimeDbAnimeDbBundle.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;

diff --git a/src/Client/GitHub.php b/src/Client/GitHub.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle\Client;
 
 use AnimeDb\Bundle\AnimeDbBundle\Composer\Composer;
@@ -39,6 +37,7 @@ public function getTags($repository)
     {
         /* @var $response Response */
         $response = $this->client->get('repos/'.$repository.'/tags')->send();
+
         return json_decode($response->getBody(true), true);
     }
 

diff --git a/src/Command/DeliverEventsCommand.php b/src/Command/DeliverEventsCommand.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
@@ -32,7 +30,8 @@ protected function configure()
      *
      * @return bool
      */
-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
         $this->getContainer()->get('anime_db.event_dispatcher')->shippingDeferredEvents();
     }
 }
diff --git a/src/Command/UpdateCommand.php b/src/Command/UpdateCommand.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle\Command;
 
 use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
@@ -37,7 +35,8 @@ protected function configure()
      *
      * @return bool
      */
-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
         /* @var $composer Composer */
         $composer = $this->getContainer()->get('anime_db.composer');
         $composer->setIO(new ConsoleIO($input, $output, $this->getHelperSet()));
@@ -110,7 +109,7 @@ protected function doUpdateItself(array $tag, Composer $composer, OutputInterfac
     }
 
     /**
-     * Rewrite the application files
+     * Rewrite the application files.
      *
      * @param string $from
      */

diff --git a/src/Composer/Composer.php b/src/Composer/Composer.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle\Composer;
 
 use Composer\Factory;
@@ -34,7 +32,7 @@ class Composer
     protected $loader;
 
     /**
-     * Lock file composer.lock
+     * Lock file composer.lock.
      *
      * @var string
      */
@@ -100,7 +98,7 @@ protected function getComposer()
     }
 
     /**
-     * Reload Composer
+     * Reload Composer.
      */
     public function reload()
     {
@@ -149,6 +147,7 @@ public function getPackageFromConfigFile($config)
         if (!file_exists($config)) {
             throw new \RuntimeException('File "'.$config.'" not found');
         }
+
         return $this->loader->load((new JsonFile($config))->read(), 'Composer\Package\RootPackage');
     }
 
@@ -168,7 +167,7 @@ public function getInstaller()
     }
 
     /**
-     * Get version compatible
+     * Get version compatible.
      *
      * 3.2.1-RC2 => 3.2.1.6.2
      *
@@ -185,7 +184,7 @@ public static function getVersionCompatible($version)
             'alpha' => 3,
             'beta' => 4,
             'stable' => 5, // is not a real suffix. use it if suffix is not exists
-            'rc' => 6
+            'rc' => 6,
         ];
 
         $reg = '/^v?(?<version>\d+\.\d+\.\d+)(?:-(?<suffix>dev|patch|alpha|beta|rc)(?<suffix_version>\d+)?)?$/i';
@@ -196,7 +195,7 @@ public static function getVersionCompatible($version)
         // suffix version
         if (isset($match['suffix'])) {
             $suffix = $suffixes[strtolower($match['suffix'])].'.';
-            $suffix .= isset($match['suffix_version']) ? (int)$match['suffix_version'] : 1;
+            $suffix .= isset($match['suffix_version']) ? (int) $match['suffix_version'] : 1;
         } else {
             $suffix = $suffixes['stable'].'.0';
         }

diff --git a/src/Composer/Job/BaseAddConfig.php b/src/Composer/Job/BaseAddConfig.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle\Composer\Job;
 
 use Symfony\Component\Finder\Finder;
@@ -71,6 +69,7 @@ private function getPackageConfig($name, $option = '')
         /* @var $file \SplFileInfo */
         foreach ($finder as $file) {
             $path = str_replace(DIRECTORY_SEPARATOR, '/', $file->getPathname());
+
             return substr($path, strrpos($path, '/Resources/config/'));
         }
 

diff --git a/src/Composer/Job/Config/Add.php b/src/Composer/Job/Config/Add.php
@@ -1,20 +1,18 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle\Composer\Job\Config;
 
 use AnimeDb\Bundle\AnimeDbBundle\Composer\Job\BaseAddConfig;
 use AnimeDb\Bundle\AnimeDbBundle\Manipulator\Config;
 
 /**
- * Job: Add package to config
+ * Job: Add package to config.
  */
 class Add extends BaseAddConfig
 {

diff --git a/src/Composer/Job/Config/Remove.php b/src/Composer/Job/Config/Remove.php
@@ -1,21 +1,19 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle\Composer\Job\Config;
 
 use AnimeDb\Bundle\AnimeDbBundle\Composer\Job\Job;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 use AnimeDb\Bundle\AnimeDbBundle\Manipulator\Config;
 
 /**
- * Job: Remove package from config
+ * Job: Remove package from config.
  */
 class Remove extends Job
 {

diff --git a/src/Composer/Job/Container.php b/src/Composer/Job/Container.php
@@ -1,13 +1,11 @@
 <?php
 /**
- * AnimeDb package
+ * AnimeDb package.
  *
- * @package   AnimeDb
  * @author    Peter Gribanov <info@peter-gribanov.ru>
  * @copyright Copyright (c) 2011, Peter Gribanov
  * @license   http://opensource.org/licenses/GPL-3.0 GPL v3
  */
-
 namespace AnimeDb\Bundle\AnimeDbBundle\Composer\Job;
 
 use AnimeDb\Bundle\AnimeDbBundle\Event\Dispatcher;
@@ -63,6 +61,7 @@ public function getEventDispatcher()
         if (!($this->dispatcher instanceof Dispatcher)) {
             $this->dispatcher = new Dispatcher($this->root_dir);
         }
+
         return $this->dispatcher;
     }
 
@@ -113,7 +112,7 @@ public function addJob(Job $job)
     }
 
     /**
-     * Execute all jobs
+     * Execute all jobs.
      */
     public function execute()
     {
@@ -150,7 +149,7 @@ public function executeCommand($cmd, $timeout = 300)
     }
 
     /**
-     * Get path to php executable
+     * Get path to php executable.
      *
      * @throws \RuntimeException
      *
@@ -166,6 +165,7 @@ protected function getPhp()
                 );
             }
         }
+
         return $this->php_path;
     }
 }