diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a22d9723..3c4b461d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,6 @@ jobs: php: '8.1' composer-flags: '--prefer-lowest' allow-unstable: true - #mongodb: true # Previous Symfony versions # … @@ -58,15 +57,12 @@ jobs: os: 'ubuntu-latest' php: '8.1' symfony: '5.4.*@dev' - # For now: Could not install mongodb on PHP 8.1.0-dev - #mongodb: true allow-unstable: true - name: 'Test Symfony 5.4 [Windows, PHP 8.1]' os: 'windows-latest' php: '8.1' symfony: '5.4.*@dev' - #mongodb: true allow-unstable: true - name: 'Test Symfony 6.0 [Linux, PHP 8.1]' @@ -76,13 +72,11 @@ jobs: allow-unstable: true # Bleeding edge (unreleased dev versions where failures are allowed) - - name: 'Test next Symfony [Linux, PHP 8.2] (allowed failure)' + - name: 'Test next Symfony [Linux, PHP 8.1] (allowed failure)' os: 'ubuntu-latest' - php: '8.2' + php: '8.1' symfony: '6.1.*@dev' composer-flags: '--ignore-platform-req php' - # For now: Could not install mongodb on PHP 8.1.0-dev - #mongodb: true allow-unstable: true allow-failure: true @@ -100,19 +94,8 @@ jobs: with: php-version: ${{ matrix.php }} coverage: pcov - extensions: pdo_sqlite ${{ matrix.mongodb && ', mongodb' }} tools: 'composer:v2,flex' - - name: 'Start MongoDB (Linux)' - uses: supercharge/mongodb-github-action@1.6.0 - if: ${{ matrix.mongodb && matrix.os == 'ubuntu-latest' }} - - - name: 'Start MongoDB (Windows)' - uses: crazy-max/ghaction-chocolatey@v1 - with: - args: install mongodb - if: ${{ matrix.mongodb && matrix.os == 'windows-latest' }} - - name: 'Get composer cache directory' id: composer-cache run: echo "::set-output name=dir::$(composer config cache-files-dir)" @@ -128,14 +111,6 @@ jobs: run: composer config minimum-stability dev if: ${{ matrix.allow-unstable }} - - name: 'Remove packages not allowing Symfony 6 yet' - run: composer remove --no-update ${{ matrix.composer-flags }} --dev --no-interaction --ansi "nelmio/alice" "api-platform/core" - if: ${{ matrix.symfony == '6.0.*@dev' }} - - - name: 'Require Doctrine MongoDB dependencies' - run: composer require --no-update ${{ matrix.composer-flags }} --dev --no-interaction --ansi "doctrine/mongodb-odm:^2.2" "doctrine/mongodb-odm-bundle:^4.3" - if: ${{ matrix.mongodb }} - - name: 'Install dependencies' run: composer update --prefer-dist ${{ matrix.composer-flags }} --ansi env: diff --git a/Makefile b/Makefile index 97e0456b..6a5972b3 100644 --- a/Makefile +++ b/Makefile @@ -27,30 +27,16 @@ install-54: install-60: setup install-60: export SYMFONY_REQUIRE = 6.0.*@dev -install-60: remove-60unready-deps install-60: composer config minimum-stability dev composer update install-61: setup install-61: export SYMFONY_REQUIRE = 6.1.*@dev -install-61: remove-60unready-deps install-61: composer config minimum-stability dev composer update -remove-60unready-deps: - # Tmp remove packages not allowing Symfony 6 yet - composer remove --no-update --no-interaction --dev "nelmio/alice" "api-platform/core" - -add-odm: - composer require --no-update --no-interaction --dev "doctrine/mongodb-odm:^2.2" "doctrine/mongodb-odm-bundle:^4.3" - @echo "Run again appropriate install target to update dependencies" - -remove-odm: - composer remove --no-update --no-interaction --dev "doctrine/mongodb-odm" "doctrine/mongodb-odm-bundle" - @echo "Run again appropriate install target to update dependencies" - ######## # Test # ######## diff --git a/composer.json b/composer.json index 35326f7a..2ad97681 100644 --- a/composer.json +++ b/composer.json @@ -36,31 +36,11 @@ }, "prefer-stable": true, "require": { - "php": ">=8.1", - "ext-json": "*", - "symfony/polyfill-php80": "^1.15" + "php": ">=8.1" }, "require-dev": { - "ext-pdo_sqlite": "*", - "api-platform/core": "^2.5.1", - "doctrine/annotations": "^1.9", - "doctrine/data-fixtures": "^1.2", - "doctrine/doctrine-bundle": "^1.12|^2.0", - "doctrine/orm": "^2.4", - "nelmio/alice": "^3.0", - "symfony/browser-kit": "^5.4|^6.0", - "symfony/console": "^5.4|^6.0", - "symfony/css-selector": "^5.4|^6.0", - "symfony/finder": "^5.4|^6.0", "symfony/form": "^5.4|^6.0", - "symfony/framework-bundle": "^5.4|^6.0", - "symfony/phpunit-bridge": "^5.4|^6.0", - "symfony/serializer": "^5.4|^6.0", - "symfony/translation": "^5.4|^6.0", - "symfony/twig-bundle": "^5.4|^6.0", - "symfony/validator": "^5.4|^6.0", - "symfony/yaml": "^5.4|^6.0", - "twig/twig": "^2.12|^3.0" + "symfony/phpunit-bridge": "^5.4|^6.0" }, "extra": { "branch-alias": { diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 901aa82b..c0324497 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -2,7 +2,7 @@ @@ -14,8 +14,6 @@ - - diff --git a/tests/bootstrap.php b/tests/bootstrap.php deleted file mode 100644 index 8c12277b..00000000 --- a/tests/bootstrap.php +++ /dev/null @@ -1,31 +0,0 @@ - - */ - -use Symfony\Component\Filesystem\Filesystem; - -date_default_timezone_set('UTC'); - -$loader = require __DIR__ . '/../vendor/autoload.php'; - -if (file_exists($varDumper = __DIR__ . '/../vendor/symfony/symfony/src/Symfony/Component/VarDumper/Resources/functions/dump.php')) { - require_once $varDumper; -} else { - require_once __DIR__ . '/../vendor/symfony/var-dumper/Resources/functions/dump.php'; -} - -const PACKAGE_ROOT_DIR = __DIR__ . '/..'; -const FIXTURES_DIR = __DIR__ . '/Fixtures'; - -// Empty generated symfony cache -(new Filesystem())->remove(__DIR__ . '/Fixtures/Integration/Symfony/var/cache'); - -return $loader;