Merge pull request #221 from kbond/php-cs-fixer

Add php-cs-fixer and configure travis to check code quality
liip · Nov 27, 2019 · 4fa1d2b · 4fa1d2b
2 parents 91c7032 + c1a496d
commit 4fa1d2b
Show file tree

Hide file tree

Showing 56 changed files with 332 additions and 407 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -0,0 +1,13 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->exclude('vendor')
+    ->exclude('Tests/app/var')
+    ->in(__DIR__)
+;
+
+return PhpCsFixer\Config::create()
+    ->setRules(['@Symfony' => true])
+    ->setFinder($finder)
+    ->setUsingCache(false)
+;
diff --git a/.travis.yml b/.travis.yml
@@ -29,6 +29,7 @@ jobs:
   include:
     # Tests the lowest set of dependencies
     - php: 7.1
+      env: LOWEST
       install:
         - travis_retry composer update -n --prefer-lowest --prefer-stable --prefer-dist
 
@@ -53,5 +54,10 @@ jobs:
         - composer require --dev symfony/mailer --no-update
         - travis_retry composer update -n --prefer-dist --prefer-stable
 
+    - stage: Code Quality
+      php: 7.3
+      script:
+        - ./vendor/bin/php-cs-fixer fix -v --dry-run
+
 notifications:
   slack: liip:3QOs1QKt3aCFxpJvRzpJCbVZ
diff --git a/Check/CustomErrorPages.php b/Check/CustomErrorPages.php
@@ -58,7 +58,7 @@ public function check()
         // we suppose pages has been customized if the exception controller is not the default one,
         // so we don't look for template file in this case.
         if ($values['exception_controller']->getDefaultValue() == $this->exceptionController) {
-            $missingTemplate = array();
+            $missingTemplate = [];
 
             foreach ($this->errorCodes as $errorCode) {
                 $template = sprintf('%s/Resources/TwigBundle/views/Exception/error%d.html.twig', $this->kernelRootDir, $errorCode);

diff --git a/Check/DoctrineDbalCollection.php b/Check/DoctrineDbalCollection.php
@@ -10,12 +10,12 @@
  */
 class DoctrineDbalCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(ConnectionRegistry $manager, $connections)
     {
         if (!is_array($connections)) {
-            $connections = array($connections);
+            $connections = [$connections];
         }
 
         foreach ($connections as $connection) {

diff --git a/Check/DoctrineMigrationsCollection.php b/Check/DoctrineMigrationsCollection.php
@@ -9,26 +9,26 @@
 use ZendDiagnostics\Check\DoctrineMigration as ZendDoctrineMigration;
 
 /**
- * Class DoctrineMigrationsCollection
+ * Class DoctrineMigrationsCollection.
  */
 class DoctrineMigrationsCollection implements CheckCollectionInterface
 {
     /**
-     * DI Container
+     * DI Container.
      *
      * @var ContainerInterface
      */
     private $container;
 
     /**
-     * Available checks
+     * Available checks.
      *
      * @var CheckInterface[]
      */
     private $checks;
 
     /**
-     * Migrations configuration service ids
+     * Migrations configuration service ids.
      *
      * @var string[]
      */
@@ -44,7 +44,7 @@ public function __construct(
         ContainerInterface $container,
         array $migrations
     ) {
-        $this->container  = $container;
+        $this->container = $container;
         $this->migrations = $migrations;
     }
 
@@ -53,7 +53,7 @@ public function __construct(
      */
     public function getChecks()
     {
-        if ($this->checks === null) {
+        if (null === $this->checks) {
             $this->checks = [];
             foreach ($this->migrations as $key => $migration) {
                 $check = new ZendDoctrineMigration($this->container->get($migration));

diff --git a/Check/DoctrineMongoDbCollection.php b/Check/DoctrineMongoDbCollection.php
@@ -10,12 +10,12 @@
  */
 class DoctrineMongoDbCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(ConnectionRegistry $manager, $connections)
     {
         if (!is_array($connections)) {
-            $connections = array($connections);
+            $connections = [$connections];
         }
 
         foreach ($connections as $connection) {

diff --git a/Check/ExpressionCollection.php b/Check/ExpressionCollection.php
@@ -9,7 +9,7 @@
  */
 class ExpressionCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(array $configs)
     {

diff --git a/Check/GuzzleHttpServiceCollection.php b/Check/GuzzleHttpServiceCollection.php
@@ -10,7 +10,7 @@
  */
 class GuzzleHttpServiceCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(array $configs)
     {

diff --git a/Check/HttpServiceCollection.php b/Check/HttpServiceCollection.php
@@ -10,7 +10,7 @@
  */
 class HttpServiceCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(array $configs)
     {

diff --git a/Check/MemcacheCollection.php b/Check/MemcacheCollection.php
@@ -10,7 +10,7 @@
  */
 class MemcacheCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(array $configs)
     {

diff --git a/Check/MemcachedCollection.php b/Check/MemcachedCollection.php
@@ -10,7 +10,7 @@
  */
 class MemcachedCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(array $configs)
     {

diff --git a/Check/PdoConnectionCollection.php b/Check/PdoConnectionCollection.php
@@ -7,7 +7,7 @@
 
 class PdoConnectionCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(array $connections)
     {

diff --git a/Check/PhpFlagsCollection.php b/Check/PhpFlagsCollection.php
@@ -10,11 +10,8 @@ class PhpFlagsCollection implements CheckCollectionInterface
     /**
      * @var array
      */
-    private $checks = array();
+    private $checks = [];
 
-    /**
-     * @param array $configs
-     */
     public function __construct(array $configs)
     {
         foreach ($configs as $setting => $value) {

diff --git a/Check/PhpVersionCollection.php b/Check/PhpVersionCollection.php
@@ -10,11 +10,8 @@ class PhpVersionCollection implements CheckCollectionInterface
     /**
      * @var array
      */
-    private $checks = array();
+    private $checks = [];
 
-    /**
-     * @param array $configs
-     */
     public function __construct(array $configs)
     {
         foreach ($configs as $version => $comparisonOperator) {

diff --git a/Check/ProcessRunningCollection.php b/Check/ProcessRunningCollection.php
@@ -10,12 +10,12 @@
  */
 class ProcessRunningCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct($processes)
     {
         if (!is_array($processes)) {
-            $processes = array($processes);
+            $processes = [$processes];
         }
 
         foreach ($processes as $process) {

diff --git a/Check/RabbitMQCollection.php b/Check/RabbitMQCollection.php
@@ -10,7 +10,7 @@
  */
 class RabbitMQCollection implements CheckCollectionInterface
 {
-    private $checks = array();
+    private $checks = [];
 
     public function __construct(array $configs)
     {

diff --git a/Check/SymfonyVersion.php b/Check/SymfonyVersion.php
@@ -109,12 +109,12 @@ function ($value) use ($branch) {
      */
     private function getResponseAndDecode($url)
     {
-        $opts = array(
-            'http' => array(
+        $opts = [
+            'http' => [
                 'method' => 'GET',
                 'header' => "User-Agent: LiipMonitorBundle\r\n",
-            ),
-        );
+            ],
+        ];
 
         $array = json_decode(file_get_contents($url, false, stream_context_create($opts)), true);
 

diff --git a/Command/HealthCheckCommand.php b/Command/HealthCheckCommand.php
@@ -6,10 +6,10 @@
 use Liip\MonitorBundle\Helper\RawConsoleReporter;
 use Liip\MonitorBundle\Helper\RunnerManager;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputArgument;
 
 class HealthCheckCommand extends Command
 {
@@ -29,7 +29,7 @@ public function __construct(ConsoleReporter $reporter, RawConsoleReporter $rawRe
     protected function configure()
     {
         $this
-            ->setName('monitor:health')            
+            ->setName('monitor:health')
             ->setDescription('Runs Health Checks')
             ->addArgument(
                 'checkName',
@@ -54,16 +54,13 @@ protected function configure()
     }
 
     /**
-     * @param InputInterface  $input
-     * @param OutputInterface $output
-     *
      * @return int
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $failureCount = 0;
 
-        $groups = $input->getOption('group') ?: array(null);
+        $groups = $input->getOption('group') ?: [null];
         $allGroups = $input->getOption('all');
         $checkName = $input->getArgument('checkName');
         $nagios = $input->getOption('nagios');

diff --git a/Command/ListChecksCommand.php b/Command/ListChecksCommand.php
@@ -8,7 +8,6 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
 
 class ListChecksCommand extends Command
 {
@@ -68,9 +67,6 @@ protected function listChecks(InputInterface $input, OutputInterface $output)
         $this->doListChecks($output, $runner);
     }
 
-    /**
-     * @param OutputInterface $output
-     */
     protected function listAllChecks(OutputInterface $output)
     {
         foreach ($this->runnerManager->getRunners() as $group => $runner) {
@@ -80,9 +76,6 @@ protected function listAllChecks(OutputInterface $output)
         }
     }
 
-    /**
-     * @param OutputInterface $output
-     */
     protected function listReporters(OutputInterface $output)
     {
         $reporters = $this->runner->getAdditionalReporters();
@@ -95,20 +88,13 @@ protected function listReporters(OutputInterface $output)
         }
     }
 
-    /**
-     * @param OutputInterface $output
-     */
     protected function listGroups(OutputInterface $output)
     {
         foreach ($this->runnerManager->getGroups() as $group) {
             $output->writeln($group);
         }
     }
 
-    /**
-     * @param OutputInterface $output
-     * @param Runner          $runner
-     */
     private function doListChecks(OutputInterface $output, Runner $runner)
     {
         $checks = $runner->getChecks();