Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✅ remove other phpunit deprecations #1466

Merged
merged 1 commit into from
Sep 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Require the vendor
run: composer require --dev --no-update vincentlanglet/twig-cs-fixer ^2.11
run: composer require --dev --no-update vincentlanglet/twig-cs-fixer ^3.1
- name: Update
run: composer update --no-interaction --no-progress
- name: Run
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
with_oneupbundle: false
max_deprecations: 5
- php: '8.1'
symfony: '6.3.*'
symfony: '6.4.*'
dependencies: highest
with_imagine: false
with_oneupbundle: true
Expand Down Expand Up @@ -104,6 +104,8 @@ jobs:
php-version: ${{ matrix.php }}
extensions: mongodb-stable, pdo_sqlite
- run: composer require --no-update doctrine/annotations:^1.14
- run: |
sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0",\n"symfony\/http-kernel": "6.4.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json
- run: |
composer global config --no-plugins allow-plugins.symfony/flex true
composer global require --no-interaction --no-progress symfony/flex:^2.2
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
"symfony/event-dispatcher-contracts": "^3.1",
"symfony/http-foundation": "^5.4 || ^6.0 || ^7.0",
"symfony/http-kernel": "^5.4 || ^6.0, !=6.4.9 || ^7.0, !=7.1.2",
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
"symfony/mime": "^5.4 || ^6.0 || ^7.0",
"symfony/property-access": "^5.4 || ^6.0 || ^7.0",
"symfony/string": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
"ext-sqlite3": "*",
"dg/bypass-finals": "^1.3",
"dg/bypass-finals": "^1.8",
"doctrine/doctrine-bundle": "^2.7",
"doctrine/mongodb-odm": "^2.4",
"doctrine/orm": "^2.13",
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile81
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ WORKDIR /srv/vich-uploader
COPY . ./

RUN set -eux; \
sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0", "symfony\/http-kernel": "6.4.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json; \
composer global config --no-plugins allow-plugins.symfony/flex true; \
composer global require --no-interaction --no-progress symfony/flex:^2.2; \
composer config extra.symfony.require "^6.4"; \
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile82
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ WORKDIR /srv/vich-uploader
COPY . ./

RUN set -eux; \
sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0", "symfony\/http-kernel": "6.0.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json; \
composer require --no-update doctrine/annotations:^1.14; \
composer update --prefer-dist --ignore-platform-reqs; \
composer clear-cache
Expand Down
1 change: 1 addition & 0 deletions docker/Dockerfile83
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ WORKDIR /srv/vich-uploader
COPY . ./

RUN set -eux; \
sed -i 's/"league\/flysystem": "<2.0"/"league\/flysystem": "<2.0", "symfony\/http-kernel": "6.0.*,>6.4.8 || 7.1.*,>7.1.1"/' composer.json; \
composer require --no-update doctrine/annotations:^1.14; \
composer update --prefer-dist --ignore-platform-reqs; \
composer clear-cache
Expand Down
4 changes: 1 addition & 3 deletions tests/Handler/UploadHandlerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,10 @@ protected function validEvent(): object

protected function expectEvents(array $events): void
{
$arguments = \array_map(fn (string $event): array => [$this->validEvent(), $event], $events);

$this->dispatcher
->expects(self::exactly(\count($events)))
->method('dispatch')
->withConsecutive(...$arguments)
->willReturnCallback(fn (object $event, string $eventName): object => $event)
;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* @author Markus Bachmann <[email protected]>
* @author Titouan Galopin <[email protected]>
*/
abstract class AbstractFlysystemStorageTest extends StorageTestCase
abstract class AbstractFlysystemStorageTestCase extends StorageTestCase
{
final public const FS_KEY = 'filesystemKey';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @author Markus Bachmann <[email protected]>
* @author Titouan Galopin <[email protected]>
*/
final class MountManagerFlysystemStorageTest extends AbstractFlysystemStorageTest
final class MountManagerFlysystemStorageTest extends AbstractFlysystemStorageTestCase
{
protected function createRegistry(FilesystemOperator $filesystem): MountManager
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
/**
* @author Titouan Galopin <[email protected]>
*/
final class PsrContainerFlysystemStorageTest extends AbstractFlysystemStorageTest
final class PsrContainerFlysystemStorageTest extends AbstractFlysystemStorageTestCase
{
protected function createRegistry(FilesystemOperator $filesystem): ContainerInterface
{
Expand Down
Loading