From 54c2a44706ecb1baee7ca8d706fc6e4cd268706c Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 7 Jun 2021 18:41:17 +0200 Subject: [PATCH 1/8] revert --- composer.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index a27414ac8eef..3b09b9934394 100644 --- a/composer.json +++ b/composer.json @@ -31,15 +31,15 @@ "psr/simple-cache": "^1.0", "ramsey/uuid": "^4.0", "swiftmailer/swiftmailer": "^6.2.7", - "symfony/console": "^5.3", - "symfony/error-handler": "^5.3", - "symfony/finder": "^5.3", - "symfony/http-foundation": "^5.3", - "symfony/http-kernel": "^5.3", - "symfony/mime": "^5.3", - "symfony/process": "^5.3", - "symfony/routing": "^5.3", - "symfony/var-dumper": "^5.3", + "symfony/console": "^5.0", + "symfony/error-handler": "^6.0", + "symfony/finder": "^6.0", + "symfony/http-foundation": "^6.0", + "symfony/http-kernel": "^6.0", + "symfony/mime": "^6.0", + "symfony/process": "^6.0", + "symfony/routing": "^6.0", + "symfony/var-dumper": "^6.0", "tijsverkoyen/css-to-inline-styles": "^2.2.2", "vlucas/phpdotenv": "^5.3", "voku/portable-ascii": "^1.4.8" From 3728d145f9bc0dfcf749179165636a4f86cc1740 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 7 Jun 2021 18:41:30 +0200 Subject: [PATCH 2/8] revert --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3b09b9934394..4f930463c4f0 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ "psr/simple-cache": "^1.0", "ramsey/uuid": "^4.0", "swiftmailer/swiftmailer": "^6.2.7", - "symfony/console": "^5.0", + "symfony/console": "^6.0", "symfony/error-handler": "^6.0", "symfony/finder": "^6.0", "symfony/http-foundation": "^6.0", From c32f838eb4a39b2d41c1f857a7c9bcc7b7d5c549 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 7 Jun 2021 22:06:21 +0200 Subject: [PATCH 3/8] PHP 8 only --- .github/workflows/tests.yml | 4 ++-- composer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f6b96a7042e1..0ac8efa8d54d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: true matrix: - php: ['7.4', '8.0'] + php: ['8.0'] stability: [prefer-lowest, prefer-stable] include: - php: '8.1' @@ -89,7 +89,7 @@ jobs: strategy: fail-fast: true matrix: - php: ['7.4', '8.0'] + php: ['8.0'] stability: [prefer-lowest, prefer-stable] include: - php: '8.1' diff --git a/composer.json b/composer.json index 4f930463c4f0..07d6d863ece8 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ } ], "require": { - "php": "^7.4|^8.0", + "php": "^8.0", "ext-json": "*", "ext-mbstring": "*", "ext-openssl": "*", From 1962bbfb600edeedc2988183a243f16371fa2d60 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 7 Jun 2021 22:22:37 +0200 Subject: [PATCH 4/8] Update setHidden --- src/Illuminate/Console/Command.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/Illuminate/Console/Command.php b/src/Illuminate/Console/Command.php index 4ad47351e4a1..9ec134cf39b5 100755 --- a/src/Illuminate/Console/Command.php +++ b/src/Illuminate/Console/Command.php @@ -169,16 +169,6 @@ public function isHidden() return $this->hidden; } - /** - * {@inheritdoc} - */ - public function setHidden(bool $hidden) - { - parent::setHidden($this->hidden = $hidden); - - return $this; - } - /** * Get the Laravel application instance. * From 057b8b0ebae34a12355e37584fcc891a8f6edeec Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 7 Jun 2021 22:23:13 +0200 Subject: [PATCH 5/8] Disable windows tests for now --- .github/workflows/tests.yml | 100 ++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0ac8efa8d54d..2c99b25d4613 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -83,53 +83,53 @@ jobs: AWS_ACCESS_KEY_ID: random_key AWS_SECRET_ACCESS_KEY: random_secret - windows_tests: - runs-on: windows-latest - - strategy: - fail-fast: true - matrix: - php: ['8.0'] - stability: [prefer-lowest, prefer-stable] - include: - - php: '8.1' - flags: "--ignore-platform-req=php" - stability: prefer-stable - - name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows - - steps: - - name: Set git to use LF - run: | - git config --global core.autocrlf false - git config --global core.eol lf - - - name: Checkout code - uses: actions/checkout@v2 - - - 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, redis, memcached - tools: composer:v2 - coverage: none - - - name: Set Minimum Guzzle Version - uses: nick-invision/retry@v1 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update - if: matrix.php >= 8 - - - name: Install dependencies - uses: nick-invision/retry@v1 - with: - timeout_minutes: 5 - max_attempts: 5 - command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }} - - - name: Execute tests - continue-on-error: ${{ matrix.php > 8 }} - run: vendor/bin/phpunit --verbose +# windows_tests: +# runs-on: windows-latest +# +# strategy: +# fail-fast: true +# matrix: +# php: ['8.0'] +# stability: [prefer-lowest, prefer-stable] +# include: +# - php: '8.1' +# flags: "--ignore-platform-req=php" +# stability: prefer-stable +# +# name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows +# +# steps: +# - name: Set git to use LF +# run: | +# git config --global core.autocrlf false +# git config --global core.eol lf +# +# - name: Checkout code +# uses: actions/checkout@v2 +# +# - 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, redis, memcached +# tools: composer:v2 +# coverage: none +# +# - name: Set Minimum Guzzle Version +# uses: nick-invision/retry@v1 +# with: +# timeout_minutes: 5 +# max_attempts: 5 +# command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update +# if: matrix.php >= 8 +# +# - name: Install dependencies +# uses: nick-invision/retry@v1 +# with: +# timeout_minutes: 5 +# max_attempts: 5 +# command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }} +# +# - name: Execute tests +# continue-on-error: ${{ matrix.php > 8 }} +# run: vendor/bin/phpunit --verbose From 9251797ce5a628a182f29791268fd51c03b82f7d Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 7 Jun 2021 22:30:26 +0200 Subject: [PATCH 6/8] Replace removed constant --- tests/Routing/RoutingUrlGeneratorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Routing/RoutingUrlGeneratorTest.php b/tests/Routing/RoutingUrlGeneratorTest.php index 676f609b15fa..267a318cf3ba 100755 --- a/tests/Routing/RoutingUrlGeneratorTest.php +++ b/tests/Routing/RoutingUrlGeneratorTest.php @@ -508,7 +508,7 @@ public function testHttpsRoutesWithDomains() public function testRoutesWithDomainsThroughProxy() { - Request::setTrustedProxies(['10.0.0.1'], SymfonyRequest::HEADER_X_FORWARDED_ALL); + Request::setTrustedProxies(['10.0.0.1'], SymfonyRequest::HEADER_X_FORWARDED_FOR | SymfonyRequest::HEADER_X_FORWARDED_HOST | SymfonyRequest::HEADER_X_FORWARDED_PORT | SymfonyRequest::HEADER_X_FORWARDED_PROTO); $url = new UrlGenerator( $routes = new RouteCollection, From 8069672b9281a12872e7da12a6a59a430ed29cad Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Mon, 7 Jun 2021 22:31:08 +0200 Subject: [PATCH 7/8] re-enable windows tests --- .github/workflows/tests.yml | 100 ++++++++++++++++++------------------ 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2c99b25d4613..0ac8efa8d54d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -83,53 +83,53 @@ jobs: AWS_ACCESS_KEY_ID: random_key AWS_SECRET_ACCESS_KEY: random_secret -# windows_tests: -# runs-on: windows-latest -# -# strategy: -# fail-fast: true -# matrix: -# php: ['8.0'] -# stability: [prefer-lowest, prefer-stable] -# include: -# - php: '8.1' -# flags: "--ignore-platform-req=php" -# stability: prefer-stable -# -# name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows -# -# steps: -# - name: Set git to use LF -# run: | -# git config --global core.autocrlf false -# git config --global core.eol lf -# -# - name: Checkout code -# uses: actions/checkout@v2 -# -# - 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, redis, memcached -# tools: composer:v2 -# coverage: none -# -# - name: Set Minimum Guzzle Version -# uses: nick-invision/retry@v1 -# with: -# timeout_minutes: 5 -# max_attempts: 5 -# command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update -# if: matrix.php >= 8 -# -# - name: Install dependencies -# uses: nick-invision/retry@v1 -# with: -# timeout_minutes: 5 -# max_attempts: 5 -# command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }} -# -# - name: Execute tests -# continue-on-error: ${{ matrix.php > 8 }} -# run: vendor/bin/phpunit --verbose + windows_tests: + runs-on: windows-latest + + strategy: + fail-fast: true + matrix: + php: ['8.0'] + stability: [prefer-lowest, prefer-stable] + include: + - php: '8.1' + flags: "--ignore-platform-req=php" + stability: prefer-stable + + name: PHP ${{ matrix.php }} - ${{ matrix.stability }} - Windows + + steps: + - name: Set git to use LF + run: | + git config --global core.autocrlf false + git config --global core.eol lf + + - name: Checkout code + uses: actions/checkout@v2 + + - 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, redis, memcached + tools: composer:v2 + coverage: none + + - name: Set Minimum Guzzle Version + uses: nick-invision/retry@v1 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer require guzzlehttp/guzzle:^7.2 --no-interaction --no-update + if: matrix.php >= 8 + + - name: Install dependencies + uses: nick-invision/retry@v1 + with: + timeout_minutes: 5 + max_attempts: 5 + command: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress ${{ matrix.flags }} + + - name: Execute tests + continue-on-error: ${{ matrix.php > 8 }} + run: vendor/bin/phpunit --verbose From 65d1807613018f06532e2668e12399e9bc8239f2 Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 6 Jul 2021 16:54:08 +0200 Subject: [PATCH 8/8] Bump minimum Mockery --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 07d6d863ece8..d13db5bd0539 100644 --- a/composer.json +++ b/composer.json @@ -85,7 +85,7 @@ "league/flysystem-aws-s3-v3": "^2.0", "league/flysystem-ftp": "^2.0", "league/flysystem-sftp": "^2.0", - "mockery/mockery": "^1.4.2", + "mockery/mockery": "^1.4.3", "orchestra/testbench-core": "^7.0", "pda/pheanstalk": "^4.0", "phpunit/phpunit": "^9.4",