From 8428b1e5f66dfb9b5611378b2c51428f04815044 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Mon, 21 Apr 2025 01:16:30 +0530 Subject: [PATCH 01/22] fix: added additional supported versions for illuminate db and support --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 88eb887..1abdd87 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ { "name": "santigarcor/laravel-ownable", - "description": "Simple trait to manage the ownershipt of models/objects", + "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { From fd44aa11892a73073f548e8060d3aa3c7074890c Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Mon, 21 Apr 2025 01:17:45 +0530 Subject: [PATCH 02/22] fix: updated req-dev packages to support new req packages --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1abdd87..6b94a8d 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,8 @@ "laravel/legacy-factories": "^1.3" }, "require-dev": { - "orchestra/testbench": "^4.0|^5.0|^6.0", - "phpunit/phpunit": "^7.5.15|^8.4|^9.0" + "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", + "phpunit/phpunit": "^7.5.15|^8.4|^9.0|^10.0|^11.0" }, "autoload": { "psr-4": { From 495386fc30a2048d68034fd52c59b022646a4913 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Mon, 21 Apr 2025 03:45:30 +0530 Subject: [PATCH 03/22] fix: migrated phpunit configuration --- .phpunit.result.cache | 2 +- phpunit.xml | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.phpunit.result.cache b/.phpunit.result.cache index eb5b029..12098d3 100644 --- a/.phpunit.result.cache +++ b/.phpunit.result.cache @@ -1 +1 @@ -C:37:"PHPUnit\Runner\DefaultTestResultCache":406:{a:2:{s:7:"defects";a:0:{}s:5:"times";a:4:{s:49:"Ownable\Tests\OwnsModelsTraitTest::testOwnsMethod";d:0.115;s:54:"Ownable\Tests\OwnsModelsTraitTest::testdoesntOwnMethod";d:0.01;s:102:"Ownable\Tests\OwnsModelsTraitTest::testItShouldUseTheInterfaceImplementationIfClassImplementsInterface";d:0.012;s:93:"Ownable\Tests\OwnsModelsTraitTest::testItShouldOverrideTheContractAndUserTheRegularValidation";d:0.009;}}} \ No newline at end of file +{"version":1,"defects":[],"times":{"Ownable\\Tests\\OwnsModelsTraitTest::testOwnsMethod":0.025,"Ownable\\Tests\\OwnsModelsTraitTest::testdoesntOwnMethod":0.002,"Ownable\\Tests\\OwnsModelsTraitTest::testItShouldUseTheInterfaceImplementationIfClassImplementsInterface":0.003,"Ownable\\Tests\\OwnsModelsTraitTest::testItShouldOverrideTheContractAndUserTheRegularValidation":0.003}} \ No newline at end of file diff --git a/phpunit.xml b/phpunit.xml index 2a23586..b86332a 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,19 +1,14 @@ - - ./tests/ + ./tests/ - \ No newline at end of file + From 6e8c18b58fd401291b43c6bfcf549fbaec59f615 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 01:11:32 +0530 Subject: [PATCH 04/22] fix: updated php version matrix to include new versions --- .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 33c8a78..83e4f24 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [7.4, 7.3, 7.2] + php: [8.4, 8.3, 8.2, 8.1, 8.0, 7.4, 7.3, 7.2] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} From 3a20f6d39f5b58c86759d911252e1915c7ade52b Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 01:12:33 +0530 Subject: [PATCH 05/22] fix: updated github actions steps versions --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 83e4f24..f86ea1b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,10 +17,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Cache dependencies - uses: actions/cache@v1 + uses: actions/cache@v4 with: path: ~/.composer/cache/files key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }} From 3251e876282059735e11f3d8df8cb55b1c0e4fc3 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 01:15:29 +0530 Subject: [PATCH 06/22] fix: verbose flag is not longer supported by phpunit --- .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 f86ea1b..3c5a74a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -36,4 +36,4 @@ jobs: run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress - name: Execute tests - run: vendor/bin/phpunit --verbose + run: vendor/bin/phpunit From 68e717100ca015262b5429b64643366ff5a7b195 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 01:23:11 +0530 Subject: [PATCH 07/22] fix: PHP 7.2 is no longer supported by laravel/legacy-factories ``` Problem 1 - Root composer.json requires laravel/legacy-factories ^1.3 -> satisfiable by laravel/legacy-factories[v1.3.0, ..., 1.x-dev]. - laravel/legacy-factories[v1.3.0, ..., 1.x-dev] require php ^7.3|^8.0 -> your php version (7.2.34) does not satisfy that requirement. ``` --- .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 3c5a74a..86b98fb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.4, 8.3, 8.2, 8.1, 8.0, 7.4, 7.3, 7.2] + php: [8.4, 8.3, 8.2, 8.1, 8.0, 7.4, 7.3] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} From 0b9102df03a9b9e48091e98aab4cae254c3971e1 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 01:31:23 +0530 Subject: [PATCH 08/22] feat: adding supported PHP versions in composer.json --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 6b94a8d..b170862 100644 --- a/composer.json +++ b/composer.json @@ -3,6 +3,7 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { + "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3|^8.4", "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" From 6d3be462479da66dc3e5213358c45aa60ebe7de2 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 01:31:59 +0530 Subject: [PATCH 09/22] fix: removing 8.4 as 8.3 is well supported by Laravel 12 --- .github/workflows/tests.yml | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 86b98fb..43e3d15 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.4, 8.3, 8.2, 8.1, 8.0, 7.4, 7.3] + php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index b170862..0fb5587 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3|^8.4", + "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3", "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" From ed3b89ff5b54c36eb3980ffa658a9c655174dbf3 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 02:51:16 +0530 Subject: [PATCH 10/22] fix: updated require and dev dependencies to fix --prefer-lowest issues * for PHP8.0 mockery 1.3.3 is required (dependency of orchestra/testbench) * phpunit below version 9 has direct conflict with PHP8 and beyond * orchestra/testbench lowest version for PHP8 and beyond is v6.8 * and orchestra/testbench v6 does not support Laravel 6 & 7 --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 0fb5587..dbb16dc 100644 --- a/composer.json +++ b/composer.json @@ -3,14 +3,14 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3", - "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "php": "^7.4|^8.0|^8.1|^8.2|^8.3", + "illuminate/database": "^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { - "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0|^10.0", - "phpunit/phpunit": "^7.5.15|^8.4|^9.0|^10.0|^11.0" + "orchestra/testbench": "^v6.8.0|^7.0|^8.0|^9.0|^10.0", + "phpunit/phpunit": "^9.0|^10.0|^11.0" }, "autoload": { "psr-4": { From 1eed78accc5c9a5a539874d1daea2add87ca2ae3 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 02:53:05 +0530 Subject: [PATCH 11/22] fix: PHP 7.3 is no longer needed --- .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 43e3d15..6f3ab40 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3] + php: [8.3, 8.2, 8.1, 8.0, 7.4] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} From 878c89ed392927f78f6cf0a94279551d454978b3 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 03:14:52 +0530 Subject: [PATCH 12/22] fix: PHP7 cannot be supported along with PHP8 with --prefer-lowest flag This means Laravel 8 is no longer supported, so removed PHP7 and along with Laravel 8 support --- .github/workflows/tests.yml | 2 +- composer.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6f3ab40..e58bdd5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 8.0, 7.4] + php: [8.3, 8.2, 8.1, 8.0] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index dbb16dc..5a9c86c 100644 --- a/composer.json +++ b/composer.json @@ -3,13 +3,13 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "php": "^7.4|^8.0|^8.1|^8.2|^8.3", - "illuminate/database": "^8.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0", + "php": "^8.0|^8.1|^8.2|^8.3", + "illuminate/database": "^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { - "orchestra/testbench": "^v6.8.0|^7.0|^8.0|^9.0|^10.0", + "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", "phpunit/phpunit": "^9.0|^10.0|^11.0" }, "autoload": { From 5b3fe1f23ae5c4ae82c7638949ffa0eaffe3deba Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 03:18:21 +0530 Subject: [PATCH 13/22] fix: try to test with PHP7.4 --- .github/workflows/tests.yml | 2 +- composer.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e58bdd5..6f3ab40 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 8.0] + php: [8.3, 8.2, 8.1, 8.0, 7.4] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index 5a9c86c..51674a6 100644 --- a/composer.json +++ b/composer.json @@ -3,13 +3,13 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "php": "^8.0|^8.1|^8.2|^8.3", - "illuminate/database": "^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^9.0|^10.0|^11.0|^12.0", + "php": "^7.4|^8.0|^8.1|^8.2|^8.3", + "illuminate/database": "^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { - "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", + "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0|^10.0", "phpunit/phpunit": "^9.0|^10.0|^11.0" }, "autoload": { From 8b58a2b41d135b23ad4be591a9ed03cab1af2e2f Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Wed, 23 Apr 2025 03:21:28 +0530 Subject: [PATCH 14/22] fix: redo PHP7 removal --- .github/workflows/tests.yml | 2 +- composer.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6f3ab40..e58bdd5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 8.0, 7.4] + php: [8.3, 8.2, 8.1, 8.0] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index 51674a6..5a9c86c 100644 --- a/composer.json +++ b/composer.json @@ -3,13 +3,13 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "php": "^7.4|^8.0|^8.1|^8.2|^8.3", - "illuminate/database": "^8.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^8.0|^9.0|^10.0|^11.0|^12.0", + "php": "^8.0|^8.1|^8.2|^8.3", + "illuminate/database": "^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { - "orchestra/testbench": "^6.0|^7.0|^8.0|^9.0|^10.0", + "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", "phpunit/phpunit": "^9.0|^10.0|^11.0" }, "autoload": { From 30cdc7c508e842fe5fa5387fcb47ea3bd36768db Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Sat, 26 Apr 2025 01:40:51 +0530 Subject: [PATCH 15/22] fix: try with minimun supported version --- .github/workflows/tests.yml | 2 +- composer.json | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e58bdd5..43e3d15 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 8.0] + php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3] stability: [prefer-lowest, prefer-stable] name: PHP ${{ matrix.php }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index 5a9c86c..6b5d14d 100644 --- a/composer.json +++ b/composer.json @@ -3,14 +3,14 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "php": "^8.0|^8.1|^8.2|^8.3", - "illuminate/database": "^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^9.0|^10.0|^11.0|^12.0", + "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3", + "illuminate/database": "^6.0|^7.0|^8.79.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^6.0|^7.0|^8.79.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { - "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0", - "phpunit/phpunit": "^9.0|^10.0|^11.0" + "orchestra/testbench": "^4.0|^5.0|^6.8|^7.0|^8.0|^9.0|^10.0", + "phpunit/phpunit": "^8.4|^9.6|^10.0|^11.0" }, "autoload": { "psr-4": { From d5f677420600a85bd472d5c4a641958c2a738a35 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Sat, 26 Apr 2025 01:51:31 +0530 Subject: [PATCH 16/22] fix: add phpunit matrix and exclude not supported versions --- .github/workflows/tests.yml | 10 ++++++++-- composer.json | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 43e3d15..588508e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,9 +11,15 @@ jobs: fail-fast: false matrix: php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3] + phpunit: ['8.4', '9.6', '10.0', '11.0'] stability: [prefer-lowest, prefer-stable] + exclude: + - php: 8.0 + phpunit: '8.6' + - php: 8.0 + phpunit: '9.6' - name: PHP ${{ matrix.php }} - ${{ matrix.stability }} + name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} steps: - name: Checkout code @@ -33,7 +39,7 @@ jobs: coverage: none - name: Install dependencies - run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress + run: composer update --${{ matrix.stability }} --prefer-dist --no-interaction --no-progress --with="phpunit/phpunit:^${{ matrix.phpunit }}" - name: Execute tests run: vendor/bin/phpunit diff --git a/composer.json b/composer.json index 6b5d14d..1209f65 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,8 @@ "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3", - "illuminate/database": "^6.0|^7.0|^8.79.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^6.0|^7.0|^8.79.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { From cc4b4e137ecfee6e1ea6b490f8a1fcc0489f8fc3 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Sat, 26 Apr 2025 02:01:09 +0530 Subject: [PATCH 17/22] fix: add PHP7.3 & 7.4 exlusions --- .github/workflows/tests.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 588508e..9cff51c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,6 +14,18 @@ jobs: phpunit: ['8.4', '9.6', '10.0', '11.0'] stability: [prefer-lowest, prefer-stable] exclude: + - php: 7.3 + phpunit: '9.6' + - php: 7.3 + phpunit: '10.0' + - php: 7.3 + phpunit: '11.0' + - php: 7.4 + phpunit: '9.6' + - php: 7.4 + phpunit: '10.0' + - php: 7.4 + phpunit: '11.0' - php: 8.0 phpunit: '8.6' - php: 8.0 From edc2fb09e468344f9a90b95e249843e3a6a05d69 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Sat, 26 Apr 2025 02:03:49 +0530 Subject: [PATCH 18/22] fix: PHP 8.0 is not supported by PHPUnit --- .github/workflows/tests.yml | 6 +----- composer.json | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9cff51c..6ba4405 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3] + php: [8.3, 8.2, 8.1, 7.4, 7.3] phpunit: ['8.4', '9.6', '10.0', '11.0'] stability: [prefer-lowest, prefer-stable] exclude: @@ -26,10 +26,6 @@ jobs: phpunit: '10.0' - php: 7.4 phpunit: '11.0' - - php: 8.0 - phpunit: '8.6' - - php: 8.0 - phpunit: '9.6' name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index 1209f65..829dad2 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "php": "^7.3|^7.4|^8.0|^8.1|^8.2|^8.3", + "php": "^7.3|^7.4|^8.1|^8.2|^8.3", "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" From fb419e32803d007d35988d93e9e6021b89cf6d2c Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Sat, 26 Apr 2025 02:16:54 +0530 Subject: [PATCH 19/22] fix: PHPUnit 8 & 9 does sot support PHP 8.1, 8.2 & 8.3 --- .github/workflows/tests.yml | 14 ++++++++++++++ composer.json | 4 ++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ba4405..9d7cea0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,6 +26,20 @@ jobs: phpunit: '10.0' - php: 7.4 phpunit: '11.0' + - php: 8.1 + phpunit: '8.4' + - php: 8.1 + phpunit: '9.6' +# - php: 8.1 +# phpunit: '11.0' + - php: 8.2 + phpunit: '8.4' + - php: 8.2 + phpunit: '9.6' + - php: 8.3 + phpunit: '8.4' + - php: 8.3 + phpunit: '9.6' name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index 829dad2..512f831 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,8 @@ "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { "php": "^7.3|^7.4|^8.1|^8.2|^8.3", - "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/database": "^6.0|^7.0|^8.79.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^6.0|^7.0|^8.79.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { From d67fc1bee3bd9852350021f8ba40ab9665377ae2 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Sat, 26 Apr 2025 02:20:43 +0530 Subject: [PATCH 20/22] fix: try more on php 8.1 --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9d7cea0..1a7d719 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,10 +26,10 @@ jobs: phpunit: '10.0' - php: 7.4 phpunit: '11.0' - - php: 8.1 - phpunit: '8.4' - - php: 8.1 - phpunit: '9.6' +# - php: 8.1 +# phpunit: '8.4' +# - php: 8.1 +# phpunit: '9.6' # - php: 8.1 # phpunit: '11.0' - php: 8.2 From 2e3833d1c43b480734e24743a9c34ede7f7d6940 Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Sat, 26 Apr 2025 02:23:36 +0530 Subject: [PATCH 21/22] fix: PHP 8.1 only seems to work with PHPUnit 10 --- .github/workflows/tests.yml | 12 ++++++------ composer.json | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1a7d719..5c8a4d2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -26,12 +26,12 @@ jobs: phpunit: '10.0' - php: 7.4 phpunit: '11.0' -# - php: 8.1 -# phpunit: '8.4' -# - php: 8.1 -# phpunit: '9.6' -# - php: 8.1 -# phpunit: '11.0' + - php: 8.1 + phpunit: '8.4' + - php: 8.1 + phpunit: '9.6' + - php: 8.1 + phpunit: '11.0' - php: 8.2 phpunit: '8.4' - php: 8.2 diff --git a/composer.json b/composer.json index 512f831..829dad2 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,8 @@ "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { "php": "^7.3|^7.4|^8.1|^8.2|^8.3", - "illuminate/database": "^6.0|^7.0|^8.79.0|^9.0|^10.0|^11.0|^12.0", - "illuminate/support": "^6.0|^7.0|^8.79.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", + "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3" }, "require-dev": { From 2172a953d63837a6916af46794b9be06c289f6ca Mon Sep 17 00:00:00 2001 From: Meeshal kumar Date: Mon, 5 May 2025 09:55:32 +0530 Subject: [PATCH 22/22] fix: PHP 8.3 tests removed --- .github/workflows/tests.yml | 6 +----- composer.json | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5c8a4d2..fb48704 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - php: [8.3, 8.2, 8.1, 7.4, 7.3] + php: [8.2, 8.1, 7.4, 7.3] phpunit: ['8.4', '9.6', '10.0', '11.0'] stability: [prefer-lowest, prefer-stable] exclude: @@ -36,10 +36,6 @@ jobs: phpunit: '8.4' - php: 8.2 phpunit: '9.6' - - php: 8.3 - phpunit: '8.4' - - php: 8.3 - phpunit: '9.6' name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} diff --git a/composer.json b/composer.json index 829dad2..32fe279 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "Simple trait to check ownership of models/objects", "keywords": ["laravel", "ownership", "ownable", "owns"], "require": { - "php": "^7.3|^7.4|^8.1|^8.2|^8.3", + "php": "^7.3|^7.4|^8.1|>=8.2", "illuminate/database": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0|^12.0", "laravel/legacy-factories": "^1.3"