Isset and unset do no need to be called multiple time. (#41219)

laravel · Feb 24, 2022 · a2708ab · a2708ab
1 parent ac8f610
commit a2708ab
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/Illuminate/Cache/CacheManager.php b/src/Illuminate/Cache/CacheManager.php
@@ -264,7 +264,7 @@ protected function newDynamodbClient(array $config)
             'endpoint' => $config['endpoint'] ?? null,
         ];
 
-        if (isset($config['key']) && isset($config['secret'])) {
+        if (isset($config['key'], $config['secret'])) {
             $dynamoConfig['credentials'] = Arr::only(
                 $config, ['key', 'secret', 'token']
             );

diff --git a/src/Illuminate/Support/Reflector.php b/src/Illuminate/Support/Reflector.php
@@ -23,8 +23,7 @@ public static function isCallable($var, $syntaxOnly = false)
             return is_callable($var, $syntaxOnly);
         }
 
-        if ((! isset($var[0]) || ! isset($var[1])) ||
-            ! is_string($var[1] ?? null)) {
+        if (! isset($var[0], $var[1]) || ! is_string($var[1] ?? null)) {
             return false;
         }
 

diff --git a/src/Illuminate/View/Compilers/ComponentTagCompiler.php b/src/Illuminate/View/Compilers/ComponentTagCompiler.php
@@ -296,7 +296,7 @@ public function findClassByComponent(string $component)
 
         $prefix = $segments[0];
 
-        if (! isset($this->namespaces[$prefix]) || ! isset($segments[1])) {
+        if (! isset($this->namespaces[$prefix], $segments[1])) {
             return;
         }
 

diff --git a/tests/Database/DatabaseMigrationCreatorTest.php b/tests/Database/DatabaseMigrationCreatorTest.php
@@ -35,8 +35,7 @@ public function testBasicCreateMethodCallsPostCreateHooks()
         $table = 'baz';
 
         $creator = $this->getCreator();
-        unset($_SERVER['__migration.creator.table']);
-        unset($_SERVER['__migration.creator.path']);
+        unset($_SERVER['__migration.creator.table'], $_SERVER['__migration.creator.path']);
         $creator->afterCreate(function ($table, $path) {
             $_SERVER['__migration.creator.table'] = $table;
             $_SERVER['__migration.creator.path'] = $path;
@@ -55,8 +54,7 @@ public function testBasicCreateMethodCallsPostCreateHooks()
         $this->assertEquals($_SERVER['__migration.creator.table'], $table);
         $this->assertEquals($_SERVER['__migration.creator.path'], 'foo/foo_create_bar.php');
 
-        unset($_SERVER['__migration.creator.table']);
-        unset($_SERVER['__migration.creator.path']);
+        unset($_SERVER['__migration.creator.table'], $_SERVER['__migration.creator.path']);
     }
 
     public function testTableUpdateMigrationStoresMigrationFile()
-Original file line number
+Diff line change
@@ Expand Up / @@ -296,7 +296,7 @@ public function findClassByComponent(string $component) @@
             $prefix = $segments[0];
-            if (! isset($this->namespaces[$prefix]) || ! isset($segments[1])) {
+            if (! isset($this->namespaces[$prefix], $segments[1])) {
                 return;
             }
@@ Expand Down @@