From edc422cd2e62c11802668cc1460ff9ab247d145a Mon Sep 17 00:00:00 2001 From: Gerardo Ibarra Date: Mon, 31 Jul 2023 06:08:02 -0300 Subject: [PATCH 1/7] add annotation ignore for php code sniffer (#1456) --- src/Console/ModelsCommand.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Console/ModelsCommand.php b/src/Console/ModelsCommand.php index 9f9931f..ec39dee 100644 --- a/src/Console/ModelsCommand.php +++ b/src/Console/ModelsCommand.php @@ -231,6 +231,7 @@ class ModelsCommand extends Command $output = " Date: Mon, 31 Jul 2023 13:26:41 +0200 Subject: [PATCH 2/7] Fix tests for edc422cd2e62c11802668cc1460ff9ab247d145a (#1457) I just ran `composer test-regenerate` --- .../__snapshots__/Test__test__1.php | 1 + .../__snapshots__/Test__test__1.php | 1 + .../__snapshots__/Test__test__1.php | 1 + .../GeneratePhpdocWithMixin/__snapshots__/Test__test__1.php | 1 + .../ModelsCommand/Interfaces/__snapshots__/Test__test__1.php | 1 + 5 files changed, 5 insertions(+) diff --git a/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php b/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php index c6a86ad..526e313 100644 --- a/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php +++ b/tests/Console/ModelsCommand/DoesNotGeneratePhpdocWithExternalEloquentBuilder/__snapshots__/Test__test__1.php @@ -1,6 +1,7 @@ Date: Wed, 6 Sep 2023 12:35:33 +0200 Subject: [PATCH 3/7] Catch error and exception (#1431) (#1465) Credit goes to @dongm2ez --- src/Alias.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Alias.php b/src/Alias.php index 1907ecd..ff4ae67 100644 --- a/src/Alias.php +++ b/src/Alias.php @@ -20,6 +20,7 @@ use Illuminate\Config\Repository as ConfigRepository; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Support\Facades\Facade; use ReflectionClass; +use Throwable; class Alias { @@ -301,7 +302,7 @@ class Alias "\nPlease configure your database connection correctly, or use the sqlite memory driver (-M)." . " Skipping $facade." ); - } catch (\Exception $e) { + } catch (Throwable $e) { $this->error('Exception: ' . $e->getMessage() . "\nSkipping $facade."); } } @@ -323,7 +324,7 @@ class Alias protected function addMagicMethods() { foreach ($this->magicMethods as $magic => $real) { - list($className, $name) = explode('::', $real); + [$className, $name] = explode('::', $real); if ((!class_exists($className) && !interface_exists($className)) || !method_exists($className, $name)) { continue; } From c751d3e176e166ab89a533f3394fa200b51c5491 Mon Sep 17 00:00:00 2001 From: erikn69 Date: Fri, 29 Sep 2023 02:25:55 -0500 Subject: [PATCH 4/7] ci: Use GitHub Actions V4 (#1469) --- .github/workflows/composer-normalize.yml | 2 +- .github/workflows/fix-code-style.yml | 2 +- .github/workflows/run-integration-tests.yml | 2 +- .github/workflows/run-static-analysis.yml | 2 +- .github/workflows/run-tests.yml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/composer-normalize.yml b/.github/workflows/composer-normalize.yml index 7897561..35b8474 100644 --- a/.github/workflows/composer-normalize.yml +++ b/.github/workflows/composer-normalize.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Git checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Validate Composer configuration run: composer validate --strict diff --git a/.github/workflows/fix-code-style.yml b/.github/workflows/fix-code-style.yml index ef1909e..e342038 100644 --- a/.github/workflows/fix-code-style.yml +++ b/.github/workflows/fix-code-style.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index cd0ebb9..c05e196 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -36,7 +36,7 @@ jobs: name: P${{ matrix.php }} - Laravel${{ matrix.laravel }} steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: src diff --git a/.github/workflows/run-static-analysis.yml b/.github/workflows/run-static-analysis.yml index 433c4a6..1085dfe 100644 --- a/.github/workflows/run-static-analysis.yml +++ b/.github/workflows/run-static-analysis.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d78706c..c5bf38a 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -48,7 +48,7 @@ jobs: git config --global core.eol lf - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 From 3cdd3af631c7092d01a623c782d6238f9a0cfc58 Mon Sep 17 00:00:00 2001 From: Markus Podar Date: Fri, 29 Sep 2023 09:26:16 +0200 Subject: [PATCH 5/7] chore: add dependabot for github actions (#1470) --- .github/dependabot.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .github/dependabot.yaml diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml new file mode 100644 index 0000000..44e3ff0 --- /dev/null +++ b/.github/dependabot.yaml @@ -0,0 +1,10 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: / + schedule: + interval: monthly + groups: + deps: + patterns: + - '*' From 390874207fbac4e0ee354934575f15b205cbfb60 Mon Sep 17 00:00:00 2001 From: Serhii Petrov Date: Thu, 5 Oct 2023 16:10:38 +0300 Subject: [PATCH 6/7] Test against php 8.2 and 8.3 Integration tests against 8.3 Unit tests against 8.2 and 8.3 --- .github/workflows/run-integration-tests.yml | 2 +- .github/workflows/run-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index c05e196..96173bf 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -18,7 +18,7 @@ jobs: COMPOSER_NO_INTERACTION: 1 strategy: matrix: - php: [8.2, 8.1, 8.0, 7.4, 7.3] + php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3] laravel: [10.*, 9.*, 8.*] exclude: - php: 8.0 diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index c5bf38a..55b79cd 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: os: [ubuntu-20.04, windows-2019] - php: [8.1, 8.0, 7.4, 7.3] + php: [8.3, 8.2, 8.1, 8.0, 7.4, 7.3] laravel: [8.*, 9.*, 10.*] dependency-version: [prefer-lowest, prefer-stable] exclude: From 6336db05481efb3061b0e27b2d26745d7405e1d8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Nov 2023 10:36:20 +0100 Subject: [PATCH 7/7] Bump the deps group with 1 update (#1478) Bumps the deps group with 1 update: [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action). - [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases) - [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md) - [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4...v5) --- updated-dependencies: - dependency-name: stefanzweifel/git-auto-commit-action dependency-type: direct:production update-type: version-update:semver-major dependency-group: deps ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/composer-normalize.yml | 2 +- .github/workflows/fix-code-style.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/composer-normalize.yml b/.github/workflows/composer-normalize.yml index 35b8474..9a2fc97 100644 --- a/.github/workflows/composer-normalize.yml +++ b/.github/workflows/composer-normalize.yml @@ -23,6 +23,6 @@ jobs: composer global require ergebnis/composer-normalize composer normalize - - uses: stefanzweifel/git-auto-commit-action@v4.0.0 + - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: normalize composer.json diff --git a/.github/workflows/fix-code-style.yml b/.github/workflows/fix-code-style.yml index e342038..8019a32 100644 --- a/.github/workflows/fix-code-style.yml +++ b/.github/workflows/fix-code-style.yml @@ -27,7 +27,7 @@ jobs: - run: composer fix-style continue-on-error: true - - uses: stefanzweifel/git-auto-commit-action@v4 + - uses: stefanzweifel/git-auto-commit-action@v5 with: commit_message: composer fix-style commit_author: laravel-ide-helper