Merge branch '6.x' into 7.x

Author: GrahamCampbell

.github/workflows/tests.yml

@@ -7,7 +7,7 @@ on:
     - cron: '0 0 * * *'
 
 jobs:
-  tests:
+  linux_tests:
 
     runs-on: ubuntu-latest
     services:
@@ -60,3 +60,44 @@ jobs:
         env:
           DB_PORT: ${{ job.services.mysql.ports[3306] }}
           DB_USERNAME: root
+
+  windows_tests:
+
+    runs-on: windows-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        php: [7.2, 7.3, 7.4]
+        include:
+          - php: 7.2
+            stability: prefer-lowest
+          - php: 7.3
+            stability: prefer-stable
+          - php: 7.4
+            stability: prefer-stable
+
+    name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: ~/.composer/cache/files
+          key: dependencies-php-${{ matrix.php }}-${{ matrix.stability }}-windows-composer-${{ hashFiles('composer.json') }}
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pdo_sqlite, gd, pdo_mysql, fileinfo, ftp
+          coverage: none
+          ini-values: memory_limit=512M
+
+      - name: Install dependencies
+        run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress
+
+      - name: Execute tests
+        run: vendor/bin/phpunit --verbose

composer.json

@@ -23,7 +23,7 @@
         "dragonmantank/cron-expression": "^2.0",
         "egulias/email-validator": "^2.1.10",
         "league/commonmark": "^1.3",
-        "league/flysystem": "^1.0.8",
+        "league/flysystem": "^1.0.34",
         "monolog/monolog": "^2.0",
         "nesbot/carbon": "^2.17",
         "opis/closure": "^3.1",

src/Illuminate/Filesystem/composer.json

@@ -31,7 +31,7 @@
     },
     "suggest": {
         "illuminate/http": "Required for handling uploaded files (^7.0)",
-        "league/flysystem": "Required to use the Flysystem local and FTP drivers (^1.0).",
+        "league/flysystem": "Required to use the Flysystem local and FTP drivers (^1.0.34).",
         "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^1.0).",
         "league/flysystem-cached-adapter": "Required to use the Flysystem cache (^1.0).",
         "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (^1.0).",