From ef9267770b930a578324dbc178ce9e83f4b1382c Mon Sep 17 00:00:00 2001 From: TavoNiievez Date: Wed, 6 Dec 2023 19:53:09 -0500 Subject: [PATCH] Fix CI --- .github/workflows/symfony.yml | 8 +- composer.json | 4 +- composer.lock | 168 ++++++--------------- config/bundles.php | 3 +- config/packages/sensio_framework_extra.php | 12 -- public/.htaccess | 2 +- symfony.lock | 20 +-- tests/Functional/EventsCest.php | 3 +- 8 files changed, 57 insertions(+), 163 deletions(-) delete mode 100644 config/packages/sensio_framework_extra.php diff --git a/.github/workflows/symfony.yml b/.github/workflows/symfony.yml index baa3cf9..50878af 100644 --- a/.github/workflows/symfony.yml +++ b/.github/workflows/symfony.yml @@ -3,22 +3,22 @@ name: CI on: push: branches: - - '6.0' + - '6.1' pull_request: branches: - - '6.0' + - '6.1' env: APP_ENV: test jobs: symfony: - name: Symfony 5.4 (PHP ${{ matrix.php-versions }}) + name: Symfony 6.1 (PHP ${{ matrix.php-versions }}) runs-on: ubuntu-latest strategy: fail-fast: true matrix: - php-versions: ['8.0', '8.1'] + php-versions: ['8.1', '8.2', '8.3'] steps: - name: Checkout uses: actions/checkout@v3 diff --git a/composer.json b/composer.json index 125a96f..070929f 100644 --- a/composer.json +++ b/composer.json @@ -15,15 +15,15 @@ "ext-ctype": "*", "ext-iconv": "*", "doctrine/doctrine-bundle": "2.6", - "sensio/framework-extra-bundle": "^6.2", "symfony/apache-pack": "^1.0", + "symfony/cache": "5.4.*", "symfony/console": "6.1.*", "symfony/dotenv": "6.1.*", "symfony/flex": "^2.1", "symfony/form": "6.1.*", "symfony/framework-bundle": "6.1.*", "symfony/mailer": "6.1.*", - "symfony/monolog-bundle": "^3.7", + "symfony/monolog-bundle": "^3.10", "symfony/runtime": "6.1.*", "symfony/security-bundle": "6.1.*", "symfony/translation": "6.1.*", diff --git a/composer.lock b/composer.lock index 97ccae7..5d900bc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9e464626f1fc1927a6368d31e2ed44a4", + "content-hash": "6ba80eda6e08c28f4aee0864adcc1f7d", "packages": [ { "name": "doctrine/annotations", @@ -1011,16 +1011,16 @@ }, { "name": "psr/cache", - "version": "3.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/php-fig/cache.git", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", - "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "url": "https://api.github.com/repos/php-fig/cache/zipball/213f9dbc5b9bfbc4f8db86d2838dc968752ce13b", + "reference": "213f9dbc5b9bfbc4f8db86d2838dc968752ce13b", "shasum": "" }, "require": { @@ -1054,9 +1054,9 @@ "psr-6" ], "support": { - "source": "https://github.com/php-fig/cache/tree/3.0.0" + "source": "https://github.com/php-fig/cache/tree/2.0.0" }, - "time": "2021-02-03T23:26:27+00:00" + "time": "2021-02-03T23:23:37+00:00" }, { "name": "psr/container", @@ -1211,84 +1211,6 @@ }, "time": "2021-07-14T16:46:02+00:00" }, - { - "name": "sensio/framework-extra-bundle", - "version": "v6.2.10", - "source": { - "type": "git", - "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/2f886f4b31f23c76496901acaedfedb6936ba61f", - "reference": "2f886f4b31f23c76496901acaedfedb6936ba61f", - "shasum": "" - }, - "require": { - "doctrine/annotations": "^1.0|^2.0", - "php": ">=7.2.5", - "symfony/config": "^4.4|^5.0|^6.0", - "symfony/dependency-injection": "^4.4|^5.0|^6.0", - "symfony/framework-bundle": "^4.4|^5.0|^6.0", - "symfony/http-kernel": "^4.4|^5.0|^6.0" - }, - "conflict": { - "doctrine/doctrine-cache-bundle": "<1.3.1", - "doctrine/persistence": "<1.3" - }, - "require-dev": { - "doctrine/dbal": "^2.10|^3.0", - "doctrine/doctrine-bundle": "^1.11|^2.0", - "doctrine/orm": "^2.5", - "symfony/browser-kit": "^4.4|^5.0|^6.0", - "symfony/doctrine-bridge": "^4.4|^5.0|^6.0", - "symfony/dom-crawler": "^4.4|^5.0|^6.0", - "symfony/expression-language": "^4.4|^5.0|^6.0", - "symfony/finder": "^4.4|^5.0|^6.0", - "symfony/monolog-bridge": "^4.0|^5.0|^6.0", - "symfony/monolog-bundle": "^3.2", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0", - "symfony/security-bundle": "^4.4|^5.0|^6.0", - "symfony/twig-bundle": "^4.4|^5.0|^6.0", - "symfony/yaml": "^4.4|^5.0|^6.0", - "twig/twig": "^1.34|^2.4|^3.0" - }, - "type": "symfony-bundle", - "extra": { - "branch-alias": { - "dev-master": "6.1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Sensio\\Bundle\\FrameworkExtraBundle\\": "src/" - }, - "exclude-from-classmap": [ - "/tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - } - ], - "description": "This bundle provides a way to configure your controllers with annotations", - "keywords": [ - "annotations", - "controllers" - ], - "support": { - "source": "https://github.com/sensiolabs/SensioFrameworkExtraBundle/tree/v6.2.10" - }, - "abandoned": "Symfony", - "time": "2023-02-24T14:57:12+00:00" - }, { "name": "symfony/apache-pack", "version": "v1.0.1", @@ -1317,57 +1239,58 @@ }, { "name": "symfony/cache", - "version": "v6.1.11", + "version": "v5.4.32", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "c6a7f2a1c65c30678b82c1171ff99edbeb915be0" + "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/c6a7f2a1c65c30678b82c1171ff99edbeb915be0", - "reference": "c6a7f2a1c65c30678b82c1171ff99edbeb915be0", + "url": "https://api.github.com/repos/symfony/cache/zipball/2553faca77502a4f68dc93cd2f3b9ec650751e40", + "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40", "shasum": "" }, "require": { - "php": ">=8.1", - "psr/cache": "^2.0|^3.0", + "php": ">=7.2.5", + "psr/cache": "^1.0|^2.0", "psr/log": "^1.1|^2|^3", - "symfony/cache-contracts": "^1.1.7|^2|^3", + "symfony/cache-contracts": "^1.1.7|^2", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16", "symfony/service-contracts": "^1.1|^2|^3", - "symfony/var-exporter": "^5.4|^6.0" + "symfony/var-exporter": "^4.4|^5.0|^6.0" }, "conflict": { "doctrine/dbal": "<2.13.1", - "symfony/dependency-injection": "<5.4", - "symfony/http-kernel": "<5.4", - "symfony/var-dumper": "<5.4" + "symfony/dependency-injection": "<4.4", + "symfony/http-kernel": "<4.4", + "symfony/var-dumper": "<4.4" }, "provide": { - "psr/cache-implementation": "2.0|3.0", - "psr/simple-cache-implementation": "1.0|2.0|3.0", - "symfony/cache-implementation": "1.1|2.0|3.0" + "psr/cache-implementation": "1.0|2.0", + "psr/simple-cache-implementation": "1.0|2.0", + "symfony/cache-implementation": "1.0|2.0" }, "require-dev": { "cache/integration-tests": "dev-master", - "doctrine/dbal": "^2.13.1|^3.0", + "doctrine/cache": "^1.6|^2.0", + "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1", - "psr/simple-cache": "^1.0|^2.0|^3.0", - "symfony/config": "^5.4|^6.0", - "symfony/dependency-injection": "^5.4|^6.0", - "symfony/filesystem": "^5.4|^6.0", - "symfony/http-kernel": "^5.4|^6.0", - "symfony/messenger": "^5.4|^6.0", - "symfony/var-dumper": "^5.4|^6.0" + "psr/simple-cache": "^1.0|^2.0", + "symfony/config": "^4.4|^5.0|^6.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/filesystem": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", + "symfony/messenger": "^4.4|^5.0|^6.0", + "symfony/var-dumper": "^4.4|^5.0|^6.0" }, "type": "library", "autoload": { "psr-4": { "Symfony\\Component\\Cache\\": "" }, - "classmap": [ - "Traits/ValueWrapper.php" - ], "exclude-from-classmap": [ "/Tests/" ] @@ -1393,7 +1316,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.1.11" + "source": "https://github.com/symfony/cache/tree/v5.4.32" }, "funding": [ { @@ -1409,30 +1332,33 @@ "type": "tidelift" } ], - "time": "2023-01-20T17:44:30+00:00" + "time": "2023-11-24T13:04:07+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.4.0", + "version": "v2.5.2", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778" + "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", + "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc", "shasum": "" }, "require": { - "php": ">=8.1", - "psr/cache": "^3.0" + "php": ">=7.2.5", + "psr/cache": "^1.0|^2.0|^3.0" + }, + "suggest": { + "symfony/cache-implementation": "" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1469,7 +1395,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2" }, "funding": [ { @@ -1485,7 +1411,7 @@ "type": "tidelift" } ], - "time": "2023-09-25T12:52:38+00:00" + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/config", diff --git a/config/bundles.php b/config/bundles.php index 4d74753..416239a 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -4,11 +4,10 @@ Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true], Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true], - Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true], Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true], - Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], + Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], ]; diff --git a/config/packages/sensio_framework_extra.php b/config/packages/sensio_framework_extra.php deleted file mode 100644 index cc4dfc4..0000000 --- a/config/packages/sensio_framework_extra.php +++ /dev/null @@ -1,12 +0,0 @@ -router([ - 'annotations' => false - ]); -}; diff --git a/public/.htaccess b/public/.htaccess index d627268..648f12d 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -18,7 +18,7 @@ DirectoryIndex index.php RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^ %{ENV:BASE}/index.php [L] + RewriteRule ^(.*)$ %{ENV:BASE}/index.php [QSA,L] diff --git a/symfony.lock b/symfony.lock index 175de5b..da0492d 100644 --- a/symfony.lock +++ b/symfony.lock @@ -148,9 +148,6 @@ "masterminds/html5": { "version": "2.7.5" }, - "monolog/monolog": { - "version": "2.x-dev" - }, "myclabs/deep-copy": { "version": "1.x-dev" }, @@ -297,18 +294,6 @@ "sebastian/version": { "version": "3.0.x-dev" }, - "sensio/framework-extra-bundle": { - "version": "6.2", - "recipe": { - "repo": "github.com/symfony/recipes", - "branch": "main", - "version": "5.2", - "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b" - }, - "files": [ - "./config/packages/sensio_framework_extra.yaml" - ] - }, "squizlabs/php_codesniffer": { "version": "4.0", "recipe": { @@ -463,11 +448,8 @@ "symfony/mime": { "version": "6.0.x-dev" }, - "symfony/monolog-bridge": { - "version": "6.0.x-dev" - }, "symfony/monolog-bundle": { - "version": "3.9999999", + "version": "3.10", "recipe": { "repo": "github.com/symfony/recipes", "branch": "main", diff --git a/tests/Functional/EventsCest.php b/tests/Functional/EventsCest.php index 21ef077..5c8b16b 100644 --- a/tests/Functional/EventsCest.php +++ b/tests/Functional/EventsCest.php @@ -33,9 +33,8 @@ public function dontSeeOrphanEvent(FunctionalTester $I) public function seeEventTriggered(FunctionalTester $I) { $I->amOnPage('/'); - $I->seeEventTriggered(SecurityListener::class); $I->seeEventTriggered(new RouterDataCollector()); - $I->seeEventTriggered([SecurityListener::class, RouterDataCollector::class]); + $I->seeEventTriggered([RouterDataCollector::class]); } public function seeOrphanEvent(FunctionalTester $I)