From 39b17a9fd02cf4f03a38e33f83598654e6ebe471 Mon Sep 17 00:00:00 2001 From: mech <150686+themech@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:30:38 +0100 Subject: [PATCH 1/2] Fix PHP 8.4 implicit nullable parameter deprecations --- src/Manager.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Manager.php b/src/Manager.php index f55c4508..bae748db 100644 --- a/src/Manager.php +++ b/src/Manager.php @@ -61,7 +61,7 @@ class Manager */ private ScopeFactoryInterface $scopeFactory; - public function __construct(ScopeFactoryInterface $scopeFactory = null) + public function __construct(?ScopeFactoryInterface $scopeFactory = null) { $this->scopeFactory = $scopeFactory ?: new ScopeFactory(); } @@ -72,7 +72,7 @@ public function __construct(ScopeFactoryInterface $scopeFactory = null) public function createData( ResourceInterface $resource, ?string $scopeIdentifier = null, - Scope $parentScopeInstance = null + ?Scope $parentScopeInstance = null ): Scope { if ($parentScopeInstance !== null) { return $this->scopeFactory->createChildScopeFor($this, $parentScopeInstance, $resource, $scopeIdentifier); From 10b80e4777bfe41ea711edae270057b42d1f355b Mon Sep 17 00:00:00 2001 From: mech <150686+themech@users.noreply.github.com> Date: Tue, 3 Mar 2026 16:35:51 +0100 Subject: [PATCH 2/2] update github actions code --- .github/workflows/run-tests.yml | 2 +- .github/workflows/static.yml | 4 ++-- .github/workflows/style-checker.yml | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index f01fdbe3..e60dd766 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -16,7 +16,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/static.yml b/.github/workflows/static.yml index 328a6c8f..c2013d06 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -8,7 +8,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -29,7 +29,7 @@ jobs: runs-on: ubuntu-20.04 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/style-checker.yml b/.github/workflows/style-checker.yml index 68b72297..3a359fc6 100644 --- a/.github/workflows/style-checker.yml +++ b/.github/workflows/style-checker.yml @@ -9,7 +9,7 @@ jobs: steps: - name: Checkout Code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 @@ -18,15 +18,15 @@ jobs: - name: Cache Dependencies id: composer-cache-style - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: vendor key: ubuntu-composer-cache-style-${{ hashFiles('**/composer.lock') }} restore-keys: ubuntu-php-style - name: Install Dependencies - if: steps.composer-cache.outputs.cache-hit != 'true' + if: steps.composer-cache-style.outputs.cache-hit != 'true' run: composer install --prefer-dist --no-progress --no-suggest - name: Check Coding Style - run: vendor/bin/phpcs src/ \ No newline at end of file + run: vendor/bin/phpcs src/