Sorry, wrong branch :(

.travis.yml

@@ -18,6 +18,10 @@ env:
 services:
   - memcached
   - redis-server
+  - postgresql
+
+addons:
+  postgresql: "9.4"
 
 cache:
   directories:
@@ -76,8 +80,5 @@ script:
 
   - if [[ $PHPCS = 1 ]]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi
 
-after_success:
-  - if [[ $DEFAULT = 1 && $TRAVIS_PHP_VERSION = 7.* ]]; then bash <(curl -s https://codecov.io/bash); fi
-
 notifications:
   email: false

VERSION.txt

@@ -16,4 +16,4 @@
 // @license       http://www.opensource.org/licenses/mit-license.php MIT License
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-3.2.11
+3.3.0-dev

composer.json

@@ -23,10 +23,11 @@
         "ext-mbstring": "*",
         "cakephp/chronos": "*",
         "aura/intl": "1.1.*",
-        "psr/log": "1.0"
+        "psr/log": "1.0",
+        "zendframework/zend-diactoros": "~1.0"
     },
     "suggest": {
-      "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation."
+        "ext-openssl": "To use Security::encrypt() or have secure CSRF token generation."
     },
     "require-dev": {
         "phpunit/phpunit": "*",
@@ -46,11 +47,12 @@
     "autoload-dev": {
         "psr-4": {
             "Cake\\Test\\": "tests",
-            "Company\\TestPluginThree\\Test\\": "tests/test_app/Plugin/Company/TestPluginThree/tests",
             "TestApp\\": "tests/test_app/TestApp",
             "TestPlugin\\": "tests/test_app/Plugin/TestPlugin/src",
             "TestPlugin\\Test\\": "tests/test_app/Plugin/TestPlugin/tests",
             "TestPluginTwo\\": "tests/test_app/Plugin/TestPluginTwo/src",
+            "Company\\TestPluginThree\\": "tests/test_app/Plugin/Company/TestPluginThree/src",
+            "Company\\TestPluginThree\\Test\\": "tests/test_app/Plugin/Company/TestPluginThree/tests",
             "PluginJs\\": "tests/test_app/Plugin/PluginJs/src"
         }
     },

config/bootstrap.php

@@ -17,18 +17,6 @@
 
 define('TIME_START', microtime(true));
 
-// @deprecated Backward compatibility with 2.x series
-if (PHP_VERSION_ID < 70000) {
-    class_alias('Cake\Utility\Text', 'Cake\Utility\String');
-}
-
-// @deprecated Backward compatibility with 2.x, 3.0.x
-class_alias('Cake\Mailer\AbstractTransport', 'Cake\Network\Email\AbstractTransport');
-class_alias('Cake\Mailer\Transport\DebugTransport', 'Cake\Network\Email\DebugTransport');
-class_alias('Cake\Mailer\Email', 'Cake\Network\Email\Email');
-class_alias('Cake\Mailer\Transport\MailTransport', 'Cake\Network\Email\MailTransport');
-class_alias('Cake\Mailer\Transport\SmtpTransport', 'Cake\Network\Email\SmtpTransport');
-
 require CAKE . 'basics.php';
 
 // Sets the initial router state so future reloads work.

src/Auth/BaseAuthorize.php

@@ -57,7 +57,7 @@ public function __construct(ComponentRegistry $registry, array $config = [])
     /**
      * Checks user authorization.
      *
-     * @param array $user Active user data
+     * @param array|\ArrayAccess $user Active user data
      * @param \Cake\Network\Request $request Request instance.
      * @return bool
      */

src/Auth/ControllerAuthorize.php

@@ -83,7 +83,7 @@ public function controller(Controller $controller = null)
     /**
      * Checks user authorization using a controller callback.
      *
-     * @param array $user Active user data
+     * @param array|\ArrayAccess $user Active user data
      * @param \Cake\Network\Request $request Request instance.
      * @return bool
      */

src/Auth/Storage/MemoryStorage.php

@@ -45,7 +45,7 @@ public function read()
     /**
      * {@inheritDoc}
      */
-    public function write(array $user)
+    public function write($user)
     {
         $this->_user = $user;
     }

src/Auth/Storage/SessionStorage.php

@@ -91,10 +91,10 @@ public function read()
      *
      * The session id is also renewed to help mitigate issues with session replays.
      *
-     * @param array $user User record.
+     * @param array|\ArrayAccess $user User record.
      * @return void
      */
-    public function write(array $user)
+    public function write($user)
     {
         $this->_user = $user;
 

src/Auth/Storage/StorageInterface.php

@@ -30,10 +30,10 @@ public function read();
     /**
      * Write user record.
      *
-     * @param array $user User record.
+     * @param array|\ArrayAccess $user User record.
      * @return void
      */
-    public function write(array $user);
+    public function write($user);
 
     /**
      * Delete user record.

src/Collection/CollectionInterface.php

@@ -945,4 +945,32 @@ public function isEmpty();
      * @return \Iterator
      */
     public function unwrap();
+
+    /**
+     * Transpose rows and columns into columns and rows
+     *
+     * ### Example:
+     *
+     * ```
+     * $items = [
+     *       ['Products', '2012', '2013', '2014'],
+     *       ['Product A', '200', '100', '50'],
+     *       ['Product B', '300', '200', '100'],
+     *       ['Product C', '400', '300', '200'],
+     * ]
+     *
+     * $transpose = (new Collection($items))->transpose()->toList();
+     *
+     * // Returns
+     * // [
+     * //     ['Products', 'Product A', 'Product B', 'Product C'],
+     * //     ['2012', '200', '300', '400'],
+     * //     ['2013', '100', '200', '300'],
+     * //     ['2014', '50', '100', '200'],
+     * // ]
+     * ```
+     *
+     * @return \Cake\Collection\CollectionInterface
+     */
+    public function transpose();
 }

src/Collection/CollectionTrait.php

@@ -30,6 +30,7 @@
 use Cake\Collection\Iterator\ZipIterator;
 use Countable;
 use LimitIterator;
+use LogicException;
 use RecursiveIteratorIterator;
 use Traversable;
 
@@ -658,4 +659,23 @@ public function _unwrap()
     {
         return $this->unwrap();
     }
+
+    /**
+     * {@inheritDoc}
+     *
+     * @return \Cake\Collection\CollectionInterface
+     */
+    public function transpose()
+    {
+        $arrayValue = $this->toList();
+        $length = count(current($arrayValue));
+        $result = [];
+        foreach ($arrayValue as $column => $row) {
+            if (count($row) != $length) {
+                throw new LogicException('Child arrays do not have even length');
+            }
+            $result[] = array_column($arrayValue, $column);
+        }
+        return new Collection($result);
+    }
 }

src/Console/Shell.php

@@ -447,7 +447,7 @@ public function runCommand($argv, $autoMethod = false, $extra = [])
         if ($this->hasTask($command) && isset($subcommands[$command])) {
             $this->startup();
             array_shift($argv);
-            return $this->{$method}->runCommand($argv, false);
+            return $this->{$method}->runCommand($argv, false, ['requested' => true]);
         }
 
         if ($this->hasMethod('main')) {
@@ -640,11 +640,11 @@ public function out($message = null, $newlines = 1, $level = Shell::NORMAL)
      *
      * @param string|array|null $message A string or an array of strings to output
      * @param int $newlines Number of newlines to append
-     * @return void
+     * @return int|bool Returns the number of bytes returned from writing to stderr.
      */
     public function err($message = null, $newlines = 1)
     {
-        $this->_io->err($message, $newlines);
+        return $this->_io->err('<error>' . $message . '</error>', $newlines);
     }
 
     /**
@@ -671,7 +671,7 @@ public function info($message = null, $newlines = 1, $level = Shell::NORMAL)
      */
     public function warn($message = null, $newlines = 1)
     {
-        return $this->err('<warning>' . $message . '</warning>', $newlines);
+        return $this->_io->err('<warning>' . $message . '</warning>', $newlines);
     }
 
     /**

src/Controller/Component/AuthComponent.php

@@ -470,7 +470,7 @@ protected function _setDefaults()
      * Each adapter will be checked in sequence, if any of them return true, then the user will
      * be authorized for the request.
      *
-     * @param array|null $user The user to check the authorization of.
+     * @param array|\ArrayAccess|null $user The user to check the authorization of.
      *   If empty the user fetched from storage will be used.
      * @param \Cake\Network\Request|null $request The request to authenticate for.
      *   If empty, the current request will be used.
@@ -622,11 +622,11 @@ public function deny($actions = null)
      * The storage class is configured using `storage` config key or passing
      * instance to AuthComponent::storage().
      *
-     * @param array $user Array of user data.
+     * @param array|\ArrayAccess $user User data.
      * @return void
      * @link http://book.cakephp.org/3.0/en/controllers/components/authentication.html#identifying-users-and-logging-them-in
      */
-    public function setUser(array $user)
+    public function setUser($user)
     {
         $this->storage()->write($user);
     }
@@ -767,7 +767,7 @@ public function identify()
         }
         foreach ($this->_authenticateObjects as $auth) {
             $result = $auth->authenticate($this->request, $this->response);
-            if (!empty($result) && is_array($result)) {
+            if (!empty($result)) {
                 $this->_authenticationProvider = $auth;
                 $event = $this->dispatchEvent('Auth.afterIdentify', [$result, $auth]);
                 if ($event->result !== null) {

src/Controller/Controller.php

@@ -645,7 +645,18 @@ public function referer($default = null, $local = false)
 
         $referer = $this->request->referer($local);
         if ($referer === '/' && $default && $default !== $referer) {
-            return Router::url($default, !$local);
+            $url = Router::url($default, !$local);
+            if ($local
+                && $this->request->base
+                && strpos($url, $this->request->base) === 0
+            ) {
+                $url = substr($url, strlen($this->request->base));
+                if ($url[0] !== '/') {
+                    $url = '/' . $url;
+                }
+                return $url;
+            }
+            return $url;
         }
         return $referer;
     }

src/Core/functions.php

@@ -126,19 +126,22 @@ function namespaceSplit($class)
      * In terminals this will act similar to using print_r() directly, when not run on cli
      * print_r() will also wrap <pre> tags around the output of given variable. Similar to debug().
      *
+     * This function returns the same variable that was passed.
+     *
      * @param mixed $var Variable to print out.
-     * @return void
-     * @see debug()
+     * @return mixed the same $var that was passed to this function
      * @link http://book.cakephp.org/3.0/en/core-libraries/global-constants-and-functions.html#pr
+     * @see debug()
      */
     function pr($var)
     {
         if (!Configure::read('debug')) {
-            return;
+            return $var;
         }
 
         $template = (PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg') ? '<pre class="pr">%s</pre>' : "\n%s\n\n";
         printf($template, trim(print_r($var, true)));
+        return $var;
     }
 
 }
@@ -150,19 +153,22 @@ function pr($var)
      * In terminals this will act similar to using json_encode() with JSON_PRETTY_PRINT directly, when not run on cli
      * will also wrap <pre> tags around the output of given variable. Similar to pr().
      *
+     * This function returns the same variable that was passed.
+     *
      * @param mixed $var Variable to print out.
-     * @return void
+     * @return mixed the same $var that was passed to this function
      * @see pr()
      * @link http://book.cakephp.org/3.0/en/core-libraries/global-constants-and-functions.html#pj
      */
     function pj($var)
     {
         if (!Configure::read('debug')) {
-            return;
+            return $var;
         }
 
         $template = (PHP_SAPI !== 'cli' && PHP_SAPI !== 'phpdbg') ? '<pre class="pj">%s</pre>' : "\n%s\n\n";
         printf($template, trim(json_encode($var, JSON_PRETTY_PRINT)));
+        return $var;
     }
 
 }

src/Database/Connection.php

@@ -548,11 +548,12 @@ public function supportsDynamicConstraints()
      * ```
      * $connection->transactional(function ($connection) {
      *   $connection->newQuery()->delete('users')->execute();
-     * });
+     * }, Connection::SERIALIZABLE);
      * ```
      */
-    public function transactional(callable $callback)
+    public function transactional(callable $callback, $isolationLevel = null)
     {
+        $this->isolationLevel($isolationLevel);
         $this->begin();
 
         try {
@@ -695,6 +696,38 @@ public function log($sql)
         $this->logger()->log($query);
     }
 
+    /**
+     * Check if cross talk is supported between two connections
+     *
+     * @param ConnectionInterface $target Connection to check cross talk with
+     *
+     * @return bool
+     */
+    public function supportsCrossWith(ConnectionInterface $target)
+    {
+        $sourceConfig = $this->config();
+        $targetConfig = $target->config();
+
+        // No need to do report cross support in case the same connection is being used
+        if ($sourceConfig['name'] === $targetConfig['name']) {
+            return false;
+        }
+
+        $configToCheck = [
+            'driver',
+            'host',
+            'port'
+        ];
+
+        foreach ($configToCheck as $config) {
+            if ((isset($sourceConfig[$config])) && ($sourceConfig[$config] !== $targetConfig[$config])) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Returns a new statement object that will log the activity
      * for the passed original statement instance.
@@ -737,4 +770,9 @@ public function __debugInfo()
             'logger' => $this->_logger
         ];
     }
+
+    private function isolationLevel($isolationLevel = null)
+    {
+        return $this->_driver->transactionIsolationLevel($isolationLevel);
+    }
 }