update csfixer

Author: fico7489

.php_cs

@@ -21,12 +21,6 @@ return Config::create()
     ->setRules([
         '@PSR2'              => true,
         '@Symfony'           => true,
-
-        'align_multiline_comment' => true,
-        'blank_line_after_opening_tag' => true,
-        'single_blank_line_before_namespace' => true,
-        'no_unused_imports' => true,
-        'binary_operator_spaces' => ['default' => null],
     ])
     ->setFinder($finder)
 ;

src/EloquentJoinBuilder.php

@@ -19,11 +19,11 @@
 class EloquentJoinBuilder extends Builder
 {
     //constants
-    const AGGREGATE_SUM      = 'SUM';
-    const AGGREGATE_AVG      = 'AVG';
-    const AGGREGATE_MAX      = 'MAX';
-    const AGGREGATE_MIN      = 'MIN';
-    const AGGREGATE_COUNT    = 'COUNT';
+    const AGGREGATE_SUM = 'SUM';
+    const AGGREGATE_AVG = 'AVG';
+    const AGGREGATE_MAX = 'MAX';
+    const AGGREGATE_MIN = 'MIN';
+    const AGGREGATE_COUNT = 'COUNT';
 
     //use table alias for join (real table name or sha1)
     private $useTableAlias = false;
@@ -155,17 +155,17 @@ public function joinRelations($relations, $leftJoin = null)
     private function performJoin($relations, $leftJoin = null)
     {
         //detect join method
-        $leftJoin   = null !== $leftJoin ? $leftJoin : $this->leftJoin;
+        $leftJoin = null !== $leftJoin ? $leftJoin : $this->leftJoin;
         $joinMethod = $leftJoin ? 'leftJoin' : 'join';
 
         //detect current model data
         $relations = explode('.', $relations);
-        $column    = end($relations);
+        $column = end($relations);
         $baseModel = $this->getModel();
         $baseTable = $baseModel->getTable();
         $basePrimaryKey = $baseModel->getKeyName();
 
-        $currentModel      = $baseModel;
+        $currentModel = $baseModel;
         $currentTableAlias = $baseTable;
 
         $relationsAccumulated = [];
@@ -176,13 +176,13 @@ private function performJoin($relations, $leftJoin = null)
             }
 
             /** @var Relation $relatedRelation */
-            $relatedRelation   = $currentModel->$relation();
-            $relatedModel      = $relatedRelation->getRelated();
+            $relatedRelation = $currentModel->$relation();
+            $relatedModel = $relatedRelation->getRelated();
             $relatedPrimaryKey = $relatedModel->getKeyName();
-            $relatedTable      = $relatedModel->getTable();
+            $relatedTable = $relatedModel->getTable();
             $relatedTableAlias = $this->useTableAlias ? sha1($relatedTable) : $relatedTable;
 
-            $relationsAccumulated[]    = $relatedTableAlias;
+            $relationsAccumulated[] = $relatedTableAlias;
             $relationAccumulatedString = implode('_', $relationsAccumulated);
 
             //relations count
@@ -202,7 +202,7 @@ private function performJoin($relations, $leftJoin = null)
 
                         $this->joinQuery($join, $relatedRelation, $relatedTableAlias);
                     });
-                } elseif ($relatedRelation instanceof HasOneJoin  ||  $relatedRelation instanceof HasManyJoin) {
+                } elseif ($relatedRelation instanceof HasOneJoin || $relatedRelation instanceof HasManyJoin) {
                     $relatedKey = $relatedRelation->getQualifiedForeignKeyName();
                     $relatedKey = last(explode('.', $relatedKey));
                     $localKey = $relatedRelation->getQualifiedParentKeyName();
@@ -218,7 +218,7 @@ private function performJoin($relations, $leftJoin = null)
                 }
             }
 
-            $currentModel      = $relatedModel;
+            $currentModel = $relatedModel;
             $currentTableAlias = $relatedTableAlias;
 
             $this->joinedTables[] = implode('_', $relationsAccumulated);

tests/TestCase.php

@@ -63,32 +63,32 @@ protected function getEnvironmentSetUp($app)
     {
         // Setup default database to use sqlite :memory:
         $app['config']->set('database.connections.sqlite', [
-            'driver'   => 'sqlite',
+            'driver' => 'sqlite',
             'database' => ':memory:',
-            'prefix'   => '',
+            'prefix' => '',
         ]);
 
         $app['config']->set('database.connections.mysql', [
-            'driver'    => 'mysql',
-            'host'      => 'localhost',
-            'database'  => 'join',
-            'username'  => 'root',
-            'password'  => '',
-            'charset'   => 'utf8',
+            'driver' => 'mysql',
+            'host' => 'localhost',
+            'database' => 'join',
+            'username' => 'root',
+            'password' => '',
+            'charset' => 'utf8',
             'collation' => 'utf8_unicode_ci',
-            'strict'    => true,
+            'strict' => true,
         ]);
 
         $app['config']->set('database.connections.pgsql', [
-            'driver'    => 'pgsql',
-            'host'      => 'localhost',
-            'database'  => 'join',
-            'username'  => 'postgres',
-            'password'  => 'root',
-            'charset'   => 'utf8',
-            'prefix'    => '',
-            'schema'    => 'public',
-            'sslmode'   => 'prefer',
+            'driver' => 'pgsql',
+            'host' => 'localhost',
+            'database' => 'join',
+            'username' => 'postgres',
+            'password' => 'root',
+            'charset' => 'utf8',
+            'prefix' => '',
+            'schema' => 'public',
+            'sslmode' => 'prefer',
         ]);
 
         $app['config']->set('database.default', env('type', 'sqlite'));
@@ -101,12 +101,12 @@ protected function getPackageProviders($app)
 
     protected function assertQueryMatches($expected, $actual)
     {
-        $actual   = preg_replace('/\s\s+/', ' ', $actual);
-        $actual   = str_replace(['\n', '\r'], '', $actual);
+        $actual = preg_replace('/\s\s+/', ' ', $actual);
+        $actual = str_replace(['\n', '\r'], '', $actual);
 
         $expected = preg_replace('/\s\s+/', ' ', $expected);
         $expected = str_replace(['\n', '\r'], '', $expected);
-        $expected   = '/'.$expected.'/';
+        $expected = '/'.$expected.'/';
         $expected = preg_quote($expected);
         if ('mysql' == $_ENV['type']) {
             $expected = str_replace(['"'], '`', $expected);