Merge branch 'master' into 3.next

src/Controller/Component/PaginatorComponent.php

@@ -187,9 +187,10 @@ class PaginatorComponent extends Component
             $query->applyOptions($options);
         }
 
+        $cleanQuery = clone $query;
         $results = $query->all();
         $numResults = count($results);
-        $count = $numResults ? $query->count() : 0;
+        $count = $numResults ? $cleanQuery->count() : 0;
 
         $defaults = $this->getDefaults($alias, $settings);
         unset($defaults[0]);

src/Database/Schema/MysqlSchema.php

@@ -406,7 +406,8 @@ class MysqlSchema extends BaseSchema
         }
         $addAutoIncrement = (
             [$name] == (array)$schema->primaryKey() &&
-            !$schema->hasAutoincrement()
+            !$schema->hasAutoincrement() &&
+            !isset($data['autoIncrement'])
         );
         if (in_array($data['type'], [TableSchema::TYPE_INTEGER, TableSchema::TYPE_BIGINTEGER]) &&
             ($data['autoIncrement'] === true || $addAutoIncrement)

src/Http/Client/Request.php

@@ -153,7 +153,7 @@ class Request extends Message implements RequestInterface
      * @param array $headers The headers to add.
      * @return void
      */
-    protected function addHeaders($headers)
+    protected function addHeaders(array $headers)
     {
         foreach ($headers as $key => $val) {
             $normalized = strtolower($key);
@@ -256,5 +256,5 @@ class Request extends Message implements RequestInterface
     }
 }
 
-// @deprecated Add backwards compat alias.
+// @deprecated Add backwards compact alias.
 class_alias('Cake\Http\Client\Request', 'Cake\Network\Http\Request');

src/Http/ServerRequestFactory.php

@@ -151,52 +151,54 @@ abstract class ServerRequestFactory extends BaseFactory
      */
     protected static function getBase($uri, $server)
     {
-        $base = $webroot = $baseUrl = null;
-        $config = Configure::read('App');
-        extract($config);
+        $config = (array)Configure::read('App') + [
+            'base' => null,
+            'webroot' => null,
+            'baseUrl' => null
+        ];
 
-        if ($base !== false && $base !== null) {
-            return [$base, $base . '/'];
+        if ($config['base'] !== false && $config['base'] !== null) {
+            return [$config['base'], $config['base'] . '/'];
         }
 
-        if (!$baseUrl) {
-            $base = dirname(Hash::get($server, 'PHP_SELF'));
+        if (!$config['baseUrl']) {
+            $config['base'] = dirname(Hash::get($server, 'PHP_SELF'));
             // Clean up additional / which cause following code to fail..
-            $base = preg_replace('#/+#', '/', $base);
+            $config['base'] = preg_replace('#/+#', '/', $config['base']);
 
-            $indexPos = strpos($base, '/' . $webroot . '/index.php');
+            $indexPos = strpos($config['base'], '/' . $config['webroot'] . '/index.php');
             if ($indexPos !== false) {
-                $base = substr($base, 0, $indexPos) . '/' . $webroot;
+                $config['base'] = substr($config['base'], 0, $indexPos) . '/' . $config['webroot'];
             }
-            if ($webroot === basename($base)) {
-                $base = dirname($base);
+            if ($config['webroot'] === basename($config['base'])) {
+                $config['base'] = dirname($config['base']);
             }
 
-            if ($base === DIRECTORY_SEPARATOR || $base === '.') {
-                $base = '';
+            if ($config['base'] === DIRECTORY_SEPARATOR || $config['base'] === '.') {
+                $config['base'] = '';
             }
-            $base = implode('/', array_map('rawurlencode', explode('/', $base)));
+            $config['base'] = implode('/', array_map('rawurlencode', explode('/', $config['base'])));
 
-            return [$base, $base . '/'];
+            return [$config['base'], $config['base'] . '/'];
         }
 
-        $file = '/' . basename($baseUrl);
-        $base = dirname($baseUrl);
+        $file = '/' . basename($config['baseUrl']);
+        $config['base'] = dirname($config['baseUrl']);
 
-        if ($base === DIRECTORY_SEPARATOR || $base === '.') {
-            $base = '';
+        if ($config['base'] === DIRECTORY_SEPARATOR || $config['base'] === '.') {
+            $config['base'] = '';
         }
-        $webrootDir = $base . '/';
+        $webrootDir = $config['base'] . '/';
 
         $docRoot = Hash::get($server, 'DOCUMENT_ROOT');
-        $docRootContainsWebroot = strpos($docRoot, $webroot);
+        $docRootContainsWebroot = strpos($docRoot, $config['webroot']);
 
-        if (!empty($base) || !$docRootContainsWebroot) {
-            if (strpos($webrootDir, '/' . $webroot . '/') === false) {
-                $webrootDir .= $webroot . '/';
+        if (!empty($config['base']) || !$docRootContainsWebroot) {
+            if (strpos($webrootDir, '/' . $config['webroot'] . '/') === false) {
+                $webrootDir .= $config['webroot'] . '/';
             }
         }
 
-        return [$base . $file, $webrootDir];
+        return [$config['base'] . $file, $webrootDir];
     }
 }

src/Log/Engine/BaseLog.php

@@ -15,6 +15,7 @@
 namespace Cake\Log\Engine;
 
 use Cake\Core\InstanceConfigTrait;
+use Cake\Datasource\EntityInterface;
 use JsonSerializable;
 use Psr\Log\AbstractLogger;
 
@@ -93,14 +94,18 @@ abstract class BaseLog extends AbstractLogger
             return $data;
         }
 
-        $object = is_object($data);
+        $isObject = is_object($data);
 
-        if ($object && method_exists($data, '__toString')) {
+        if ($isObject && $data instanceof EntityInterface) {
+            return json_encode($data, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
+        }
+
+        if ($isObject && method_exists($data, '__toString')) {
             return (string)$data;
         }
 
-        if ($object && $data instanceof JsonSerializable) {
-            return json_encode($data);
+        if ($isObject && $data instanceof JsonSerializable) {
+            return json_encode($data, JSON_UNESCAPED_UNICODE);
         }
 
         return print_r($data, true);

src/Shell/Helper/ProgressHelper.php

@@ -113,17 +113,19 @@ class ProgressHelper extends Helper
      * Increment the progress bar.
      *
      * @param int $num The amount of progress to advance by.
-     * @return void
+     * @return $this
      */
     public function increment($num = 1)
     {
         $this->_progress = min(max(0, $this->_progress + $num), $this->_total);
+
+        return $this;
     }
 
     /**
      * Render the progress bar based on the current state.
      *
-     * @return void
+     * @return $this;
      */
     public function draw()
     {
@@ -143,5 +145,7 @@ class ProgressHelper extends Helper
         $bar .= str_pad($percent, $numberLen, ' ', STR_PAD_LEFT);
 
         $this->_io->overwrite($bar, 0);
+
+        return $this;
     }
 }

src/Template/Error/missing_action.ctp

@@ -32,13 +32,13 @@ if (isset($controller)) {
     $baseClass = $namespace . '\Controller\AppController';
     $extends = 'AppController';
     $type = 'Controller';
-    $class = $controller;
+    $class = Inflector::camelize($controller);
 }
 // Mailer MissingActionException support
 if (isset($mailer)) {
     $baseClass = 'Cake\Mailer\Mailer';
     $type = $extends = 'Mailer';
-    $class = $mailer;
+    $class = Inflector::camelize($mailer);
 }
 
 if (empty($plugin)) {

src/Template/Error/missing_controller.ctp

@@ -14,11 +14,13 @@
  */
 use Cake\Core\Plugin;
 use Cake\Core\Configure;
+use Cake\Utility\Inflector;
 
 $pluginDot = empty($plugin) ? null : $plugin . '.';
 $namespace = Configure::read('App.namespace');
 $prefixNs = '';
 $prefixPath = '';
+$class = Inflector::camelize($class);
 
 if (!empty($prefix)) {
     $prefix = array_map('\Cake\Utility\Inflector::camelize', explode('/', $prefix));

tests/TestCase/Controller/Component/PaginatorComponentTest.php

@@ -19,6 +19,7 @@ use Cake\Controller\Component\PaginatorComponent;
 use Cake\Controller\Controller;
 use Cake\Core\Configure;
 use Cake\Datasource\ConnectionManager;
+use Cake\Datasource\EntityInterface;
 use Cake\Http\ServerRequest;
 use Cake\Network\Exception\NotFoundException;
 use Cake\ORM\Entity;
@@ -47,7 +48,10 @@ class PaginatorComponentTest extends TestCase
      *
      * @var array
      */
-    public $fixtures = ['core.posts'];
+    public $fixtures = [
+        'core.posts', 'core.articles', 'core.articles_tags',
+        'core.authors', 'core.authors_tags', 'core.tags'
+    ];
 
     /**
      * Don't load data for fixtures for all tests
@@ -203,6 +207,34 @@ class PaginatorComponentTest extends TestCase
     }
 
     /**
+     * Test that nested eager loaders don't trigger invalid SQL errors.
+     *
+     * @return void
+     */
+    public function testPaginateNestedEagerLoader()
+    {
+        $this->loadFixtures('Articles', 'Tags', 'Authors', 'ArticlesTags', 'AuthorsTags');
+        $articles = TableRegistry::get('Articles');
+        $articles->belongsToMany('Tags');
+        $tags = TableRegistry::get('Tags');
+        $tags->belongsToMany('Authors');
+
+        $articles->eventManager()->on('Model.beforeFind', function ($event, $query) {
+            $query ->matching('Tags', function ($q) {
+                return $q->matching('Authors', function ($q) {
+                    return $q->where(['Authors.name' => 'larry']);
+                });
+            });
+        });
+        $results = $this->Paginator->paginate($articles, []);
+
+        $result = $results->first();
+        $this->assertInstanceOf(EntityInterface::class, $result);
+        $this->assertInstanceOf(EntityInterface::class, $result->_matchingData['Tags']);
+        $this->assertInstanceOf(EntityInterface::class, $result->_matchingData['Authors']);
+    }
+
+    /**
      * test that flat default pagination parameters work.
      *
      * @return void

tests/TestCase/Database/Schema/MysqlSchemaTest.php

@@ -630,6 +630,11 @@ SQL;
             ],
             [
                 'post_id',
+                ['type' => 'integer', 'length' => 20, 'null' => false, 'autoIncrement' => false],
+                '`post_id` INTEGER(20) NOT NULL'
+            ],
+            [
+                'post_id',
                 ['type' => 'biginteger', 'length' => 20, 'autoIncrement' => true],
                 '`post_id` BIGINT AUTO_INCREMENT'
             ],

tests/TestCase/Error/ExceptionRendererTest.php

@@ -550,6 +550,27 @@ class ExceptionRendererTest extends TestCase
     }
 
     /**
+     * test missingController method
+     *
+     * @return void
+     */
+    public function testMissingControllerLowerCase()
+    {
+        $exception = new MissingControllerException([
+            'class' => 'posts',
+            'prefix' => '',
+            'plugin' => '',
+        ]);
+        $ExceptionRenderer = $this->_mockResponse(new MyCustomExceptionRenderer($exception));
+
+        $result = $ExceptionRenderer->render()->body();
+
+        $this->assertEquals('missingController', $ExceptionRenderer->template);
+        $this->assertContains('Missing Controller', $result);
+        $this->assertContains('<em>PostsController</em>', $result);
+    }
+
+    /**
      * Returns an array of tests to run for the various Cake Exception classes.
      *
      * @return array
@@ -559,6 +580,19 @@ class ExceptionRendererTest extends TestCase
         return [
             [
                 new MissingActionException([
+                    'controller' => 'postsController',
+                    'action' => 'index',
+                    'prefix' => '',
+                    'plugin' => '',
+                ]),
+                [
+                    '/Missing Method in PostsController/',
+                    '/<em>PostsController::index\(\)<\/em>/'
+                ],
+                404
+            ],
+            [
+                new MissingActionException([
                     'controller' => 'PostsController',
                     'action' => 'index',
                     'prefix' => '',

tests/TestCase/Http/Client/RequestTest.php

@@ -22,6 +22,7 @@ use Zend\Diactoros\Uri;
  */
 class RequestTest extends TestCase
 {
+
     /**
      * test string ata, header and constructor
      *
@@ -37,10 +38,44 @@ class RequestTest extends TestCase
         $request = new Request('http://example.com', 'POST', $headers, json_encode($data));
 
         $this->assertEquals('http://example.com', $request->url());
-        $this->assertEquals('POST', $request->getMethod());
+        $this->assertContains($request->getMethod(), 'POST');
         $this->assertEquals('application/json', $request->getHeaderLine('Content-Type'));
         $this->assertEquals(json_encode($data), $request->body());
     }
+    /**
+     * @param array $headers The HTTP headers to set.
+     * @param array|string|null $data The request body to use.
+     * @param string $method The HTTP method to use.
+     *
+     * @dataProvider additionProvider
+     */
+    public function testMethods(array $headers, $data, $method)
+    {
+        $request = new Request('http://example.com', $method, $headers, json_encode($data));
+
+        $this->assertEquals($request->getMethod(), $method);
+        $this->assertEquals('http://example.com', $request->url());
+        $this->assertEquals('application/json', $request->getHeaderLine('Content-Type'));
+        $this->assertEquals(json_encode($data), $request->body());
+    }
+    /**
+     * @dataProvider additionProvider
+     */
+    public function additionProvider()
+    {
+        $headers = [
+            'Content-Type' => 'application/json',
+            'Authorization' => 'Bearer valid-token',
+        ];
+        $data = ['a' => 'b', 'c' => 'd'];
+
+        return [
+            [$headers, $data, Request::METHOD_POST],
+            [$headers, $data, Request::METHOD_GET],
+            [$headers, $data, Request::METHOD_PUT],
+            [$headers, $data, Request::METHOD_DELETE],
+        ];
+    }
 
     /**
      * test array data, header and constructor
@@ -128,7 +163,7 @@ class RequestTest extends TestCase
     }
 
     /**
-     * test method interop.
+     * test method interoperability.
      *
      * @return void
      */
@@ -136,6 +171,7 @@ class RequestTest extends TestCase
     {
         $request = new Request();
         $this->assertSame($request, $request->method(Request::METHOD_GET));
+
         $this->assertEquals(Request::METHOD_GET, $request->method());
         $this->assertEquals(Request::METHOD_GET, $request->getMethod());
 
@@ -293,13 +329,13 @@ class RequestTest extends TestCase
     {
         $request = new Request();
         $result = $request->version('1.0');
-        $this->assertSame($request, $request, 'Should return self');
+        $this->assertSame($request, $result, 'Should return self');
 
         $this->assertSame('1.0', $request->version());
     }
 
     /**
-     * test version interop.
+     * test version Interoperable.
      *
      * @return void
      */

tests/TestCase/Log/Engine/BaseLogTest.php

@@ -0,0 +1,135 @@
+<?php
+/**
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @since         t.b.d.
+ * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ */
+namespace Cake\Test\TestCase\Log\Engine;
+
+use Cake\Log\Engine\BaseLog;
+use Cake\ORM\Entity;
+use Cake\TestSuite\TestCase;
+use Psr\Log\LogLevel;
+
+/**
+ * Class BaseLogImpl
+ * Implementation of abstract class {@see Cake\Log\Engine\BaseLog},
+ * required by test case {@see Cake\Test\TestCase\Log\Engine\BaseLogTest}.
+ */
+class BaseLogImpl extends BaseLog
+{
+    /**
+     * Logs with an arbitrary level.
+     *
+     * @param mixed $level
+     * @param mixed $message
+     * @param array $context
+     *
+     * @return mixed
+     */
+    public function log($level, $message, array $context = [])
+    {
+        return $this->_format($message, $context);
+    }
+}
+
+class BaseLogTest extends TestCase
+{
+
+    private $testData = ['ä', 'ö', 'ü'];
+
+    private $logger;
+
+    /**
+     * Setting up the test case.
+     * Creates a stub logger implementing the log() function missing from abstract class BaseLog.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->logger = new BaseLogImpl();
+    }
+
+    private function assertUnescapedUnicode(array $needles, $haystack)
+    {
+        foreach ($needles as $needle) {
+            $this->assertContains(
+                $needle,
+                $haystack,
+                'Formatted log message does not contain unescaped unicode character.'
+            );
+        }
+    }
+
+    /**
+     * Tests the logging output of a single string containing unicode characters.
+     */
+    public function testLogUnicodeString()
+    {
+        $logged = $this->logger->log(LogLevel::INFO, implode($this->testData));
+
+        $this->assertUnescapedUnicode($this->testData, $logged);
+    }
+
+    /**
+     * Tests the logging output of an array containing unicode characters.
+     */
+    public function testLogUnicodeArray()
+    {
+        $logged = $this->logger->log(LogLevel::INFO, $this->testData);
+
+        $this->assertUnescapedUnicode($this->testData, $logged);
+    }
+
+    /**
+     * Tests the logging output of an object implementing __toString().
+     * Note: __toString() will return a single string containing unicode characters.
+     */
+    public function testLogUnicodeObjectToString()
+    {
+        $stub = $this->getMockBuilder(\stdClass::class)
+            ->setMethods(['__toString'])
+            ->getMock();
+        $stub->method('__toString')
+            ->willReturn(implode($this->testData));
+
+        $logged = $this->logger->log(LogLevel::INFO, $stub);
+
+        $this->assertUnescapedUnicode($this->testData, $logged);
+    }
+
+    /**
+     * Tests the logging output of an object implementing jsonSerializable().
+     * Note: jsonSerializable() will return an array containing unicode characters.
+     */
+    public function testLogUnicodeObjectJsonSerializable()
+    {
+        $stub = $this->createMock(\JsonSerializable::class);
+        $stub->method('jsonSerialize')
+            ->willReturn($this->testData);
+
+        $logged = $this->logger->log(LogLevel::INFO, $stub);
+
+        $this->assertUnescapedUnicode($this->testData, $logged);
+    }
+
+    /**
+     * Tests the logging output of an entity with property value that contains unicode characters.
+     */
+    public function testLogUnicodeEntity()
+    {
+        $entity = new Entity(['foo' => implode($this->testData)]);
+
+        $logged = $this->logger->log(LogLevel::INFO, $entity);
+
+        $this->assertUnescapedUnicode($this->testData, $logged);
+    }
+}

tests/TestCase/ORM/TableTest.php

@@ -1430,7 +1430,7 @@ class TableTest extends TestCase
         $table = new \TestApp\Model\Table\ArticlesTable([
             'connection' => $this->connection,
         ]);
-        $result = $table->find('all')->contain(['authors'])->first();
+        $result = $table->find('all')->contain(['Authors'])->first();
         $this->assertInstanceOf('TestApp\Model\Entity\Author', $result->author);
     }
 
@@ -1445,7 +1445,7 @@ class TableTest extends TestCase
         $table = new \TestApp\Model\Table\ArticlesTable([
             'connection' => $this->connection,
         ]);
-        $result = $table->find('all')->contain(['authors' => ['articles']])->first();
+        $result = $table->find('all')->contain(['Authors' => ['Articles']])->first();
         $this->assertCount(2, $result->author->articles);
         foreach ($result->author->articles as $article) {
             $this->assertInstanceOf('TestApp\Model\Entity\Article', $article);
@@ -1463,7 +1463,7 @@ class TableTest extends TestCase
         $table = new \TestApp\Model\Table\ArticlesTable([
             'connection' => $this->connection,
         ]);
-        $result = $table->find('all')->contain(['tags'])->first();
+        $result = $table->find('all')->contain(['Tags'])->first();
         $this->assertInstanceOf('TestApp\Model\Entity\Tag', $result->tags[0]);
         $this->assertInstanceOf(
             'TestApp\Model\Entity\ArticlesTag',
@@ -1481,7 +1481,7 @@ class TableTest extends TestCase
         $table = new \TestApp\Model\Table\ArticlesTable([
             'connection' => $this->connection,
         ]);
-        $results = $table->find('all')->contain(['tags', 'authors'])->toArray();
+        $results = $table->find('all')->contain(['Tags', 'Authors'])->toArray();
         $this->assertCount(3, $results);
         foreach ($results as $article) {
             $this->assertFalse($article->dirty('id'));

tests/TestCase/Shell/Helper/ProgressHelperTest.php

@@ -151,6 +151,32 @@ class ProgressHelperTest extends TestCase
     }
 
     /**
+     * Test using the helper chained.
+     *
+     * @return void
+     */
+    public function testIncrementAndRenderChained()
+    {
+        $this->helper->init()
+            ->increment(20)
+            ->draw()
+            ->increment(40)
+            ->draw()
+            ->increment(40)
+            ->draw();
+
+        $expected = [
+            '',
+            '==============>                                                              20%',
+            '',
+            '============================================>                                60%',
+            '',
+            '==========================================================================> 100%',
+        ];
+        $this->assertEquals($expected, $this->stub->messages());
+    }
+
+    /**
      * Test negative numbers
      *
      * @return void

tests/TestCase/TestSuite/IntegrationTestCaseTest.php

@@ -180,11 +180,11 @@ class IntegrationTestCaseTest extends IntegrationTestCase
         $this->get('/request_action/test_request_action');
         $this->assertNotEmpty($this->_response);
         $this->assertInstanceOf('Cake\Http\Response', $this->_response);
-        $this->assertEquals('This is a test', $this->_response->body());
+        $this->assertEquals('This is a test', $this->_response->getBody());
 
         $this->_response = null;
         $this->get('/get/request_action/test_request_action');
-        $this->assertEquals('This is a test', $this->_response->body());
+        $this->assertEquals('This is a test', $this->_response->getBody());
     }
 
     /**
@@ -197,7 +197,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
         $this->useHttpServer(true);
         $this->get('/get/request_action/test_request_action');
         $this->assertResponseOk();
-        $this->assertEquals('This is a test', $this->_response->body());
+        $this->assertEquals('This is a test', $this->_response->getBody());
     }
 
     /**
@@ -229,7 +229,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
         $this->get('/request_action/test_request_action');
         $this->assertNotEmpty($this->_response);
         $this->assertInstanceOf('Cake\Http\Response', $this->_response);
-        $this->assertEquals('This is a test', $this->_response->body());
+        $this->assertEquals('This is a test', $this->_response->getBody());
         $this->assertHeader('X-Middleware', 'true');
     }
 
@@ -276,7 +276,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
         $this->useHttpServer(true);
 
         $this->post('/request_action/post_pass', ['title' => 'value']);
-        $data = json_decode($this->_response->body());
+        $data = json_decode($this->_response->getBody());
         $this->assertEquals('value', $data->title);
         $this->assertHeader('X-Middleware', 'true');
     }
@@ -291,7 +291,10 @@ class IntegrationTestCaseTest extends IntegrationTestCase
         $this->useHttpServer(true);
 
         $this->post('/request_action/input_test', '{"hello":"world"}');
-        $this->assertSame('world', $this->_response->body());
+        if ($this->_response->getBody()->isSeekable()) {
+            $this->_response->getBody()->rewind();
+        }
+        $this->assertSame('world', $this->_response->getBody()->getContents());
         $this->assertHeader('X-Middleware', 'true');
     }
 
@@ -627,34 +630,34 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     {
         $this->_response = new Response();
 
-        $this->_response->statusCode(200);
+        $this->_response = $this->_response->withStatus(200);
         $this->assertResponseOk();
 
-        $this->_response->statusCode(201);
+        $this->_response = $this->_response->withStatus(201);
         $this->assertResponseOk();
 
-        $this->_response->statusCode(204);
+        $this->_response = $this->_response->withStatus(204);
         $this->assertResponseOk();
 
-        $this->_response->statusCode(202);
+        $this->_response = $this->_response->withStatus(202);
         $this->assertResponseSuccess();
 
-        $this->_response->statusCode(302);
+        $this->_response = $this->_response->withStatus(302);
         $this->assertResponseSuccess();
 
-        $this->_response->statusCode(400);
+        $this->_response = $this->_response->withStatus(400);
         $this->assertResponseError();
 
-        $this->_response->statusCode(417);
+        $this->_response = $this->_response->withStatus(417);
         $this->assertResponseError();
 
-        $this->_response->statusCode(500);
+        $this->_response = $this->_response->withStatus(500);
         $this->assertResponseFailure();
 
-        $this->_response->statusCode(505);
+        $this->_response = $this->_response->withStatus(505);
         $this->assertResponseFailure();
 
-        $this->_response->statusCode(301);
+        $this->_response = $this->_response->withStatus(301);
         $this->assertResponseCode(301);
     }
 
@@ -666,7 +669,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     public function testAssertRedirect()
     {
         $this->_response = new Response();
-        $this->_response->header('Location', 'http://localhost/tasks/index');
+        $this->_response = $this->_response->withHeader('Location', 'http://localhost/tasks/index');
 
         $this->assertRedirect();
         $this->assertRedirect('/tasks/index');
@@ -709,7 +712,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     public function testAssertRedirectContains()
     {
         $this->_response = new Response();
-        $this->_response->header('Location', 'http://localhost/tasks/index');
+        $this->_response = $this->_response->withHeader('Location', 'http://localhost/tasks/index');
 
         $this->assertRedirectContains('/tasks/index');
     }
@@ -722,7 +725,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     public function testAssertHeader()
     {
         $this->_response = new Response();
-        $this->_response->header('Etag', 'abc123');
+        $this->_response = $this->_response->withHeader('Etag', 'abc123');
 
         $this->assertHeader('Etag', 'abc123');
     }
@@ -735,7 +738,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     public function testAssertHeaderContains()
     {
         $this->_response = new Response();
-        $this->_response->header('Etag', 'abc123');
+        $this->_response = $this->_response->withHeader('Etag', 'abc123');
 
         $this->assertHeaderContains('Etag', 'abc');
     }
@@ -775,7 +778,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     public function testAssertResponseContains()
     {
         $this->_response = new Response();
-        $this->_response->body('Some content');
+        $this->_response = $this->_response->withStringBody('Some content');
 
         $this->assertResponseContains('content');
     }
@@ -788,7 +791,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     public function testAssertResponseNotContains()
     {
         $this->_response = new Response();
-        $this->_response->body('Some content');
+        $this->_response = $this->_response->withStringBody('Some content');
 
         $this->assertResponseNotContains('contents');
     }
@@ -801,7 +804,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     public function testAssertResponseRegExp()
     {
         $this->_response = new Response();
-        $this->_response->body('Some content');
+        $this->_response = $this->_response->withStringBody('Some content');
 
         $this->assertResponseRegExp('/cont/');
     }
@@ -826,7 +829,7 @@ class IntegrationTestCaseTest extends IntegrationTestCase
     public function testAssertResponseNotRegExp()
     {
         $this->_response = new Response();
-        $this->_response->body('Some content');
+        $this->_response = $this->_response->withStringBody('Some content');
 
         $this->assertResponseNotRegExp('/cant/');
     }

tests/test_app/TestApp/Model/Table/ArticlesTable.php

@@ -22,8 +22,8 @@ class ArticlesTable extends Table
 
     public function initialize(array $config)
     {
-        $this->belongsTo('authors');
-        $this->belongsToMany('tags');
+        $this->belongsTo('Authors');
+        $this->belongsToMany('Tags');
         $this->hasMany('ArticlesTags');
     }
 

tests/test_app/TestApp/Model/Table/ArticlesTagsTable.php

@@ -22,7 +22,7 @@ class ArticlesTagsTable extends Table
 
     public function initialize(array $config)
     {
-        $this->belongsTo('articles');
-        $this->belongsTo('tags');
+        $this->belongsTo('Articles');
+        $this->belongsTo('Tags');
     }
 }

tests/test_app/TestApp/Model/Table/TagsTable.php

@@ -22,8 +22,8 @@ class TagsTable extends Table
 
     public function initialize(array $config)
     {
-        $this->belongsTo('authors');
-        $this->belongsToMany('articles');
+        $this->belongsTo('Authors');
+        $this->belongsToMany('Articles');
         $this->hasMany('ArticlesTags', ['propertyName' => 'extraInfo']);
     }
 }