Merging some unset calls for better control flow

cakephp · Apr 17, 2017 · 5dc7024 · 5dc7024
1 parent 534fb76
commit 5dc7024
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/src/Datasource/EntityTrait.php b/src/Datasource/EntityTrait.php
@@ -391,8 +391,7 @@ public function unsetProperty($property)
     {
         $property = (array)$property;
         foreach ($property as $p) {
-            unset($this->_properties[$p]);
-            unset($this->_dirty[$p]);
+            unset($this->_properties[$p], $this->_dirty[$p]);
         }
 
         return $this;

diff --git a/src/Http/ServerRequest.php b/src/Http/ServerRequest.php
@@ -387,8 +387,7 @@ protected function _processPost($data)
     protected function _processGet($query, $queryString = '')
     {
         $unsetUrl = '/' . str_replace(['.', ' '], '_', urldecode($this->url));
-        unset($query[$unsetUrl]);
-        unset($query[$this->base . $unsetUrl]);
+        unset($query[$unsetUrl], $query[$this->base . $unsetUrl]);
         if (strlen($queryString)) {
             parse_str($queryString, $queryArgs);
             $query += $queryArgs;

diff --git a/src/ORM/Rule/ExistsIn.php b/src/ORM/Rule/ExistsIn.php
@@ -118,8 +118,7 @@ public function __invoke(EntityInterface $entity, array $options)
             $schema = $source->getSchema();
             foreach ($this->_fields as $i => $field) {
                 if ($schema->column($field) && $schema->isNullable($field) && $entity->get($field) === null) {
-                    unset($bindingKey[$i]);
-                    unset($this->_fields[$i]);
+                    unset($bindingKey[$i], $this->_fields[$i]);
                 }
             }
         }

diff --git a/src/Utility/Hash.php b/src/Utility/Hash.php
@@ -1077,8 +1077,7 @@ public static function diff(array $data, array $compare)
         $intersection = array_intersect_key($data, $compare);
         while (($key = key($intersection)) !== null) {
             if ($data[$key] == $compare[$key]) {
-                unset($data[$key]);
-                unset($compare[$key]);
+                unset($data[$key], $compare[$key]);
             }
             next($intersection);
         }