From c7c25d50a237e864874b5ad47dbc9bf7450f0790 Mon Sep 17 00:00:00 2001 From: Di Date: Tue, 13 Feb 2024 14:44:54 +0100 Subject: [PATCH 01/27] Updated publishing --- README.md | 12 ++++++++++-- src/VouchersServiceProvider.php | 6 +++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9601b6e..1d3c653 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The package will automatically register itself. You can publish the migration with: ```bash -php artisan vendor:publish --provider="BeyondCode\Vouchers\VouchersServiceProvider" --tag="migrations" +php artisan vendor:publish --tag="voucher-migrations" ``` After the migration has been published you can create the vouchers table by running the migrations: @@ -39,7 +39,7 @@ php artisan migrate You can publish the config-file with: ```bash -php artisan vendor:publish --provider=BeyondCode\Vouchers\VouchersServiceProvider --tag="config" +php artisan vendor:publish --tag="voucher-config" ``` This is the contents of the published config file: @@ -98,6 +98,14 @@ return [ ]; ``` +If necessary, you can publish the translation files for further customization: + +```bash +php artisan vendor:publish --tag="voucher-translations" +``` + +You can access the translations of the package like so: `__('vouchers::validation.code_invalid')`. + ## Usage The basic concept of this package is that you can create vouchers, that are associated with a specific model. For example, you could have an application that sells online video courses and a voucher would give a user access to one specific video course. diff --git a/src/VouchersServiceProvider.php b/src/VouchersServiceProvider.php index b70ed90..c3e39b0 100644 --- a/src/VouchersServiceProvider.php +++ b/src/VouchersServiceProvider.php @@ -16,18 +16,18 @@ public function boot() if ($this->app->runningInConsole()) { $this->publishes([ __DIR__.'/../config/config.php' => config_path('vouchers.php'), - ], 'config'); + ], 'voucher-config'); if (! class_exists('CreateVouchersTable')) { $this->publishes([ __DIR__.'/../database/migrations/create_vouchers_table.php.stub' => database_path('migrations/'.date('Y_m_d_His', time()).'_create_vouchers_table.php'), - ], 'migrations'); + ], 'voucher-migrations'); } $this->publishes([ __DIR__.'/../translations' => resource_path('lang/vendor/vouchers'), - ], 'translations'); + ], 'voucher-translations'); } } From 38197d66ff7d457409ece4ed58d257023dfeacf0 Mon Sep 17 00:00:00 2001 From: Di Date: Tue, 13 Feb 2024 14:47:29 +0100 Subject: [PATCH 02/27] Added support for Laravel 11 --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 3df28de..fb3bb42 100644 --- a/composer.json +++ b/composer.json @@ -17,13 +17,13 @@ ], "require": { "php": "^7.1|^8.0", - "illuminate/config": "^8.0|^9.0|^10.0", - "illuminate/database": "^8.0|^9.0|^10.0", - "illuminate/support": "^8.0|^9.0|^10.0" + "illuminate/config": "^8.0|^9.0|^10.0|^11.0", + "illuminate/database": "^8.0|^9.0|^10.0|^11.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0" }, "require-dev": { "mockery/mockery": "^1.4", - "phpunit/phpunit": "^8.0|^9.0", + "phpunit/phpunit": "^8.0|^9.0|^10.0", "orchestra/testbench": "^6.0|^8.0" }, "autoload": { From a31ba52baa0402524f1fa34014a732acd0f5cdc0 Mon Sep 17 00:00:00 2001 From: Di Date: Tue, 13 Feb 2024 14:49:45 +0100 Subject: [PATCH 03/27] wip --- .github/workflows/main.yml | 6 ++++++ composer.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4217753..3c0e5cf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,6 +30,12 @@ jobs: - laravel: '10.*' php: '8.0' include: + - laravel: '11.*' + php: '8.3' + testbench: '8.*' + - laravel: '11.*' + php: '8.2' + testbench: '8.*' - laravel: '10.*' php: '8.3' testbench: '8.*' diff --git a/composer.json b/composer.json index fb3bb42..cdb5c6e 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "mockery/mockery": "^1.4", - "phpunit/phpunit": "^8.0|^9.0|^10.0", + "phpunit/phpunit": "^8.0|^9.0", "orchestra/testbench": "^6.0|^8.0" }, "autoload": { From 764e7cf1ecbdffca04a418e108cfb774e3fc1373 Mon Sep 17 00:00:00 2001 From: Di Date: Tue, 13 Feb 2024 15:05:13 +0100 Subject: [PATCH 04/27] wip --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3c0e5cf..fad2e08 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,9 +33,11 @@ jobs: - laravel: '11.*' php: '8.3' testbench: '8.*' + dependency-version: 'prefer-lowest' - laravel: '11.*' php: '8.2' testbench: '8.*' + dependency-version: 'prefer-lowest' - laravel: '10.*' php: '8.3' testbench: '8.*' From d5b7511249629971216e62311769628ecc6c2814 Mon Sep 17 00:00:00 2001 From: Di Date: Tue, 13 Feb 2024 15:12:49 +0100 Subject: [PATCH 05/27] wip --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fad2e08..3bb635d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,11 +33,11 @@ jobs: - laravel: '11.*' php: '8.3' testbench: '8.*' - dependency-version: 'prefer-lowest' + dependency-version: 'prefer-stable' - laravel: '11.*' php: '8.2' testbench: '8.*' - dependency-version: 'prefer-lowest' + dependency-version: 'prefer-stable' - laravel: '10.*' php: '8.3' testbench: '8.*' From 9c528d3f028c45ff1fe701ea1459e9365be42ad9 Mon Sep 17 00:00:00 2001 From: Di Date: Tue, 13 Feb 2024 15:49:43 +0100 Subject: [PATCH 06/27] wip --- .github/workflows/main.yml | 6 ++---- composer.json | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3bb635d..08d637c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,12 +32,10 @@ jobs: include: - laravel: '11.*' php: '8.3' - testbench: '8.*' - dependency-version: 'prefer-stable' + testbench: '9.*' - laravel: '11.*' php: '8.2' - testbench: '8.*' - dependency-version: 'prefer-stable' + testbench: '9.*' - laravel: '10.*' php: '8.3' testbench: '8.*' diff --git a/composer.json b/composer.json index cdb5c6e..3b7debe 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "require-dev": { "mockery/mockery": "^1.4", "phpunit/phpunit": "^8.0|^9.0", - "orchestra/testbench": "^6.0|^8.0" + "orchestra/testbench": "^6.0|^8.0|^9.0" }, "autoload": { "psr-4": { From 25be420b4e62be1aa9329730f66fe07536fb590f Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 15:56:24 +0100 Subject: [PATCH 07/27] wip --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08d637c..e50db62 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -86,7 +86,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --dev --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest - name: Execute tests From a16177cbad3c6942f4b80f5ee23fc54d1d4e1bf8 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:00:06 +0100 Subject: [PATCH 08/27] Updated publishing --- README.md | 8 ++++---- src/VouchersServiceProvider.php | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1d3c653..c1c7ada 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The package will automatically register itself. You can publish the migration with: ```bash -php artisan vendor:publish --tag="voucher-migrations" +php artisan vendor:publish --provider="BeyondCode\Vouchers\VouchersServiceProvider" --tag="migrations" ``` After the migration has been published you can create the vouchers table by running the migrations: @@ -39,10 +39,10 @@ php artisan migrate You can publish the config-file with: ```bash -php artisan vendor:publish --tag="voucher-config" +php artisan vendor:publish --provider="BeyondCode\Vouchers\VouchersServiceProvider" --tag="config" ``` -This is the contents of the published config file: +This is the content of the published config file: ```php app->runningInConsole()) { $this->publishes([ __DIR__.'/../config/config.php' => config_path('vouchers.php'), - ], 'voucher-config'); + ], 'config'); if (! class_exists('CreateVouchersTable')) { $this->publishes([ __DIR__.'/../database/migrations/create_vouchers_table.php.stub' => database_path('migrations/'.date('Y_m_d_His', time()).'_create_vouchers_table.php'), - ], 'voucher-migrations'); + ], 'migrations'); } $this->publishes([ __DIR__.'/../translations' => resource_path('lang/vendor/vouchers'), - ], 'voucher-translations'); + ], 'translations'); } } From f645522d4a014adae68e043841a11039a5abc291 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:05:56 +0100 Subject: [PATCH 09/27] wip --- .github/workflows/main.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e50db62..614a1ac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,6 +20,7 @@ jobs: - '8.1' - '8.0' laravel: + - '11.*' - '10.*' - '9.*' - '8.*' @@ -29,6 +30,8 @@ jobs: exclude: - laravel: '10.*' php: '8.0' + - laravel: '11.*' + php: ['8.0', '8.1'] include: - laravel: '11.*' php: '8.3' @@ -86,7 +89,7 @@ jobs: - name: Install dependencies run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --dev --no-interaction --no-update + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest - name: Execute tests From 5018ac878d7de60b7e7c0a1f667ac81e71ef9b57 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:07:35 +0100 Subject: [PATCH 10/27] wip --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 614a1ac..b334e1f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -88,9 +88,7 @@ jobs: coverage: none - name: Install dependencies - run: | - composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction --no-suggest + run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests run: vendor/bin/phpunit From 1eacb86546fe7fe04dda3610d2cc8874144fc276 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:12:45 +0100 Subject: [PATCH 11/27] wip --- .github/workflows/main.yml | 83 ++++++++++---------------------------- 1 file changed, 22 insertions(+), 61 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b334e1f..1ae449d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,73 +12,32 @@ jobs: runs-on: ubuntu-latest strategy: - fail-fast: false + fail-fast: true matrix: - php: - - '8.3' - - '8.2' - - '8.1' - - '8.0' - laravel: - - '11.*' - - '10.*' - - '9.*' - - '8.*' - dependency-version: - - 'prefer-stable' - - exclude: - - laravel: '10.*' - php: '8.0' - - laravel: '11.*' - php: ['8.0', '8.1'] + php: [8.0, 8.1, 8.2, 8.3] + laravel: [11.*, 10.*, 9.*, 8.*] + dependency-version: [prefer-lowest, prefer-stable] + os: [ubuntu-latest] include: - - laravel: '11.*' - php: '8.3' - testbench: '9.*' - - laravel: '11.*' - php: '8.2' - testbench: '9.*' - - laravel: '10.*' - php: '8.3' - testbench: '8.*' - - laravel: '10.*' - php: '8.2' - testbench: '8.*' - - laravel: '10.*' - php: '8.1' - testbench: '8.*' - - laravel: '9.*' - php: '8.3' - testbench: '7.*' - - laravel: '9.*' - php: '8.2' - testbench: '7.*' - - laravel: '9.*' - php: '8.1' - testbench: '7.*' - - laravel: '9.*' - php: '8.0' - testbench: '7.*' - - laravel: '8.*' - php: '8.3' - testbench: '6.*' - - laravel: '8.*' - php: '8.2' - testbench: '6.*' - - laravel: '8.*' - php: '8.1' - testbench: '6.*' - - laravel: '8.*' - php: '8.0' - testbench: '6.*' - + - laravel: 11.* + testbench: 9.* + - laravel: 10.* + testbench: 8.* + - laravel: 9.* + testbench: 7.* + - laravel: 8.* + testbench: 6.* + exclude: + - laravel: 11.* + php: [8.1, 8.0] + - laravel: 10.* + php: 8.0 name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -88,7 +47,9 @@ jobs: coverage: none - name: Install dependencies - run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction + run: | + composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests run: vendor/bin/phpunit From c20f51bb2d3ccfccd4cf52fa8b048ffd59605b4b Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:15:05 +0100 Subject: [PATCH 12/27] wip --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1ae449d..a02d485 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: testbench: 6.* exclude: - laravel: 11.* - php: [8.1, 8.0] + php: [8.2, 8.1, 8.0] - laravel: 10.* php: 8.0 From bd59ae4b29dcce8f13981613eab65d428b969d6d Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:18:07 +0100 Subject: [PATCH 13/27] wip --- .github/workflows/main.yml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a02d485..0f035d4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,10 +28,19 @@ jobs: - laravel: 8.* testbench: 6.* exclude: - - laravel: 11.* - php: [8.2, 8.1, 8.0] - - laravel: 10.* - php: 8.0 + - laravel: '11.*' + php: '8.2' + - laravel: '11.*' + php: '8.1' + - laravel: '11.*' + php: '8.0' + - laravel: '10.*' + php: '8.0' + + + + + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ubuntu-latest From 4ea90d4ed6b5380de6c75056395fb29246473b1e Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:21:33 +0100 Subject: [PATCH 14/27] whippetywip --- .github/workflows/main.yml | 88 +++++++++++++++++++++++++------------- 1 file changed, 59 insertions(+), 29 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f035d4..7c439ae 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -12,35 +12,66 @@ jobs: runs-on: ubuntu-latest strategy: - fail-fast: true + fail-fast: false matrix: - php: [8.0, 8.1, 8.2, 8.3] - laravel: [11.*, 10.*, 9.*, 8.*] - dependency-version: [prefer-lowest, prefer-stable] - os: [ubuntu-latest] - include: - - laravel: 11.* - testbench: 9.* - - laravel: 10.* - testbench: 8.* - - laravel: 9.* - testbench: 7.* - - laravel: 8.* - testbench: 6.* + php: + - '8.3' + - '8.2' + - '8.1' + - '8.0' + laravel: + - '10.*' + - '9.*' + - '8.*' + dependency-version: + - 'prefer-stable' + exclude: - - laravel: '11.*' - php: '8.2' - - laravel: '11.*' - php: '8.1' - - laravel: '11.*' - php: '8.0' - - laravel: '10.*' - php: '8.0' - - - - - + - laravel: '11.*' + php: '8.2' + - laravel: '11.*' + php: '8.1' + - laravel: '11.*' + php: '8.0' + - laravel: '10.*' + php: '8.0' + + + include: + - laravel: '10.*' + php: '8.3' + testbench: '8.*' + - laravel: '10.*' + php: '8.2' + testbench: '8.*' + - laravel: '10.*' + php: '8.1' + testbench: '8.*' + - laravel: '9.*' + php: '8.3' + testbench: '7.*' + - laravel: '9.*' + php: '8.2' + testbench: '7.*' + - laravel: '9.*' + php: '8.1' + testbench: '7.*' + - laravel: '9.*' + php: '8.0' + testbench: '7.*' + - laravel: '8.*' + php: '8.3' + testbench: '6.*' + - laravel: '8.*' + php: '8.2' + testbench: '6.*' + - laravel: '8.*' + php: '8.1' + testbench: '6.*' + - laravel: '8.*' + php: '8.0' + testbench: '6.*' + name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.dependency-version }} - ubuntu-latest @@ -59,6 +90,5 @@ jobs: run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - - name: Execute tests - run: vendor/bin/phpunit + run: vendor/bin/phpunit \ No newline at end of file From c82adaf981824af99e35541273f848d28be4c90a Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:22:25 +0100 Subject: [PATCH 15/27] wip --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7c439ae..633547a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -38,6 +38,9 @@ jobs: include: + - laravel: '11.*' + php: '8.3' + testbench: '9.*' - laravel: '10.*' php: '8.3' testbench: '8.*' From cabfe468919d3bafd1cf4783d5b259e4af9b6f01 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:27:21 +0100 Subject: [PATCH 16/27] wip --- .github/workflows/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 633547a..79e9786 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,8 +90,16 @@ jobs: coverage: none - name: Install dependencies + if: matrix.laravel != '11.*' || matrix.php != '8.3' run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction + + - name: Install dependencies + if: matrix.laravel == '11.*' && matrix.php == '8.3' + run: | + composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction + + - name: Execute tests run: vendor/bin/phpunit \ No newline at end of file From 57b04e192737b007e70bac7ad49e9a8af0cbea97 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:29:08 +0100 Subject: [PATCH 17/27] wip --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79e9786..3ace834 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,8 +97,7 @@ jobs: - name: Install dependencies if: matrix.laravel == '11.*' && matrix.php == '8.3' - run: | - composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction + run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - name: Execute tests From 9be5111a302b4f39ba93c29834a191ac7a920d26 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:30:38 +0100 Subject: [PATCH 18/27] wip --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3ace834..ec48f73 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -94,11 +94,11 @@ jobs: run: | composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" --no-interaction --no-update composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - + - name: Install dependencies if: matrix.laravel == '11.*' && matrix.php == '8.3' - run: composer update --${{ matrix.dependency-version }} --prefer-dist --no-interaction - - + run: composer update --prefer-stable --prefer-dist --no-interaction + + - name: Execute tests run: vendor/bin/phpunit \ No newline at end of file From 5ead9b6c384af8210464c9f96cbb826962445c90 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:32:39 +0100 Subject: [PATCH 19/27] wip --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec48f73..36984c6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,7 +97,9 @@ jobs: - name: Install dependencies if: matrix.laravel == '11.*' && matrix.php == '8.3' - run: composer update --prefer-stable --prefer-dist --no-interaction + run: | + composer require "laravel/framework:11.*" "orchestra/testbench:9.*" --no-interaction --no-update + composer update --prefer-stable --prefer-dist --no-interaction - name: Execute tests From 5a4ade471cb67f6328d382fb34b95a7bcf266b26 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:35:15 +0100 Subject: [PATCH 20/27] wip --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36984c6..9d63a69 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -98,7 +98,7 @@ jobs: - name: Install dependencies if: matrix.laravel == '11.*' && matrix.php == '8.3' run: | - composer require "laravel/framework:11.*" "orchestra/testbench:9.*" --no-interaction --no-update + composer require "laravel/framework:11.*" "orchestra/testbench:9.*" --no-interaction --no-update --dev composer update --prefer-stable --prefer-dist --no-interaction From 8bded922424905a850479f03d1696c41d652ab35 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:36:28 +0100 Subject: [PATCH 21/27] Update dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 3b7debe..79fcb54 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,8 @@ }, "require-dev": { "mockery/mockery": "^1.4", - "phpunit/phpunit": "^8.0|^9.0", - "orchestra/testbench": "^6.0|^8.0|^9.0" + "phpunit/phpunit": "^8.0|^9.0|", + "orchestra/testbench": "^6.0|^8.0|^9.0|^10.0|^11.0" }, "autoload": { "psr-4": { From 8ea7f982c7dfedeac3ac38cf23d9d7b4e9719511 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:36:47 +0100 Subject: [PATCH 22/27] Update dependencies --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 79fcb54..03cca6e 100644 --- a/composer.json +++ b/composer.json @@ -23,8 +23,8 @@ }, "require-dev": { "mockery/mockery": "^1.4", - "phpunit/phpunit": "^8.0|^9.0|", - "orchestra/testbench": "^6.0|^8.0|^9.0|^10.0|^11.0" + "phpunit/phpunit": "^8.0|^9.0|^10.0|^11.0", + "orchestra/testbench": "^6.0|^8.0|^9.0" }, "autoload": { "psr-4": { From 86039576a4a8136130535c4925ec8083f2e86f9a Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:37:55 +0100 Subject: [PATCH 23/27] Update dependencies --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 03cca6e..ddcc34d 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ }, "require-dev": { "mockery/mockery": "^1.4", - "phpunit/phpunit": "^8.0|^9.0|^10.0|^11.0", + "phpunit/phpunit": "^8.0|^9.0|^10.0", "orchestra/testbench": "^6.0|^8.0|^9.0" }, "autoload": { From ba4e7c3a92f6bfb4771777153acae5b1ba80a1b2 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:47:10 +0100 Subject: [PATCH 24/27] wip --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d63a69..407a416 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -103,4 +103,10 @@ jobs: - name: Execute tests - run: vendor/bin/phpunit \ No newline at end of file + if: matrix.laravel != '11.*' || matrix.php != '8.3' + run: vendor/bin/phpunit + + + - name: Execute tests + if: matrix.laravel == '11.*' && matrix.php == '8.3' + run: vendor/bin/phpunit --no-configuration \ No newline at end of file From d70f8b8da8b0ca9ad6bc58fb9e78cf3a2f56be4a Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:53:59 +0100 Subject: [PATCH 25/27] wip --- .gitignore | 1 + phpunit.xml | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 phpunit.xml diff --git a/.gitignore b/.gitignore index 59290b6..4077fee 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ vendor coverage .idea .phpunit.result.cache +.phpunit.cache \ No newline at end of file diff --git a/phpunit.xml b/phpunit.xml new file mode 100644 index 0000000..04d743b --- /dev/null +++ b/phpunit.xml @@ -0,0 +1,23 @@ + + + + + tests + + + + + + src + + + From 8310d0716c27dab95f2ef6514f09b95abdd610a5 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:55:10 +0100 Subject: [PATCH 26/27] wip --- .github/workflows/main.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 407a416..297d8fd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -103,10 +103,4 @@ jobs: - name: Execute tests - if: matrix.laravel != '11.*' || matrix.php != '8.3' run: vendor/bin/phpunit - - - - name: Execute tests - if: matrix.laravel == '11.*' && matrix.php == '8.3' - run: vendor/bin/phpunit --no-configuration \ No newline at end of file From babb18d3e5884e1c6d4b2de62279418448198a51 Mon Sep 17 00:00:00 2001 From: Di Date: Wed, 13 Mar 2024 16:56:33 +0100 Subject: [PATCH 27/27] wip --- phpunit.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpunit.xml b/phpunit.xml index 04d743b..b6fdba6 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -4,9 +4,9 @@ bootstrap="vendor/autoload.php" cacheDirectory=".phpunit.cache" executionOrder="depends,defects" - requireCoverageMetadata="true" - beStrictAboutCoverageMetadata="true" - beStrictAboutOutputDuringTests="true" + requireCoverageMetadata="false" + beStrictAboutCoverageMetadata="false" + beStrictAboutOutputDuringTests="false" failOnRisky="true" failOnWarning="true">