Merge branch 'master' into 3.next

cakephp · Feb 4, 2017 · 8258072 · 8258072
2 parents c0e5fd1 + d4a8f72
commit 8258072
Show file tree

Hide file tree

Showing 29 changed files with 617 additions and 331 deletions.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
         "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation."
     },
     "require-dev": {
-        "phpunit/phpunit": "*",
+        "phpunit/phpunit": "<6.0",
         "cakephp/cakephp-codesniffer": "~2.1"
     },
     "autoload": {

diff --git a/src/Collection/CollectionTrait.php b/src/Collection/CollectionTrait.php
@@ -739,6 +739,9 @@ public function transpose()
             if (count($row) != $length) {
                 throw new LogicException('Child arrays do not have even length');
             }
+        }
+
+        for ($column = 0; $column < $length; $column++) {
             $result[] = array_column($arrayValue, $column);
         }
 

diff --git a/src/Database/Expression/ValuesExpression.php b/src/Database/Expression/ValuesExpression.php
@@ -268,9 +268,6 @@ public function sql(ValueBinder $generator)
             $this->_processExpressions();
         }
 
-        $i = 0;
-        $columns = [];
-
         $columns = $this->_columnNames();
         $defaults = array_fill_keys($columns, null);
         $placeholders = [];
@@ -293,7 +290,7 @@ public function sql(ValueBinder $generator)
                     continue;
                 }
 
-                $placeholder = $generator->placeholder($i);
+                $placeholder = $generator->placeholder('c');
                 $rowPlaceholders[] = $placeholder;
                 $generator->bind($placeholder, $value, $types[$column]);
             }

diff --git a/src/Database/Statement/MysqlStatement.php b/src/Database/Statement/MysqlStatement.php
@@ -32,9 +32,14 @@ class MysqlStatement extends PDOStatement
      */
     public function execute($params = null)
     {
-        $this->_driver->connection()->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, $this->_bufferResults);
-        $result = $this->_statement->execute($params);
-        $this->_driver->connection()->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
+        $connection = $this->_driver->connection();
+
+        try {
+            $connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, $this->_bufferResults);
+            $result = $this->_statement->execute($params);
+        } finally {
+            $connection->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, true);
+        }
 
         return $result;
     }

diff --git a/src/Database/ValueBinder.php b/src/Database/ValueBinder.php
@@ -67,8 +67,8 @@ public function bind($param, $value, $type = 'string')
     public function placeholder($token)
     {
         $number = $this->_bindingsCount++;
-        if ($token[0] !== ':' || $token !== '?') {
-            $token = sprintf(':c%s', $number);
+        if ($token[0] !== ':' && $token !== '?') {
+            $token = sprintf(':%s%s', $token, $number);
         }
 
         return $token;
@@ -86,14 +86,13 @@ public function generateManyNamed($values, $type = 'string')
     {
         $placeholders = [];
         foreach ($values as $k => $value) {
-            $param = ":c" . $this->_bindingsCount;
+            $param = $this->placeholder('c');
             $this->_bindings[$param] = [
                 'value' => $value,
                 'type' => $type,
                 'placeholder' => substr($param, 1),
             ];
             $placeholders[$k] = $param;
-            $this->_bindingsCount++;
         }
 
         return $placeholders;
@@ -143,7 +142,7 @@ public function attachTo($statement)
         if (empty($bindings)) {
             return;
         }
-        $params = $types = [];
+
         foreach ($bindings as $b) {
             $statement->bindValue($b['placeholder'], $b['value'], $b['type']);
         }

diff --git a/src/I18n/TranslatorFactory.php b/src/I18n/TranslatorFactory.php
@@ -17,6 +17,7 @@
 use Aura\Intl\FormatterInterface;
 use Aura\Intl\TranslatorFactory as BaseTranslatorFactory;
 use Aura\Intl\TranslatorInterface;
+use RuntimeException;
 
 /**
  * Factory to create translators
@@ -31,4 +32,31 @@ class TranslatorFactory extends BaseTranslatorFactory
      * @var string
      */
     protected $class = 'Cake\I18n\Translator';
+
+    /**
+     * Returns a new Translator.
+     *
+     * @param string $locale The locale code for the translator.
+     * @param array $messages The localized messages for the translator.
+     * @param \Aura\Intl\FormatterInterface $formatter The formatter to use for interpolating token values.
+     * @param \Aura\Intl\TranslatorInterface $fallback A fallback translator to use, if any.
+     * @throws \Cake\Core\Exception\Exception If fallback class does not match Cake\I18n\Translator
+     * @return \Cake\I18n\Translator
+     */
+    public function newInstance(
+        $locale,
+        array $messages,
+        FormatterInterface $formatter,
+        TranslatorInterface $fallback = null
+    ) {
+        $class = $this->class;
+        if ($fallback !== null && get_class($fallback) !== $class) {
+            throw new RuntimeException(sprintf(
+                'Translator fallback class %s does not match Cake\I18n\Translator, try clearing your _cake_core_ cache.',
+                get_class($fallback)
+            ));
+        }
+
+        return new $class($locale, $messages, $formatter, $fallback);
+    }
 }
diff --git a/src/Mailer/Email.php b/src/Mailer/Email.php
@@ -2046,7 +2046,7 @@ protected function _logDelivery($contents)
         }
         Log::write(
             $config['level'],
-            PHP_EOL . $contents['headers'] . PHP_EOL . $contents['message'],
+            PHP_EOL . $contents['headers'] . PHP_EOL . PHP_EOL . $contents['message'],
             $config['scope']
         );
     }

diff --git a/src/Network/Session/CacheSession.php b/src/Network/Session/CacheSession.php
@@ -100,7 +100,11 @@ public function read($id)
      */
     public function write($id, $data)
     {
-        return Cache::write($id, $data, $this->_options['config']);
+        if (!$id) {
+            return false;
+        }
+
+        return (bool)Cache::write($id, $data, $this->_options['config']);
     }
 
     /**
@@ -111,7 +115,9 @@ public function write($id, $data)
      */
     public function destroy($id)
     {
-        return Cache::delete($id, $this->_options['config']);
+        Cache::delete($id, $this->_options['config']);
+
+        return true;
     }
 
     /**

diff --git a/src/ORM/Association/HasMany.php b/src/ORM/Association/HasMany.php
@@ -264,7 +264,9 @@ public function link(EntityInterface $sourceEntity, array $targetEntities, array
 
         $sourceEntity->set($property, $currentEntities);
 
-        $savedEntity = $this->saveAssociated($sourceEntity, $options);
+        $savedEntity = $this->connection()->transactional(function () use ($sourceEntity, $options) {
+            return $this->saveAssociated($sourceEntity, $options);
+        });
 
         $ok = ($savedEntity instanceof EntityInterface);
 

diff --git a/src/ORM/ResultSet.php b/src/ORM/ResultSet.php
@@ -313,10 +313,19 @@ public function first()
      */
     public function serialize()
     {
+        if (!$this->_useBuffering) {
+            $msg = 'You cannot serialize an un-buffered ResultSet. Use Query::bufferResults() to get a buffered ResultSet.';
+            throw new Exception($msg);
+        }
+
         while ($this->valid()) {
             $this->next();
         }
 
+        if ($this->_results instanceof SplFixedArray) {
+            return serialize($this->_results->toArray());
+        }
+
         return serialize($this->_results);
     }
 
@@ -330,9 +339,10 @@ public function serialize()
      */
     public function unserialize($serialized)
     {
-        $this->_results = unserialize($serialized);
+        $results = (array)(unserialize($serialized) ?: []);
+        $this->_results = SplFixedArray::fromArray($results);
         $this->_useBuffering = true;
-        $this->_count = count($this->_results);
+        $this->_count = $this->_results->count();
     }
 
     /**
@@ -351,7 +361,13 @@ public function count()
             return $this->_count = $this->_statement->rowCount();
         }
 
-        return $this->_count = count($this->_results);
+        if ($this->_results instanceof SplFixedArray) {
+            $this->_count = $this->_results->count();
+        } else {
+            $this->_count = count($this->_results);
+        }
+
+        return $this->_count;
     }
 
     /**

diff --git a/src/Template/Element/exception_stack_trace_nav.ctp b/src/Template/Element/exception_stack_trace_nav.ctp
@@ -18,7 +18,7 @@ use Cake\Error\Debugger;
 
 <ul class="stack-trace">
 <?php foreach ($error->getTrace() as $i => $stack): ?>
-    <?php $class = (isset($stack['file']) && strpos(APP, $stack['file']) === false) ? 'vendor-frame' : 'app-frame'; ?>
+    <?php $class = (isset($stack['file']) && strpos($stack['file'], APP) === false) ? 'vendor-frame' : 'app-frame'; ?>
     <li class="stack-frame <?= $class ?>">
     <?php if (isset($stack['function'])): ?>
         <a href="#" data-target="stack-frame-<?= $i ?>">

diff --git a/src/TestSuite/TestCase.php b/src/TestSuite/TestCase.php
@@ -401,7 +401,7 @@ public function assertHtml($expected, $string, $fullDebug = false)
                     }
                     $regex[] = [
                         sprintf('%sClose %s tag', $prefix[0], substr($tags, strlen($match[0]))),
-                        sprintf('%s<[\s]*\/[\s]*%s[\s]*>[\n\r]*', $prefix[1], substr($tags, strlen($match[0]))),
+                        sprintf('%s\s*<[\s]*\/[\s]*%s[\s]*>[\n\r]*', $prefix[1], substr($tags, strlen($match[0]))),
                         $i,
                     ];
                     continue;

diff --git a/src/Validation/Validation.php b/src/Validation/Validation.php
@@ -85,7 +85,7 @@ public static function notEmpty($check)
      */
     public static function notBlank($check)
     {
-        if (empty($check) && $check !== '0' && $check !== 0) {
+        if (empty($check) && !is_bool($check) && !is_numeric($check)) {
             return false;
         }
 

diff --git a/src/Validation/Validator.php b/src/Validation/Validator.php
@@ -1745,7 +1745,7 @@ protected function _canBeEmpty($field, $context)
      */
     protected function _fieldIsEmpty($data)
     {
-        if (empty($data) && $data !== '0' && $data !== false && $data !== 0 && $data !== 0.0) {
+        if (empty($data) && !is_bool($data) && !is_numeric($data)) {
             return true;
         }
         $isArray = is_array($data);

diff --git a/tests/Fixture/AssertHtmlTestCase.php b/tests/Fixture/AssertHtmlTestCase.php