Merge remote-tracking branch 'upstream/8.x' into 8.x

Author: TBlindaruk

.github/workflows/databases.yml

@@ -0,0 +1,90 @@
+name: databases
+
+on: [push, pull_request]
+
+jobs:
+  mysql_57:
+    runs-on: ubuntu-20.04
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: forge
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    strategy:
+      fail-fast: true
+
+    name: MySQL 5.7
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit tests/Integration/Database --verbose
+        env:
+          DB_CONNECTION: mysql
+          DB_USERNAME: root
+
+  mysql_8:
+    runs-on: ubuntu-20.04
+
+    services:
+      mysql:
+        image: mysql:8
+        env:
+          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_DATABASE: forge
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    strategy:
+      fail-fast: true
+
+    name: MySQL 8.0
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 8.1
+          extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql
+          tools: composer:v2
+          coverage: none
+
+      - name: Install dependencies
+        uses: nick-invision/retry@v1
+        with:
+          timeout_minutes: 5
+          max_attempts: 5
+          command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit tests/Integration/Database --verbose
+        env:
+          DB_CONNECTION: mysql
+          DB_USERNAME: root

.styleci.yml

@@ -1,6 +1,9 @@
 php:
   preset: laravel
   version: 8
+  finder:
+    not-name:
+      - Enums.php
 js:
   finder:
     not-name:

CHANGELOG-6.x.md

@@ -1,6 +1,12 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.20.35...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.20.36...6.x)
+
+
+## [v6.20.36 (2021-10-19)](https://github.com/laravel/framework/compare/v6.20.35...v6.20.36)
+
+### Fixed
+- Add new lost connection message to DetectsLostConnections for Vapor ([#39209](https://github.com/laravel/framework/pull/39209))
 
 
 ## [v6.20.35 (2021-10-05)](https://github.com/laravel/framework/compare/v6.20.34...v6.20.35)

bin/test.sh

@@ -1,23 +1,50 @@
 #!/usr/bin/env bash
 
-docker-compose down -t 0 &> /dev/null
+down=false
+php="8.0"
+
+while true; do
+  case "$1" in
+    --down ) down=true; shift ;;
+    --php ) php=$2; shift 2;;
+    -- ) shift; break ;;
+    * ) break ;;
+  esac
+done
+
+if $down; then
+    docker-compose down -t 0
+
+    exit 0
+fi
+
+echo "Ensuring docker is running"
+
+if ! docker info > /dev/null 2>&1; then
+  echo "Please start docker first."
+  exit 1
+fi
+
+echo "Ensuring services are running"
+
 docker-compose up -d
 
-echo "Waiting for services to boot   ..."
+if docker run -it --rm "registry.gitlab.com/grahamcampbell/php:$php-base" -r "\$tries = 0; while (true) { try { \$tries++; if (\$tries > 30) { throw new RuntimeException('MySQL never became available'); } sleep(1); new PDO('mysql:host=docker.for.mac.localhost;dbname=forge', 'root', '', [PDO::ATTR_TIMEOUT => 3]); break; } catch (PDOException \$e) {} }"; then
+    echo "Running tests"
 
-if docker run -it --rm registry.gitlab.com/grahamcampbell/php:7.4-base -r "\$tries = 0; while (true) { try { \$tries++; if (\$tries > 30) { throw new RuntimeException('MySQL never became available'); } sleep(1); new PDO('mysql:host=docker.for.mac.localhost;dbname=forge', 'root', '', [PDO::ATTR_TIMEOUT => 3]); break; } catch (PDOException \$e) {} }"; then
-    if docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit \
+    if docker run -it -w /data -v ${PWD}:/data:delegated \
+       --user "www-data" --entrypoint vendor/bin/phpunit \
        --env CI=1 --env DB_HOST=docker.for.mac.localhost --env DB_USERNAME=root \
+       --env DB_HOST=docker.for.mac.localhost --env DB_PORT=3306 \
+       --env DYNAMODB_ENDPOINT=docker.for.mac.localhost:8000 --env DYNAMODB_CACHE_TABLE=cache --env AWS_ACCESS_KEY_ID=dummy --env AWS_SECRET_ACCESS_KEY=dummy \
        --env REDIS_HOST=docker.for.mac.localhost --env REDIS_PORT=6379 \
        --env MEMCACHED_HOST=docker.for.mac.localhost --env MEMCACHED_PORT=11211 \
-       --rm registry.gitlab.com/grahamcampbell/php:7.4-base "$@"; then
-        docker-compose down -t 0
+       --rm "registry.gitlab.com/grahamcampbell/php:$php-base" "$@"; then
+        exit 0
     else
-        docker-compose down -t 0
         exit 1
     fi
 else
     docker-compose logs
-    docker-compose down -t 0 &> /dev/null
     exit 1
 fi

docker-compose.yml

@@ -1,16 +1,22 @@
 version: '3'
 services:
+  dynamodb:
+    image:  amazon/dynamodb-local
+    ports:
+      - "8000:8000"
+    command: ["-jar", "DynamoDBLocal.jar", "-sharedDb", "-inMemory"]
   memcached:
     image: memcached:1.6-alpine
     ports:
       - "11211:11211"
     restart: always
   mysql:
-    image: mysql:5.7
+    image: mysql/mysql-server:5.7
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_DATABASE: "forge"
+      MYSQL_ROOT_HOST: "%"
     ports:
       - "3306:3306"
     restart: always

src/Illuminate/Auth/DatabaseUserProvider.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Auth;
 
+use Closure;
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
@@ -117,6 +118,8 @@ public function retrieveByCredentials(array $credentials)
 
             if (is_array($value) || $value instanceof Arrayable) {
                 $query->whereIn($key, $value);
+            } elseif ($value instanceof Closure) {
+                $value($query);
             } else {
                 $query->where($key, $value);
             }

src/Illuminate/Auth/EloquentUserProvider.php

@@ -2,6 +2,7 @@
 
 namespace Illuminate\Auth;
 
+use Closure;
 use Illuminate\Contracts\Auth\Authenticatable as UserContract;
 use Illuminate\Contracts\Auth\UserProvider;
 use Illuminate\Contracts\Hashing\Hasher as HasherContract;
@@ -123,6 +124,8 @@ public function retrieveByCredentials(array $credentials)
 
             if (is_array($value) || $value instanceof Arrayable) {
                 $query->whereIn($key, $value);
+            } elseif ($value instanceof Closure) {
+                $value($query);
             } else {
                 $query->where($key, $value);
             }

src/Illuminate/Cache/RateLimiter.php

@@ -89,6 +89,8 @@ public function attempt($key, $maxAttempts, Closure $callback, $decaySeconds = 6
      */
     public function tooManyAttempts($key, $maxAttempts)
     {
+        $key = $this->cleanRateLimiterKey($key);
+
         if ($this->attempts($key) >= $maxAttempts) {
             if ($this->cache->has($key.':timer')) {
                 return true;
@@ -109,6 +111,8 @@ public function tooManyAttempts($key, $maxAttempts)
      */
     public function hit($key, $decaySeconds = 60)
     {
+        $key = $this->cleanRateLimiterKey($key);
+
         $this->cache->add(
             $key.':timer', $this->availableAt($decaySeconds), $decaySeconds
         );
@@ -132,6 +136,8 @@ public function hit($key, $decaySeconds = 60)
      */
     public function attempts($key)
     {
+        $key = $this->cleanRateLimiterKey($key);
+
         return $this->cache->get($key, 0);
     }
 
@@ -143,6 +149,8 @@ public function attempts($key)
      */
     public function resetAttempts($key)
     {
+        $key = $this->cleanRateLimiterKey($key);
+
         return $this->cache->forget($key);
     }
 
@@ -155,6 +163,8 @@ public function resetAttempts($key)
      */
     public function remaining($key, $maxAttempts)
     {
+        $key = $this->cleanRateLimiterKey($key);
+
         $attempts = $this->attempts($key);
 
         return $maxAttempts - $attempts;
@@ -180,6 +190,8 @@ public function retriesLeft($key, $maxAttempts)
      */
     public function clear($key)
     {
+        $key = $this->cleanRateLimiterKey($key);
+
         $this->resetAttempts($key);
 
         $this->cache->forget($key.':timer');
@@ -193,6 +205,19 @@ public function clear($key)
      */
     public function availableIn($key)
     {
+        $key = $this->cleanRateLimiterKey($key);
+
         return max(0, $this->cache->get($key.':timer') - $this->currentTime());
     }
+
+    /**
+     * Clean the rate limiter key from unicode characters.
+     *
+     * @param  string  $key
+     * @return string
+     */
+    public function cleanRateLimiterKey($key)
+    {
+        return preg_replace('/&([a-z])[a-z]+;/i', '$1', htmlentities($key));
+    }
 }

src/Illuminate/Database/DBAL/TimestampType.php

@@ -4,9 +4,10 @@
 
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\PhpDateTimeMappingType;
 use Doctrine\DBAL\Types\Type;
 
-class TimestampType extends Type
+class TimestampType extends Type implements PhpDateTimeMappingType
 {
     /**
      * {@inheritdoc}

src/Illuminate/Database/Eloquent/Casts/AsStringable.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Illuminate\Database\Eloquent\Casts;
+
+use Illuminate\Contracts\Database\Eloquent\Castable;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Support\Str;
+
+class AsStringable implements Castable
+{
+    /**
+     * Get the caster class to use when casting from / to this cast target.
+     *
+     * @param  array  $arguments
+     * @return object|string
+     */
+    public static function castUsing(array $arguments)
+    {
+        return new class implements CastsAttributes
+        {
+            public function get($model, $key, $value, $attributes)
+            {
+                return isset($value) ? Str::of($value) : null;
+            }
+
+            public function set($model, $key, $value, $attributes)
+            {
+                return isset($value) ? (string) $value : null;
+            }
+        };
+    }
+}