[9.x] Avoid nested conditions (#40355)

lucasmichot · taylorotwell · web-flow · commit b88546cb137b · 2022-01-12T08:41:57.000-06:00
* No need to use multiple conditions

* Fix StyleCI

* formatting

Co-authored-by: Taylor Otwell &lt;taylor@laravel.com&gt;
diff --git a/src/Illuminate/Console/Parser.php b/src/Illuminate/Console/Parser.php
@@ -21,10 +21,8 @@ public static function parse($expression)
     {
         $name = static::name($expression);
 
-        if (preg_match_all('/\{\s*(.*?)\s*\}/', $expression, $matches)) {
-            if (count($matches[1])) {
-                return array_merge([$name], static::parameters($matches[1]));
-            }
+        if (preg_match_all('/\{\s*(.*?)\s*\}/', $expression, $matches) && count($matches[1])) {
+            return array_merge([$name], static::parameters($matches[1]));
         }
 
         return [$name, [], []];
diff --git a/src/Illuminate/Container/BoundMethod.php b/src/Illuminate/Container/BoundMethod.php
@@ -171,16 +171,14 @@ protected static function addDependencyForCallParameter($container, $parameter,
                 $dependencies[] = $parameters[$className];
 
                 unset($parameters[$className]);
+            } elseif ($parameter->isVariadic()) {
+                $variadicDependencies = $container->make($className);
+
+                $dependencies = array_merge($dependencies, is_array($variadicDependencies)
+                            ? $variadicDependencies
+                            : [$variadicDependencies]);
             } else {
-                if ($parameter->isVariadic()) {
-                    $variadicDependencies = $container->make($className);
-
-                    $dependencies = array_merge($dependencies, is_array($variadicDependencies)
-                                ? $variadicDependencies
-                                : [$variadicDependencies]);
-                } else {
-                    $dependencies[] = $container->make($className);
-                }
+                $dependencies[] = $container->make($className);
             }
         } elseif ($parameter->isDefaultValueAvailable()) {
             $dependencies[] = $parameter->getDefaultValue();
diff --git a/src/Illuminate/Filesystem/Filesystem.php b/src/Illuminate/Filesystem/Filesystem.php
@@ -659,10 +659,8 @@ public function copyDirectory($directory, $destination, $options = null)
             // If the current items is just a regular file, we will just copy this to the new
             // location and keep looping. If for some reason the copy fails we'll bail out
             // and return false, so the developer is aware that the copy process failed.
-            else {
-                if (! $this->copy($item->getPathname(), $target)) {
-                    return false;
-                }
+            elseif (! $this->copy($item->getPathname(), $target)) {
+                return false;
             }
         }
 
diff --git a/src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php b/src/Illuminate/Foundation/Bootstrap/LoadEnvironmentVariables.php
@@ -40,12 +40,10 @@ public function bootstrap(Application $app)
      */
     protected function checkForSpecificEnvironmentFile($app)
     {
-        if ($app->runningInConsole() && ($input = new ArgvInput)->hasParameterOption('--env')) {
-            if ($this->setEnvironmentFilePath(
-                $app, $app->environmentFile().'.'.$input->getParameterOption('--env')
-            )) {
-                return;
-            }
+        if ($app->runningInConsole() &&
+            ($input = new ArgvInput)->hasParameterOption('--env') &&
+            $this->setEnvironmentFilePath($app, $app->environmentFile().'.'.$input->getParameterOption('--env'))) {
+            return;
         }
 
         $environment = Env::get('APP_ENV');
diff --git a/src/Illuminate/Foundation/Exceptions/Handler.php b/src/Illuminate/Foundation/Exceptions/Handler.php
@@ -224,17 +224,14 @@ public function report(Throwable $e)
             return;
         }
 
-        if (Reflector::isCallable($reportCallable = [$e, 'report'])) {
-            if ($this->container->call($reportCallable) !== false) {
-                return;
-            }
+        if (Reflector::isCallable($reportCallable = [$e, 'report']) &&
+            $this->container->call($reportCallable) !== false) {
+            return;
         }
 
         foreach ($this->reportCallbacks as $reportCallback) {
-            if ($reportCallback->handles($e)) {
-                if ($reportCallback($e) === false) {
-                    return;
-                }
+            if ($reportCallback->handles($e) && $reportCallback($e) === false) {
+                return;
             }
         }
 
diff --git a/src/Illuminate/Redis/Connectors/PhpRedisConnector.php b/src/Illuminate/Redis/Connectors/PhpRedisConnector.php
@@ -132,10 +132,8 @@ protected function establishConnection($client, array $config)
             $parameters[] = Arr::get($config, 'read_timeout', 0.0);
         }
 
-        if (version_compare(phpversion('redis'), '5.3.0', '>=')) {
-            if (! is_null($context = Arr::get($config, 'context'))) {
-                $parameters[] = $context;
-            }
+        if (version_compare(phpversion('redis'), '5.3.0', '>=') && ! is_null($context = Arr::get($config, 'context'))) {
+            $parameters[] = $context;
         }
 
         $client->{($persistent ? 'pconnect' : 'connect')}(...$parameters);
@@ -162,10 +160,8 @@ protected function createRedisClusterInstance(array $servers, array $options)
             $parameters[] = $options['password'] ?? null;
         }
 
-        if (version_compare(phpversion('redis'), '5.3.2', '>=')) {
-            if (! is_null($context = Arr::get($options, 'context'))) {
-                $parameters[] = $context;
-            }
+        if (version_compare(phpversion('redis'), '5.3.2', '>=') && ! is_null($context = Arr::get($options, 'context'))) {
+            $parameters[] = $context;
         }
 
         return tap(new RedisCluster(...$parameters), function ($client) use ($options) {
diff --git a/src/Illuminate/Routing/Console/ControllerMakeCommand.php b/src/Illuminate/Routing/Console/ControllerMakeCommand.php
@@ -135,10 +135,9 @@ protected function buildParentReplacements()
     {
         $parentModelClass = $this->parseModel($this->option('parent'));
 
-        if (! class_exists($parentModelClass)) {
-            if ($this->confirm("A {$parentModelClass} model does not exist. Do you want to generate it?", true)) {
-                $this->call('make:model', ['name' => $parentModelClass]);
-            }
+        if (! class_exists($parentModelClass) &&
+            $this->confirm("A {$parentModelClass} model does not exist. Do you want to generate it?", true)) {
+            $this->call('make:model', ['name' => $parentModelClass]);
         }
 
         return [
@@ -164,10 +163,8 @@ protected function buildModelReplacements(array $replace)
     {
         $modelClass = $this->parseModel($this->option('model'));
 
-        if (! class_exists($modelClass)) {
-            if ($this->confirm("A {$modelClass} model does not exist. Do you want to generate it?", true)) {
-                $this->call('make:model', ['name' => $modelClass]);
-            }
+        if (! class_exists($modelClass) && $this->confirm("A {$modelClass} model does not exist. Do you want to generate it?", true)) {
+            $this->call('make:model', ['name' => $modelClass]);
         }
 
         $replace = $this->buildFormRequestReplacements($replace, $modelClass);
diff --git a/src/Illuminate/Session/CookieSessionHandler.php b/src/Illuminate/Session/CookieSessionHandler.php
@@ -77,10 +77,9 @@ public function read($sessionId)
     {
         $value = $this->request->cookies->get($sessionId) ?: '';
 
-        if (! is_null($decoded = json_decode($value, true)) && is_array($decoded)) {
-            if (isset($decoded['expires']) && $this->currentTime() <= $decoded['expires']) {
-                return $decoded['data'];
-            }
+        if (! is_null($decoded = json_decode($value, true)) && is_array($decoded) &&
+            isset($decoded['expires']) && $this->currentTime() <= $decoded['expires']) {
+            return $decoded['data'];
         }
 
         return '';
diff --git a/src/Illuminate/Session/FileSessionHandler.php b/src/Illuminate/Session/FileSessionHandler.php
@@ -75,10 +75,9 @@ public function close()
     #[\ReturnTypeWillChange]
     public function read($sessionId)
     {
-        if ($this->files->isFile($path = $this->path.'/'.$sessionId)) {
-            if ($this->files->lastModified($path) >= Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {
-                return $this->files->sharedGet($path);
-            }
+        if ($this->files->isFile($path = $this->path.'/'.$sessionId) &&
+            $this->files->lastModified($path) >= Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {
+            return $this->files->sharedGet($path);
         }
 
         return '';
diff --git a/src/Illuminate/Testing/Concerns/TestDatabases.php b/src/Illuminate/Testing/Concerns/TestDatabases.php
@@ -45,22 +45,20 @@ protected function bootTestDatabase()
                 Testing\RefreshDatabase::class,
             ];
 
-            if (Arr::hasAny($uses, $databaseTraits)) {
-                if (! ParallelTesting::option('without_databases')) {
-                    $this->whenNotUsingInMemoryDatabase(function ($database) use ($uses) {
-                        [$testDatabase, $created] = $this->ensureTestDatabaseExists($database);
+            if (Arr::hasAny($uses, $databaseTraits) && ! ParallelTesting::option('without_databases')) {
+                $this->whenNotUsingInMemoryDatabase(function ($database) use ($uses) {
+                    [$testDatabase, $created] = $this->ensureTestDatabaseExists($database);
 
-                        $this->switchToDatabase($testDatabase);
+                    $this->switchToDatabase($testDatabase);
 
-                        if (isset($uses[Testing\DatabaseTransactions::class])) {
-                            $this->ensureSchemaIsUpToDate();
-                        }
+                    if (isset($uses[Testing\DatabaseTransactions::class])) {
+                        $this->ensureSchemaIsUpToDate();
+                    }
 
-                        if ($created) {
-                            ParallelTesting::callSetUpTestDatabaseCallbacks($testDatabase);
-                        }
-                    });
-                }
+                    if ($created) {
+                        ParallelTesting::callSetUpTestDatabaseCallbacks($testDatabase);
+                    }
+                });
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,8 @@ public static function parse($expression)`
`21`	`21`	`{`
`22`	`22`	`$name = static::name($expression);`
`23`	`23`
`24`		`- if (preg_match_all('/\{\s(.?)\s*\}/', $expression, $matches)) {`
`25`		`- if (count($matches[1])) {`
`26`		`- return array_merge([$name], static::parameters($matches[1]));`
`27`		`- }`
	`24`	`+ if (preg_match_all('/\{\s(.?)\s*\}/', $expression, $matches) && count($matches[1])) {`
	`25`	`+ return array_merge([$name], static::parameters($matches[1]));`
`28`	`26`	`}`
`29`	`27`
`30`	`28`	`return [$name, [], []];`
Original file line number	Diff line number	Diff line change
`@@ -659,10 +659,8 @@ public function copyDirectory($directory, $destination, $options = null)`
`659`	`659`	`// If the current items is just a regular file, we will just copy this to the new`
`660`	`660`	`// location and keep looping. If for some reason the copy fails we'll bail out`
`661`	`661`	`// and return false, so the developer is aware that the copy process failed.`
`662`		`- else {`
`663`		`- if (! $this->copy($item->getPathname(), $target)) {`
`664`		`- return false;`
`665`		`- }`
	`662`	`+ elseif (! $this->copy($item->getPathname(), $target)) {`
	`663`	`+ return false;`
`666`	`664`	`}`
`667`	`665`	`}`
`668`	`666`
Original file line number	Diff line number	Diff line change
`@@ -224,17 +224,14 @@ public function report(Throwable $e)`
`224`	`224`	`return;`
`225`	`225`	`}`
`226`	`226`
`227`		`- if (Reflector::isCallable($reportCallable = [$e, 'report'])) {`
`228`		`- if ($this->container->call($reportCallable) !== false) {`
`229`		`- return;`
`230`		`- }`
	`227`	`+ if (Reflector::isCallable($reportCallable = [$e, 'report']) &&`
	`228`	`+ $this->container->call($reportCallable) !== false) {`
	`229`	`+ return;`
`231`	`230`	`}`
`232`	`231`
`233`	`232`	`foreach ($this->reportCallbacks as $reportCallback) {`
`234`		`- if ($reportCallback->handles($e)) {`
`235`		`- if ($reportCallback($e) === false) {`
`236`		`- return;`
`237`		`- }`
	`233`	`+ if ($reportCallback->handles($e) && $reportCallback($e) === false) {`
	`234`	`+ return;`
`238`	`235`	`}`
`239`	`236`	`}`
`240`	`237`
Original file line number	Diff line number	Diff line change
`@@ -132,10 +132,8 @@ protected function establishConnection($client, array $config)`
`132`	`132`	`$parameters[] = Arr::get($config, 'read_timeout', 0.0);`
`133`	`133`	`}`
`134`	`134`
`135`		`- if (version_compare(phpversion('redis'), '5.3.0', '>=')) {`
`136`		`- if (! is_null($context = Arr::get($config, 'context'))) {`
`137`		`- $parameters[] = $context;`
`138`		`- }`
	`135`	`+ if (version_compare(phpversion('redis'), '5.3.0', '>=') && ! is_null($context = Arr::get($config, 'context'))) {`
	`136`	`+ $parameters[] = $context;`
`139`	`137`	`}`
`140`	`138`
`141`	`139`	`$client->{($persistent ? 'pconnect' : 'connect')}(...$parameters);`
`@@ -162,10 +160,8 @@ protected function createRedisClusterInstance(array $servers, array $options)`
`162`	`160`	`$parameters[] = $options['password'] ?? null;`
`163`	`161`	`}`
`164`	`162`
`165`		`- if (version_compare(phpversion('redis'), '5.3.2', '>=')) {`
`166`		`- if (! is_null($context = Arr::get($options, 'context'))) {`
`167`		`- $parameters[] = $context;`
`168`		`- }`
	`163`	`+ if (version_compare(phpversion('redis'), '5.3.2', '>=') && ! is_null($context = Arr::get($options, 'context'))) {`
	`164`	`+ $parameters[] = $context;`
`169`	`165`	`}`
`170`	`166`
`171`	`167`	`return tap(new RedisCluster(...$parameters), function ($client) use ($options) {`
Original file line number	Diff line number	Diff line change
`@@ -135,10 +135,9 @@ protected function buildParentReplacements()`
`135`	`135`	`{`
`136`	`136`	`$parentModelClass = $this->parseModel($this->option('parent'));`
`137`	`137`
`138`		`- if (! class_exists($parentModelClass)) {`
`139`		`- if ($this->confirm("A {$parentModelClass} model does not exist. Do you want to generate it?", true)) {`
`140`		`- $this->call('make:model', ['name' => $parentModelClass]);`
`141`		`- }`
	`138`	`+ if (! class_exists($parentModelClass) &&`
	`139`	`+ $this->confirm("A {$parentModelClass} model does not exist. Do you want to generate it?", true)) {`
	`140`	`+ $this->call('make:model', ['name' => $parentModelClass]);`
`142`	`141`	`}`
`143`	`142`
`144`	`143`	`return [`
`@@ -164,10 +163,8 @@ protected function buildModelReplacements(array $replace)`
`164`	`163`	`{`
`165`	`164`	`$modelClass = $this->parseModel($this->option('model'));`
`166`	`165`
`167`		`- if (! class_exists($modelClass)) {`
`168`		`- if ($this->confirm("A {$modelClass} model does not exist. Do you want to generate it?", true)) {`
`169`		`- $this->call('make:model', ['name' => $modelClass]);`
`170`		`- }`
	`166`	`+ if (! class_exists($modelClass) && $this->confirm("A {$modelClass} model does not exist. Do you want to generate it?", true)) {`
	`167`	`+ $this->call('make:model', ['name' => $modelClass]);`
`171`	`168`	`}`
`172`	`169`
`173`	`170`	`$replace = $this->buildFormRequestReplacements($replace, $modelClass);`
Original file line number	Diff line number	Diff line change
`@@ -77,10 +77,9 @@ public function read($sessionId)`
`77`	`77`	`{`
`78`	`78`	`$value = $this->request->cookies->get($sessionId) ?: '';`
`79`	`79`
`80`		`- if (! is_null($decoded = json_decode($value, true)) && is_array($decoded)) {`
`81`		`- if (isset($decoded['expires']) && $this->currentTime() <= $decoded['expires']) {`
`82`		`- return $decoded['data'];`
`83`		`- }`
	`80`	`+ if (! is_null($decoded = json_decode($value, true)) && is_array($decoded) &&`
	`81`	`+ isset($decoded['expires']) && $this->currentTime() <= $decoded['expires']) {`
	`82`	`+ return $decoded['data'];`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`return '';`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,9 @@ public function close()`
`75`	`75`	`#[\ReturnTypeWillChange]`
`76`	`76`	`public function read($sessionId)`
`77`	`77`	`{`
`78`		`- if ($this->files->isFile($path = $this->path.'/'.$sessionId)) {`
`79`		`- if ($this->files->lastModified($path) >= Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {`
`80`		`- return $this->files->sharedGet($path);`
`81`		`- }`
	`78`	`+ if ($this->files->isFile($path = $this->path.'/'.$sessionId) &&`
	`79`	`+ $this->files->lastModified($path) >= Carbon::now()->subMinutes($this->minutes)->getTimestamp()) {`
	`80`	`+ return $this->files->sharedGet($path);`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`return '';`