Merge c486791 into c68b60b

.github/workflows/ci.yml

@@ -35,7 +35,14 @@ jobs:
     - name: Setup MySQL
       if: matrix.db-type == 'mysql'
       run: |
-        sudo service mysql start
+        if [[ ${{ matrix.php-version }} == '7.2' ]]; then
+          sudo service mysql stop
+          # MySQL 8
+          docker run --rm --name=mysqld -e MYSQL_ROOT_PASSWORD=root --tmpfs /var/lib/mysql:rw --network=host -d mysql --default-authentication-plugin=mysql_native_password --disable-log-bin --innodb-flush-method=O_DIRECT_NO_FSYNC
+        else
+          # MySQL 5.7
+          sudo service mysql start
+        fi
 
     - uses: actions/checkout@v1
       with:

VERSION.txt

@@ -16,4 +16,4 @@
 // @license       https://opensource.org/licenses/mit-license.php MIT License
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-4.0.6
+4.1.0-dev

phpstan-baseline.neon

@@ -609,4 +609,3 @@ parameters:
 			message: "#^Parameter \\#3 \\$options of method Cake\\\\View\\\\View\\:\\:_elementCache\\(\\) expects array\\('cache' \\=\\> array\\('key' \\=\\> string, 'config' \\=\\> string\\)\\|string, \\?'callbacks' \\=\\> mixed, \\?'plugin' \\=\\> mixed\\), array given\\.$#"
 			count: 1
 			path: src/View/View.php
-

src/Auth/DigestAuthenticate.php

@@ -123,7 +123,12 @@ public function getUser(ServerRequest $request)
         $password = $user[$field];
         unset($user[$field]);
 
-        $hash = $this->generateResponseHash($digest, $password, (string)$request->getEnv('ORIGINAL_REQUEST_METHOD'));
+        $requestMethod = $request->getEnv('ORIGINAL_REQUEST_METHOD') ?: $request->getMethod();
+        $hash = $this->generateResponseHash(
+            $digest,
+            $password,
+            (string)$requestMethod
+        );
         if (hash_equals($hash, $digest['response'])) {
             return $user;
         }

src/Console/ConsoleOutput.php

@@ -175,6 +175,9 @@ public function __construct(string $stream = 'php://stdout')
             (
                 function_exists('posix_isatty') &&
                 !posix_isatty($this->_output)
+            ) ||
+            (
+                env('NO_COLOR') !== null
             )
         ) {
             $this->_outputAs = self::PLAIN;