From a486fa8caff1da413ed4d682d584b31840e86ee8 Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Sun, 28 Apr 2024 19:20:44 -0300 Subject: [PATCH 1/7] Upgrade to Laravel Zero v10 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index e0170dfd..d28f1a6f 100644 --- a/composer.json +++ b/composer.json @@ -16,17 +16,17 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "ext-json": "*", "ext-pcntl": "*", "ext-posix": "*", "guzzlehttp/psr7": "^1.7" }, "require-dev": { - "guzzlehttp/guzzle": "^7.4", - "laravel-zero/framework": "^9.0", + "guzzlehttp/guzzle": "^7.5", + "laravel-zero/framework": "^10.0", "mockery/mockery": "^1.3.1", - "nunomaduro/laravel-console-menu": "^3.3", + "nunomaduro/laravel-console-menu": "^3.4", "phpunit/phpunit": "^9.0", "squizlabs/php_codesniffer": "^3.5", "tightenco/tlint": "^6.0" @@ -50,7 +50,7 @@ "optimize-autoloader": true, "platform-check": false, "platform": { - "php": "8.0.2" + "php": "8.1" } }, "scripts": { From 713b5d1bafa5298affa2302d07c0e6e9855fb41a Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Sun, 28 Apr 2024 20:56:26 -0300 Subject: [PATCH 2/7] Upgrade to Laravel Zero v11 --- .github/workflows/run-tests.yml | 25 ++----------------- .gitignore | 1 + composer.json | 10 ++++---- phpunit.xml.dist | 44 +++++++++++++-------------------- 4 files changed, 25 insertions(+), 55 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f8b19a83..521355ce 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -9,32 +9,11 @@ jobs: tests: strategy: matrix: - os: [Ubuntu, Windows, macOS] - php: [8.0, 8.1] - # php: [7.2, 7.3, 7.4, 8.0] - - include: - - os: Ubuntu - os-version: ubuntu-latest - - - os: Windows - os-version: windows-latest - - - os: macOS - os-version: macos-latest - - - os: macOS-11 - os-version: macos-11.0 - php: 8.0 - - - os: macOS-11 - os-version: macos-11.0 - php: 8.1 + os: [ubuntu-latest, windows-latest, macos-latest] + php: [8.2] name: ${{ matrix.os }} - PHP ${{ matrix.php }} - runs-on: ${{ matrix.os-version }} - steps: - name: Checkout code uses: actions/checkout@v1 diff --git a/.gitignore b/.gitignore index 1a124aa1..54ef856d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ /.vagrant .phpunit.result.cache /storage +.phpunit.cache/ phpunit.xml composer.lock diff --git a/composer.json b/composer.json index d28f1a6f..35ee871d 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ } ], "require": { - "php": "^8.1", + "php": "^8.2", "ext-json": "*", "ext-pcntl": "*", "ext-posix": "*", @@ -24,12 +24,12 @@ }, "require-dev": { "guzzlehttp/guzzle": "^7.5", - "laravel-zero/framework": "^10.0", + "laravel-zero/framework": "^11.0", "mockery/mockery": "^1.3.1", "nunomaduro/laravel-console-menu": "^3.4", - "phpunit/phpunit": "^9.0", + "phpunit/phpunit": "^10.5", "squizlabs/php_codesniffer": "^3.5", - "tightenco/tlint": "^6.0" + "tightenco/tlint": "^9.3" }, "autoload": { "psr-4": { @@ -50,7 +50,7 @@ "optimize-autoloader": true, "platform-check": false, "platform": { - "php": "8.1" + "php": "8.2" } }, "scripts": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index a3bc3c83..c6b890ef 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,29 +1,19 @@ - - - - ./app - - - - - ./tests/Feature - - - ./tests/Unit - - - - - + + + + ./tests/Feature + + + ./tests/Unit + + + + + + + + ./app + + From 0fba4a9202e4995ade6a095d29204daa55f9276e Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Sun, 28 Apr 2024 21:02:08 -0300 Subject: [PATCH 3/7] Fix Tlint --- bootstrap/app.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bootstrap/app.php b/bootstrap/app.php index 4e84c957..a159fe41 100755 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -11,7 +11,9 @@ | */ -$app = new LaravelZero\Framework\Application( +use LaravelZero\Framework\Application; + +$app = new Application( dirname(__DIR__) ); From f9a911c2912a6bb0ab127f2e77bbfa24c4dc8ddb Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Sun, 28 Apr 2024 21:04:33 -0300 Subject: [PATCH 4/7] Fix workflow not running --- .github/workflows/run-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 521355ce..26cdf153 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -14,6 +14,8 @@ jobs: name: ${{ matrix.os }} - PHP ${{ matrix.php }} + runs-on: ${{ matrix.os }} + steps: - name: Checkout code uses: actions/checkout@v1 From af4d62bd3c15028fe7af85488d40fb60547e73bc Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Mon, 16 Dec 2024 15:06:49 -0300 Subject: [PATCH 5/7] Bump the Takeout Dockerfile PHP version to 8.2 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 258204bd..6aa52943 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1-cli-alpine +FROM php:8.2-cli-alpine ENV TAKEOUT_CONTAINER=1 From cba92fec56486d699cc629b7b7f1f6103cf987fe Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Mon, 16 Dec 2024 15:10:06 -0300 Subject: [PATCH 6/7] Drop the platform requirements for PHP 8.2 --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 22b91f0c..5f187b00 100644 --- a/composer.json +++ b/composer.json @@ -49,10 +49,7 @@ "preferred-install": "dist", "sort-packages": true, "optimize-autoloader": true, - "platform-check": false, - "platform": { - "php": "8.2" - } + "platform-check": false }, "scripts": { "lint:check": [ From 64d80a074fdbf49006f88344114c8291aeb98c45 Mon Sep 17 00:00:00 2001 From: Tony Messias Date: Mon, 16 Dec 2024 15:10:30 -0300 Subject: [PATCH 7/7] Adds PHP 8.3 and 8.4 to our workflow test --- .github/workflows/run-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 26cdf153..4f6ae085 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ubuntu-latest, windows-latest, macos-latest] - php: [8.2] + php: [8.2, 8.3, 8.4] name: ${{ matrix.os }} - PHP ${{ matrix.php }}