From 697e398d59df45eced72e1c392539d7ba3125c46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 16:11:10 -0300 Subject: [PATCH 01/17] Running tests --- .github/workflows/tests.yml | 55 +++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..cb9eeb7 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,55 @@ +name: run-tests + +on: + push: + pull_request: + +jobs: + pest: + runs-on: ubuntu-24.04 + timeout-minutes: 5 + + strategy: + fail-fast: true + matrix: + php: [ 8.1, 8.2, 8.3 ] + laravel: [ 10.*, 11.* ] + include: + - laravel: 11.* + testbench: 9.*-dev + - laravel: 10.* + testbench: 8.* + exclude: + - laravel: 11.* + php: 8.1 + + name: Paragon Tests - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Cache dependencies + uses: actions/cache@v1 + with: + path: ~/.composer/cache/files + key: dependencies-pw-v2-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv + coverage: none + tools: composer:v2 + + - name: Install dependencies + run: | + composer --version + composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update + composer require "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev + composer update --prefer-dist --no-interaction --no-suggest --dev + composer dump + + - name: Execute tests + run: vendor/bin/pest From 981017d8301961ef0e2f9f64d3b8daf061d1bd03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 16:24:26 -0300 Subject: [PATCH 02/17] Reduced min version for symfony filesystem --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f1050ed..909bf7a 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "php": "^8.1", "illuminate/filesystem": ">=10.0", "illuminate/support": ">=10.0", - "symfony/filesystem": "^7.1" + "symfony/filesystem": ">=6.4" }, "require-dev": { "laravel/framework": ">=10.0", From d77844056af91ff8aa17c5808cd5bba6be80b1e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 16:27:56 -0300 Subject: [PATCH 03/17] Removed 8.1 support --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cb9eeb7..091686a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.1, 8.2, 8.3 ] + php: [ 8.2, 8.3 ] laravel: [ 10.*, 11.* ] include: - laravel: 11.* From 355b747e01e8da4629f2f4dc8d58082b9c08ba4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 16:35:20 -0300 Subject: [PATCH 04/17] Pest 2 and 3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 909bf7a..fd4df56 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "laravel/framework": ">=10.0", "laravel/pint": "^1.18", "orchestra/testbench": "^9.5", - "pestphp/pest": "^3.2", + "pestphp/pest": "^2.36|^3.4", "pestphp/pest-plugin-laravel": "^3.0" }, "autoload-dev": { From 80232ece94933ff2c9233cefaa5286a1d1732fcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 16:39:50 -0300 Subject: [PATCH 05/17] Adding pest to test matrix --- .github/{workflows => }/tests.yml | 7 +++++-- composer.json | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) rename .github/{workflows => }/tests.yml (83%) diff --git a/.github/workflows/tests.yml b/.github/tests.yml similarity index 83% rename from .github/workflows/tests.yml rename to .github/tests.yml index 091686a..0e3a9de 100644 --- a/.github/workflows/tests.yml +++ b/.github/tests.yml @@ -12,13 +12,15 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.2, 8.3 ] + php: [ 8.1, 8.2, 8.3 ] laravel: [ 10.*, 11.* ] include: - laravel: 11.* testbench: 9.*-dev + pest: 3.* - laravel: 10.* testbench: 8.* + pest: 2.* exclude: - laravel: 11.* php: 8.1 @@ -47,7 +49,8 @@ jobs: run: | composer --version composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update - composer require "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update --dev + composer require "pestphp/pest:${{ matrix.pest }}" --no-interaction --no-update --dev + composer require "pestphp/pest-plugin-laravel:${{ matrix.pest }}" --no-interaction --no-update --dev composer update --prefer-dist --no-interaction --no-suggest --dev composer dump diff --git a/composer.json b/composer.json index fd4df56..909bf7a 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "laravel/framework": ">=10.0", "laravel/pint": "^1.18", "orchestra/testbench": "^9.5", - "pestphp/pest": "^2.36|^3.4", + "pestphp/pest": "^3.2", "pestphp/pest-plugin-laravel": "^3.0" }, "autoload-dev": { From df5a0c641e35ed7923655ddeb88967bbc89cebfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 16:59:43 -0300 Subject: [PATCH 06/17] wip --- .github/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/tests.yml b/.github/tests.yml index 0e3a9de..001747b 100644 --- a/.github/tests.yml +++ b/.github/tests.yml @@ -16,10 +16,8 @@ jobs: laravel: [ 10.*, 11.* ] include: - laravel: 11.* - testbench: 9.*-dev pest: 3.* - laravel: 10.* - testbench: 8.* pest: 2.* exclude: - laravel: 11.* From bffb2524469abbe9aea86a617f8260f674078be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 17:03:17 -0300 Subject: [PATCH 07/17] wip --- .github/tests.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/tests.yml b/.github/tests.yml index 001747b..20af1f4 100644 --- a/.github/tests.yml +++ b/.github/tests.yml @@ -12,16 +12,11 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.1, 8.2, 8.3 ] - laravel: [ 10.*, 11.* ] + php: [ 8.2, 8.3 ] + laravel: [ 11.* ] include: - laravel: 11.* - pest: 3.* - laravel: 10.* - pest: 2.* - exclude: - - laravel: 11.* - php: 8.1 name: Paragon Tests - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -47,8 +42,6 @@ jobs: run: | composer --version composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update - composer require "pestphp/pest:${{ matrix.pest }}" --no-interaction --no-update --dev - composer require "pestphp/pest-plugin-laravel:${{ matrix.pest }}" --no-interaction --no-update --dev composer update --prefer-dist --no-interaction --no-suggest --dev composer dump From 968c201fd60ea8472c9abe4317b8044152c83320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 17:04:03 -0300 Subject: [PATCH 08/17] Moved to folder --- .github/{ => workflows}/tests.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/{ => workflows}/tests.yml (100%) diff --git a/.github/tests.yml b/.github/workflows/tests.yml similarity index 100% rename from .github/tests.yml rename to .github/workflows/tests.yml From 52de00e8daea9df17917f0bedbc37f2093edbb84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 17:05:01 -0300 Subject: [PATCH 09/17] Removed L10 --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 20af1f4..3b02e9d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,7 +16,6 @@ jobs: laravel: [ 11.* ] include: - laravel: 11.* - - laravel: 10.* name: Paragon Tests - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} From 139b0b70d9a282787885afaa0b3da92b62aab81c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 17:07:56 -0300 Subject: [PATCH 10/17] wip --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3b02e9d..b004d15 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -40,7 +40,6 @@ jobs: - name: Install dependencies run: | composer --version - composer require "laravel/framework:${{ matrix.laravel }}" --no-interaction --no-update composer update --prefer-dist --no-interaction --no-suggest --dev composer dump From 22c0d15d140bab7cf30451063e816b5788b6ce43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 22:12:16 -0300 Subject: [PATCH 11/17] wip --- .github/workflows/tests.yml | 79 ++++++++++++++++++------------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b004d15..25815e7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -5,43 +5,42 @@ on: pull_request: jobs: - pest: - runs-on: ubuntu-24.04 - timeout-minutes: 5 - - strategy: - fail-fast: true - matrix: - php: [ 8.2, 8.3 ] - laravel: [ 11.* ] - include: - - laravel: 11.* - - name: Paragon Tests - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Cache dependencies - uses: actions/cache@v1 - with: - path: ~/.composer/cache/files - key: dependencies-pw-v2-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php }} - extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv - coverage: none - tools: composer:v2 - - - name: Install dependencies - run: | - composer --version - composer update --prefer-dist --no-interaction --no-suggest --dev - composer dump - - - name: Execute tests - run: vendor/bin/pest + pest: + runs-on: ubuntu-24.04 + timeout-minutes: 5 + + strategy: + fail-fast: true + matrix: + php: [ 8.2, 8.3 ] + laravel: [ 11.* ] + include: + - laravel: 11.* + + name: Paragon Tests - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Cache dependencies + uses: actions/cache@v1 + with: + path: ~/.composer/cache/files + key: dependencies-pw-v2-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php }} + extensions: curl, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, iconv + coverage: none + tools: composer:v2 + + - name: Install dependencies + run: | + composer install --no-interaction --no-suggest --dev + composer dump + + - name: Execute tests + run: vendor/bin/pest From a67b38da5dd8681d5f9abcc7c8e65ae7b3630997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 22:16:44 -0300 Subject: [PATCH 12/17] wip --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 25815e7..179d851 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -43,4 +43,4 @@ jobs: composer dump - name: Execute tests - run: vendor/bin/pest + run: ./vendor/bin/pest From 97f115c0efde5e277b81a7ea10c426241bf33cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 22:18:58 -0300 Subject: [PATCH 13/17] wip --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 179d851..d12b159 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: uses: actions/cache@v1 with: path: ~/.composer/cache/files - key: dependencies-pw-v2-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} + key: dependencies-${{ matrix.laravel }}-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} - name: Setup PHP uses: shivammathur/setup-php@v2 From bbeddbd61b27dc5a7980269ce251cea3ab7c709c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 22:22:39 -0300 Subject: [PATCH 14/17] wip --- composer.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 909bf7a..d889c31 100644 --- a/composer.json +++ b/composer.json @@ -28,10 +28,14 @@ "pestphp/pest": "^3.2", "pestphp/pest-plugin-laravel": "^3.0" }, + "autoload": { + "psr-4": { + "Kirschbaum\\Paragon\\": "src/" + } + }, "autoload-dev": { "psr-4": { "App\\": "vendor/orchestra/testbench-core/laravel/app", - "Kirschbaum\\Paragon\\": "src/", "Kirschbaum\\Paragon\\Tests\\": "tests" } }, From 0d4324845e5aa83a197e5eaf3e8dda51023b0bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 22:25:18 -0300 Subject: [PATCH 15/17] wip --- .github/workflows/tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d12b159..54442d6 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,8 +14,6 @@ jobs: matrix: php: [ 8.2, 8.3 ] laravel: [ 11.* ] - include: - - laravel: 11.* name: Paragon Tests - PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} @@ -43,4 +41,4 @@ jobs: composer dump - name: Execute tests - run: ./vendor/bin/pest + run: composer pest From 1c7eddcf291e0029e3189f7181ce2a4f6724cafb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 22:27:31 -0300 Subject: [PATCH 16/17] wip --- phpunit.xml.dist | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 phpunit.xml.dist diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 0000000..21c3b1d --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,31 @@ + + + + + tests + + + + + + + + ./src + + + \ No newline at end of file From ce36aff087960c1e32dcc6d3fe3edb13ccbc44e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Dalmolin?= Date: Mon, 21 Oct 2024 22:28:56 -0300 Subject: [PATCH 17/17] wip --- .github/workflows/{tests.yml => run-tests.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{tests.yml => run-tests.yml} (100%) diff --git a/.github/workflows/tests.yml b/.github/workflows/run-tests.yml similarity index 100% rename from .github/workflows/tests.yml rename to .github/workflows/run-tests.yml