diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 6db92ac7..cd60bb90 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -136,8 +136,10 @@ jobs: tools: ${{ matrix.tools }} coverage: none - - name: Remove not required tooling - run: composer remove php-cs-fixer/shim "*phpstan*" --dev --no-interaction --no-update + - name: Remove Lint Tools + # These tools are not required to run tests, so we are removing them to improve dependency resolving and + # testing lowest versions. + run: composer remove "*php-cs-fixer*" "*phpstan*" "*rector*" --dev --no-update - name: Require elasticsearch dependency run: composer require --dev elasticsearch/elasticsearch:"${{ matrix.elasticsearch-package-constraint }}" --no-interaction --no-update diff --git a/DependencyInjection/Configuration.php b/DependencyInjection/Configuration.php index efd5a5b2..3704c1ab 100644 --- a/DependencyInjection/Configuration.php +++ b/DependencyInjection/Configuration.php @@ -21,7 +21,7 @@ */ class Configuration implements ConfigurationInterface { - public function getConfigTreeBuilder() + public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('sulu_article'); $rootNode = $treeBuilder->getRootNode(); diff --git a/composer.json b/composer.json index a5348685..e0b0bb5e 100644 --- a/composer.json +++ b/composer.json @@ -26,18 +26,18 @@ "jms/serializer": "^3.3", "jms/serializer-bundle": "^3.3 || ^4.0", "sulu/sulu": "~2.4.13 || ^2.5.9@dev", - "symfony/config": "^4.3 || ^5.0 || ^6.0", - "symfony/dependency-injection": "^4.3 || ^5.0 || ^6.0", - "symfony/http-foundation": "^4.3 || ^5.0 || ^6.0", - "symfony/http-kernel": "^4.3 || ^5.0 || ^6.0", + "symfony/config": "^4.3 || ^5.0 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^4.3 || ^5.0 || ^6.0 || ^7.0", + "symfony/http-foundation": "^4.3 || ^5.0 || ^6.0 || ^7.0", + "symfony/http-kernel": "^4.3 || ^5.0 || ^6.0 || ^7.0", "symfony-cmf/slugifier-api": "^1.0 || ^2.0", "twig/twig": "^1.41 || ^2.0 || ^3.0" }, "require-dev": { "doctrine/data-fixtures": "^1.1", "handcraftedinthealps/zendsearch": "^2.0", - "jackalope/jackalope-doctrine-dbal": "^1.3.4", - "jackalope/jackalope-jackrabbit": "^1.3", + "jackalope/jackalope-doctrine-dbal": "^1.3.4 || ^2.0", + "jackalope/jackalope-jackrabbit": "^1.3 || ^2.0", "jangregor/phpstan-prophecy": "^1.0", "massive/build-bundle": "^0.3 || ^0.4 || ^0.5", "php-cs-fixer/shim": "^3.0", @@ -51,12 +51,12 @@ "phpunit/phpunit": "^8.2", "sulu/automation-bundle": "^2.0 || ^2.1@dev", "sulu/headless-bundle": "^0.8 || ^0.9 || ^0.10@dev", - "symfony/browser-kit": "^4.3 || ^5.0 || ^6.0", - "symfony/dotenv": "^4.3 || ^5.0 || ^6.0", - "symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0", + "symfony/browser-kit": "^4.3 || ^5.0 || ^6.0 || ^7.0", + "symfony/dotenv": "^4.3 || ^5.0 || ^6.0 || ^7.0", + "symfony/framework-bundle": "^4.3 || ^5.0 || ^6.0 || ^7.0", "symfony/monolog-bundle": "^3.1", - "symfony/security-bundle": "^4.3 || ^5.0 || ^6.0", - "symfony/stopwatch": "^4.3 || ^5.0 || ^6.0" + "symfony/security-bundle": "^4.3 || ^5.0 || ^6.0 || ^7.0", + "symfony/stopwatch": "^4.3 || ^5.0 || ^6.0 || ^7.0" }, "conflict": { "guzzlehttp/ringphp": "<1.1.1",