Browse Source

Merge pull request #11770 from bcrowe/variadic-isset

Use variadic isset
Mark Story 8 years ago
parent
commit
f6e386d798
2 changed files with 2 additions and 2 deletions
  1. 1 1
      src/ORM/EagerLoader.php
  2. 1 1
      src/Validation/Validation.php

+ 1 - 1
src/ORM/EagerLoader.php

@@ -398,7 +398,7 @@ class EagerLoader
 
             $pointer += [$table => []];
 
-            if (isset($options['queryBuilder']) && isset($pointer[$table]['queryBuilder'])) {
+            if (isset($options['queryBuilder'], $pointer[$table]['queryBuilder'])) {
                 $first = $pointer[$table]['queryBuilder'];
                 $second = $options['queryBuilder'];
                 $options['queryBuilder'] = function ($query) use ($first, $second) {

+ 1 - 1
src/Validation/Validation.php

@@ -1231,7 +1231,7 @@ class Validation
         if (isset($options['width'])) {
             $validWidth = self::comparison($width, $options['width'][0], $options['width'][1]);
         }
-        if (isset($validHeight) && isset($validWidth)) {
+        if (isset($validHeight, $validWidth)) {
             return ($validHeight && $validWidth);
         }
         if (isset($validHeight)) {