Merge branch 'master' into 3.next

.mailmap

@@ -113,3 +113,20 @@ Patrick Conroy <patrick.conroy@rockstargames.com>
 Patrick Conroy <patrick.conroy@rockstargames.com> <patrick@rockstargames.com>
 saeideng <saeideng@yahoo.com>
 saeideng <saeideng@yahoo.com> <saeideng@users.noreply.github.com>
+Albert Cansado Solà <albert.cansado@gmail.com>
+Albert Cansado Solà <albert.cansado@gmail.com> <albert@iMac-de-Albert.Home>
+Albert Cansado Solà <albert.cansado@gmail.com> <albert@MacBook-Pro-de-Albert.local>
+Albert Cansado Solà <albert.cansado@gmail.com> <cansa1703@gmail.com>
+Alejandro Ibarra <ajibarra@gmail.com> <alejandro.ibarra@cakedc.com>
+Andreas Kristiansen <mail@ankr.dk> <ak@bownty.com>
+Bob Fanger <bfanger@gmail.com> <bob.fanger@noprotocol.nl>
+Cees-Jan Kiewiet <ceesjank@gmail.com>
+Cees-Jan Kiewiet <ceesjank@gmail.com> <Cees-Jan@xps8500.home.wyrihaxim.us>
+Dmitriy Romanov <dmitriy.romanov@firstlinesoftware.com>
+Dmitrii Romanov <dmitriy.romanov@firstlinesoftware.com> <dmromanov@users.noreply.github.com>
+Dmitrii Romanov <dmitriy.romanov@firstlinesoftware.com> <githubcom.5.dimon3000@spamgourmet.com>
+Dmitrii Romanov <dmitriy.romanov@firstlinesoftware.com> <git.5.dimon3000@spamgourmet.com>
+Edgaras Janušauskas <edgaras.janusauskas@gmail.com>
+Eric Büttner <eric.buettner@tuffz.com>
+Eric Büttner <eric.buettner@tuffz.com> <tuffz@tuffz.mac>
+Eric Büttner <eric.buettner@tuffz.com> <tuffz@users.noreply.github.com>

src/Database/Schema/PostgresSchema.php

@@ -399,7 +399,7 @@ class PostgresSchema extends BaseSchema
                 $type = ' CHAR';
             }
             $out .= $type;
-            if (isset($data['length']) && $data['length'] != 36) {
+            if (isset($data['length'])) {
                 $out .= '(' . (int)$data['length'] . ')';
             }
         }

src/Datasource/ModelAwareTrait.php

@@ -35,7 +35,10 @@ trait ModelAwareTrait
      * Plugin classes should use `Plugin.Comments` style names to correctly load
      * models from the correct plugin.
      *
-     * @var string
+     * Use false to not use auto-loading on this object. Null auto-detects based on
+     * controller name.
+     *
+     * @var string|false|null
      */
     public $modelClass;
 

src/Http/Response.php

@@ -581,7 +581,7 @@ class Response implements ResponseInterface
             return;
         }
         $whitelist = [
-            'application/javascript', 'application/json', 'application/xml', 'application/rss+xml'
+            'application/javascript', 'application/xml', 'application/rss+xml'
         ];
 
         $charset = false;

src/TestSuite/Constraint/Response/HeaderEquals.php

@@ -33,7 +33,7 @@ class HeaderEquals extends ResponseBase
      * @param Response $response Response
      * @param string $headerName Header name
      */
-    public function __construct(Response $response, $headerName)
+    public function __construct($response, $headerName)
     {
         parent::__construct($response);
 

src/TestSuite/Constraint/Response/HeaderSet.php

@@ -33,7 +33,7 @@ class HeaderSet extends ResponseBase
      * @param Response $response Response
      * @param string $headerName Header name
      */
-    public function __construct(Response $response, $headerName)
+    public function __construct($response, $headerName)
     {
         parent::__construct($response);
 

src/TestSuite/EmailTrait.php

@@ -81,7 +81,7 @@ trait EmailTrait
      * Asserts an email at a specific index was sent to an address
      *
      * @param int $at Email index
-     * @param int $address Email address
+     * @param string $address Email address
      * @param string $message Message
      * @return void
      */
@@ -94,7 +94,7 @@ trait EmailTrait
      * Asserts an email at a specific index was sent from an address
      *
      * @param int $at Email index
-     * @param int $address Email address
+     * @param string $address Email address
      * @param string $message Message
      * @return void
      */
@@ -107,7 +107,7 @@ trait EmailTrait
      * Asserts an email at a specific index contains expected contents
      *
      * @param int $at Email index
-     * @param int $contents Contents
+     * @param string $contents Contents
      * @param string $message Message
      * @return void
      */
@@ -120,7 +120,7 @@ trait EmailTrait
      * Asserts an email at a specific index contains expected html contents
      *
      * @param int $at Email index
-     * @param int $contents Contents
+     * @param string $contents Contents
      * @param string $message Message
      * @return void
      */
@@ -133,7 +133,7 @@ trait EmailTrait
      * Asserts an email at a specific index contains expected text contents
      *
      * @param int $at Email index
-     * @param int $contents Contents
+     * @param string $contents Contents
      * @param string $message Message
      * @return void
      */
@@ -146,8 +146,8 @@ trait EmailTrait
      * Asserts an email at a specific index contains the expected value within an Email getter
      *
      * @param int $at Email index
-     * @param int $expected Contents
-     * @param int $parameter Email getter parameter (e.g. "cc", "subject")
+     * @param string $expected Contents
+     * @param string $parameter Email getter parameter (e.g. "cc", "subject")
      * @param string $message Message
      * @return void
      */
@@ -159,7 +159,7 @@ trait EmailTrait
     /**
      * Asserts an email was sent to an address
      *
-     * @param int $address Email address
+     * @param string $address Email address
      * @param string $message Message
      * @return void
      */
@@ -171,7 +171,7 @@ trait EmailTrait
     /**
      * Asserts an email was sent from an address
      *
-     * @param int $address Email address
+     * @param string $address Email address
      * @param string $message Message
      * @return void
      */
@@ -183,7 +183,7 @@ trait EmailTrait
     /**
      * Asserts an email contains expected contents
      *
-     * @param int $contents Contents
+     * @param string $contents Contents
      * @param string $message Message
      * @return void
      */
@@ -195,7 +195,7 @@ trait EmailTrait
     /**
      * Asserts an email contains expected html contents
      *
-     * @param int $contents Contents
+     * @param string $contents Contents
      * @param string $message Message
      * @return void
      */
@@ -219,8 +219,8 @@ trait EmailTrait
     /**
      * Asserts an email contains the expected value within an Email getter
      *
-     * @param int $expected Contents
-     * @param int $parameter Email getter parameter (e.g. "cc", "subject")
+     * @param string $expected Contents
+     * @param string $parameter Email getter parameter (e.g. "cc", "subject")
      * @param string $message Message
      * @return void
      */

src/TestSuite/IntegrationTestTrait.php

@@ -1215,7 +1215,7 @@ trait IntegrationTestTrait
     /**
      * Asserts that a file with the given name was sent in the response
      *
-     * @param string $expected The file name that should be sent in the response
+     * @param string $expected The absolute file path that should be sent in the response.
      * @param string $message The failure message that will be appended to the generated message.
      * @return void
      */

tests/TestCase/Database/Schema/PostgresSchemaTest.php

@@ -177,6 +177,10 @@ SQL;
                 ['type' => 'string', 'fixed' => true, 'length' => 10]
             ],
             [
+                ['type' => 'CHAR(36)'],
+                ['type' => 'string', 'fixed' => true, 'length' => 36]
+            ],
+            [
                 ['type' => 'CHARACTER(10)'],
                 ['type' => 'string', 'fixed' => true, 'length' => 10]
             ],
@@ -696,6 +700,11 @@ SQL;
                 '"id" CHAR(32) NOT NULL'
             ],
             [
+                'title',
+                ['type' => 'string', 'length' => 36, 'fixed' => true, 'null' => false],
+                '"title" CHAR(36) NOT NULL'
+            ],
+            [
                 'id',
                 ['type' => 'uuid', 'length' => 36, 'null' => false],
                 '"id" UUID NOT NULL'
@@ -717,6 +726,11 @@ SQL;
             ],
             [
                 'title',
+                ['type' => 'string', 'length' => 36],
+                '"title" VARCHAR(36)'
+            ],
+            [
+                'title',
                 ['type' => 'string', 'length' => 255, 'null' => false, 'collate' => 'C'],
                 '"title" VARCHAR(255) COLLATE "C" NOT NULL'
             ],

tests/TestCase/Error/Middleware/ErrorHandlerMiddlewareTest.php

@@ -167,7 +167,7 @@ class ErrorHandlerMiddlewareTest extends TestCase
         $this->assertNotSame($result, $response);
         $this->assertEquals(404, $result->getStatusCode());
         $this->assertContains('"message": "whoops"', '' . $result->getBody());
-        $this->assertEquals('application/json; charset=UTF-8', $result->getHeaderLine('Content-type'));
+        $this->assertEquals('application/json', $result->getHeaderLine('Content-type'));
     }
 
     /**

tests/TestCase/Http/ResponseTest.php

@@ -315,7 +315,7 @@ class ResponseTest extends TestCase
         );
         $this->assertSame('application/pdf', $new->getHeaderLine('Content-Type'));
         $this->assertSame(
-            'application/json; charset=UTF-8',
+            'application/json',
             $new->withType('json')->getHeaderLine('Content-Type')
         );
     }
@@ -463,7 +463,6 @@ class ResponseTest extends TestCase
         return [
             ['mp3', 'audio/mpeg'],
             ['js', 'application/javascript; charset=UTF-8'],
-            ['json', 'application/json; charset=UTF-8'],
             ['xml', 'application/xml; charset=UTF-8'],
             ['txt', 'text/plain; charset=UTF-8'],
         ];

tests/TestCase/Http/ResponseTransformerTest.php

@@ -301,10 +301,6 @@ class ResponseTransformerTest extends TestCase
         $cake->type('application/octet-stream');
         $result = ResponseTransformer::toPsr($cake);
         $this->assertSame('application/octet-stream', $result->getHeaderLine('Content-Type'));
-
-        $cake->type('application/json');
-        $result = ResponseTransformer::toPsr($cake);
-        $this->assertSame('application/json; charset=utf-8', $result->getHeaderLine('Content-Type'));
     }
 
     /**

tests/TestCase/TestSuite/IntegrationTestTraitTest.php

@@ -331,7 +331,7 @@ class IntegrationTestTraitTest extends IntegrationTestCase
         $this->_request['headers'] = [ "Accept" => "application/json" ];
         $this->get('/json_response/api_get_data');
         $this->assertResponseCode(403);
-        $this->assertHeader('Content-Type', 'application/json; charset=UTF-8');
+        $this->assertHeader('Content-Type', 'application/json');
         $this->assertResponseContains('"message": "Sample Message"');
         $this->assertResponseContains('"code": 403');
     }
@@ -1137,7 +1137,7 @@ class IntegrationTestTraitTest extends IntegrationTestCase
     public function testContentTypeInAction()
     {
         $this->get('/tests_apps/set_type');
-        $this->assertHeader('Content-Type', 'application/json; charset=UTF-8');
+        $this->assertHeader('Content-Type', 'application/json');
         $this->assertContentType('json');
         $this->assertContentType('application/json');
     }