Do fewer allocations for simple default values.

Don't allocate arrays when we are only assigning a single array key value.
cakephp · Aug 29, 2016 · 80c123b · 80c123b
1 parent 10e5734
commit 80c123b
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 16 deletions.
diff --git a/src/Auth/FallbackPasswordHasher.php b/src/Auth/FallbackPasswordHasher.php
@@ -49,10 +49,8 @@ public function __construct(array $config = [])
     {
         parent::__construct($config);
         foreach ($this->_config['hashers'] as $key => $hasher) {
-            if (!is_string($hasher)) {
-                $hasher += [
-                    'className' => $key,
-                ];
+            if (is_array($hasher) && !isset($hasher['className'])) {
+                $hasher['className'] = $key;
             }
             $this->_hashers[] = PasswordHasherFactory::build($hasher);
         }

diff --git a/src/Controller/Component/FlashComponent.php b/src/Controller/Component/FlashComponent.php
@@ -88,12 +88,14 @@ public function set($message, array $options = [])
         $options += $this->config();
 
         if ($message instanceof Exception) {
-            $options['params'] += ['code' => $message->getCode()];
+            if (!isset($options['params']['code'])) {
+                $options['params']['code'] = $message->getCode();
+            }
             $message = $message->getMessage();
         }
 
-        if (isset($options['escape'])) {
-            $options['params'] += ['escape' => $options['escape']];
+        if (isset($options['escape']) && !isset($options['params']['escape'])) {
+            $options['params']['escape'] = $options['escape'];
         }
 
         list($plugin, $element) = pluginSplit($options['element']);

diff --git a/src/Mailer/Email.php b/src/Mailer/Email.php
@@ -1390,8 +1390,8 @@ public static function deliver($to = null, $subject = null, $message = null, $tr
     {
         $class = __CLASS__;
 
-        if (is_array($transportConfig)) {
-            $transportConfig += ['transport' => 'default'];
+        if (is_array($transportConfig) && !isset($transportConfig['transport'])) {
+            $transportConfig['transport'] = 'default';
         }
         $instance = new $class($transportConfig);
         if ($to !== null) {

diff --git a/src/ORM/Association/BelongsToMany.php b/src/ORM/Association/BelongsToMany.php
@@ -375,7 +375,9 @@ protected function _appendNotMatching($query, $options)
         if (empty($options['negateMatch'])) {
             return;
         }
-        $options += ['conditions' => []];
+        if (!isset($options['conditions'])) {
+            $options['conditions'] = [];
+        }
         $junction = $this->junction();
         $belongsTo = $junction->association($this->source()->alias());
         $conds = $belongsTo->_joinCondition(['foreignKey' => $belongsTo->foreignKey()]);

diff --git a/src/ORM/Association/SelectableAssociationTrait.php b/src/ORM/Association/SelectableAssociationTrait.php
@@ -85,7 +85,9 @@ protected function _buildQuery($options)
 
         $finder = isset($options['finder']) ? $options['finder'] : $this->finder();
         list($finder, $opts) = $this->_extractFinder($finder);
-        $options += ['fields' => []];
+        if (!isset($options['fields'])) {
+            $options['fields'] = [];
+        }
 
         $fetchQuery = $this
             ->find($finder, $opts)

diff --git a/src/ORM/EagerLoader.php b/src/ORM/EagerLoader.php
@@ -200,12 +200,14 @@ public function matching($assoc = null, callable $builder = null, $options = [])
         if ($assoc === null) {
             return $this->_matching->contain();
         }
+        if (!isset($options['joinType'])) {
+            $options['joinType'] = 'INNER';
+        }
 
         $assocs = explode('.', $assoc);
         $last = array_pop($assocs);
         $containments = [];
         $pointer =& $containments;
-        $options += ['joinType' => 'INNER'];
         $opts = ['matching' => true] + $options;
         unset($opts['negateMatch']);
 

diff --git a/src/ORM/Marshaller.php b/src/ORM/Marshaller.php
@@ -79,7 +79,9 @@ protected function _buildPropertyMap($data, $options)
         }
 
         // Map associations
-        $options += ['associated' => []];
+        if (!isset($options['associated'])) {
+            $options['associated'] = [];
+        }
         $include = $this->_normalizeAssociations($options['associated']);
         foreach ($include as $key => $nested) {
             if (is_int($key) && is_scalar($nested)) {

diff --git a/src/Routing/RouteBuilder.php b/src/Routing/RouteBuilder.php
@@ -454,8 +454,8 @@ public function resources($name, $options = [], $callback = null)
      */
     public function connect($route, array $defaults = [], array $options = [])
     {
-        if (empty($options['action'])) {
-            $defaults += ['action' => 'index'];
+        if (!isset($defaults['action'])) {
+            $defaults['action'] = 'index';
         }
 
         if (empty($options['_ext'])) {

diff --git a/src/Routing/Router.php b/src/Routing/Router.php
@@ -223,10 +223,12 @@ public static function connect($route, $defaults = [], $options = [])
      */
     public static function redirect($route, $url, $options = [])
     {
-        $options += ['routeClass' => 'Cake\Routing\Route\RedirectRoute'];
         if (is_string($url)) {
             $url = ['redirect' => $url];
         }
+        if (!isset($options['routeClass'])) {
+            $options['routeClass'] = 'Cake\Routing\Route\RedirectRoute';
+        }
         static::connect($route, $url, $options);
     }