diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2f6809f..df1858f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,12 +17,11 @@ jobs: fail-fast: false matrix: php-version: - - '8.0' - '8.1' + - '8.2' symfony-version: - - '5.3.*' - '5.4.*' - - '6.0.*' + - '6.3.*' dependencies: - 'lowest' - 'highest' @@ -52,7 +51,7 @@ jobs: run: composer remove --no-update ${{ matrix.remove-dependencies }} - name: "Install dependencies" - uses: ramsey/composer-install@1.3.0 + uses: ramsey/composer-install@v2 with: dependency-versions: ${{ matrix.dependencies }} env: @@ -72,10 +71,10 @@ jobs: uses: "shivammathur/setup-php@v2" with: tools: flex - php-version: "8.0" + php-version: "8.2" - name: "Install dependencies" - uses: ramsey/composer-install@1.3.0 + uses: ramsey/composer-install@v2 - name: "Check coding standard" run: composer check-cs diff --git a/.gitignore b/.gitignore index 8293200..7898efc 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ composer.phar .php_cs.cache /*.phar /.phpunit.result.cache +/.phpunit.cache +/.php-cs-fixer.cache diff --git a/.php_cs b/.php-cs-fixer.php similarity index 94% rename from .php_cs rename to .php-cs-fixer.php index b356b58..5ad3365 100644 --- a/.php_cs +++ b/.php-cs-fixer.php @@ -9,7 +9,7 @@ file that was distributed with this source code. EOF; -return PhpCsFixer\Config::create() +return (new PhpCsFixer\Config()) ->setRules([ '@Symfony' => true, '@Symfony:risky' => true, diff --git a/composer.json b/composer.json index db56535..134ec91 100644 --- a/composer.json +++ b/composer.json @@ -25,16 +25,16 @@ "sort-packages": true }, "require": { - "php": "^8.0", - "overblog/dataloader-php": "^0.7.0", - "symfony/dependency-injection": "^5.3.7 || ^6.0" + "php": "^8.1", + "overblog/dataloader-php": "^1", + "symfony/dependency-injection": "^5.4 || ^6.3" }, "require-dev": { - "phpunit/phpunit": "^9.5.10", + "phpunit/phpunit": "^10.3", "react/promise": "^2.8.0", - "sensio/framework-extra-bundle": "^6.2", - "symfony/phpunit-bridge": "^6.0", - "symfony/yaml": "^5.3.7 || ^6.0" + "symfony/framework-bundle": "^5.4||^6.3", + "symfony/phpunit-bridge": "^6.3", + "symfony/yaml": "^5.4 || ^6.3" }, "extra": { "branch-alias": { @@ -42,8 +42,8 @@ } }, "scripts": { - "test": "bin/phpunit --color=always --coverage-clover=build/logs/clover.xml", - "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v2.18.7/php-cs-fixer.phar -O php-cs-fixer.phar", + "test": "bin/phpunit --color=always", + "install-cs": "test -f php-cs-fixer.phar || wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.23.0/php-cs-fixer.phar -O php-cs-fixer.phar", "fix-cs": [ "@install-cs", "@php php-cs-fixer.phar fix --diff -v --allow-risky=yes --ansi" diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e34164e..1f8ec7c 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,24 +1,12 @@ - - - - - ./tests/ - - - - - - - - + + + + ./tests/ + + + + + + diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index e32e137..6e6e664 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -57,7 +57,7 @@ public function getConfigTreeBuilder(): TreeBuilder ->end() ->end() ->end() - ; + ; return $treeBuilder; } diff --git a/tests/Functional/TestCase.php b/tests/Functional/TestCase.php index 9ab7c0f..218c2fa 100644 --- a/tests/Functional/TestCase.php +++ b/tests/Functional/TestCase.php @@ -29,9 +29,6 @@ protected static function getKernelClass(): string return AppKernel::class; } - /** - * {@inheritdoc} - */ protected static function createKernel(array $options = []): KernelInterface { if (null === static::$class) { @@ -46,9 +43,6 @@ protected static function createKernel(array $options = []): KernelInterface return new static::$class($env, $debug, $options['test_case']); } - /** - * {@inheritdoc} - */ public static function setUpBeforeClass(): void { $fs = new Filesystem(); diff --git a/tests/Functional/UserLoaderTest.php b/tests/Functional/UserLoaderTest.php index 640e1f2..650ef9e 100644 --- a/tests/Functional/UserLoaderTest.php +++ b/tests/Functional/UserLoaderTest.php @@ -13,6 +13,7 @@ use Overblog\DataLoader\DataLoader; use Overblog\DataLoaderBundle\Tests\Functional\app\UserDataProvider; + use function React\Promise\all; class UserLoaderTest extends TestCase diff --git a/tests/Functional/app/AppKernel.php b/tests/Functional/app/AppKernel.php index 2d1f2ab..e783190 100644 --- a/tests/Functional/app/AppKernel.php +++ b/tests/Functional/app/AppKernel.php @@ -21,9 +21,6 @@ class AppKernel extends Kernel { private $testCase; - /** - * {@inheritdoc} - */ public function registerBundles(): array { return [ @@ -52,9 +49,6 @@ public function isBooted() return $this->booted; } - /** - * {@inheritdoc} - */ public function registerContainerConfiguration(LoaderInterface $loader) { $loader->load(__DIR__.'/config/config.yaml'); diff --git a/tests/Functional/app/config/config.yaml b/tests/Functional/app/config/config.yaml index f9549d0..d16ec02 100644 --- a/tests/Functional/app/config/config.yaml +++ b/tests/Functional/app/config/config.yaml @@ -6,6 +6,7 @@ framework: resource: "%kernel.project_dir%/config/routing.yaml" profiler: enabled: false + http_method_override: false overblog_dataloader: defaults: