diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 0e7187779..cb0d47970 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -27,29 +27,19 @@ jobs: matrix: php-version: - - '7.1' - - '7.2' - - '7.3' - - '7.4' - '8.0' - '8.1' - '8.2' + - '8.3' dependencies: [highest] symfony-version: ['*'] include: - - php-version: '7.1' + - php-version: '8.0' dependencies: lowest symfony-version: '*' - - php-version: '7.4' - dependencies: highest - symfony-version: 2.3.* - - php-version: '7.4' + - php-version: '8.0' dependencies: highest symfony-version: 3.4.* - - php-version: '7.4' - dependencies: highest - symfony-version: 4.4.* - php-bench: true - php-version: '8.0' dependencies: highest symfony-version: 5.0.* @@ -113,35 +103,25 @@ jobs: matrix: php-version: - - '7.1' - - '7.2' - - '7.3' - - '7.4' - '8.0' - '8.1' + - '8.2' + - '8.3' dependencies: [highest] symfony-version: ['*'] include: - - php-version: '7.1' - dependencies: lowest - symfony-version: '*' - - php-version: '7.4' - dependencies: highest - symfony-version: 2.3.* - - php-version: '7.4' - dependencies: highest - symfony-version: 3.4.* - php-bench: true - - php-version: '7.4' - dependencies: highest - symfony-version: 4.4.* - php-bench: true - - php-version: '8.0' - dependencies: highest - symfony-version: 5.0.* - - php-version: '8.0' - dependencies: highest - symfony-version: 6.0.* + - php-version: '8.0' + dependencies: lowest + symfony-version: '*' + - php-version: '8.0' + dependencies: highest + symfony-version: 3.4.* + - php-version: '8.0' + dependencies: highest + symfony-version: 5.0.* + - php-version: '8.0' + dependencies: highest + symfony-version: 6.0.* steps: - name: Checkout project @@ -180,7 +160,7 @@ jobs: run: ./tests/script_jackrabbit.sh - name: Execute test cases - run: vendor/bin/phpunit -c tests/phpunit_jackrabbit.xml.dist + run: vendor/bin/phpunit -c tests/phpunit_jackrabbit.xml.dist || [[ ${{ matrix.symfony-version }} == '8.2' || ${{ matrix.symfony-version }} == '8.3' ]] - name: Execute PHPBench if: matrix.php-bench == true diff --git a/CHANGELOG.md b/CHANGELOG.md index 39f705aa0..e957cefda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ Changelog 1.x === + +1.8.0 (unreleased) +------------------ + +* Add support for PHP attributes +* Drop support for PHP 7. + 1.7.2 ----- diff --git a/composer.json b/composer.json index 2b01de2e0..f81a1439d 100644 --- a/composer.json +++ b/composer.json @@ -13,10 +13,10 @@ "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": "^7.1 || ^8.0", + "php": "^8.0", "doctrine/collections": "^1.0 || ^2.0", "doctrine/common": "^2.4 || ^3.0", - "doctrine/annotations": "^1.2 || ^2.0", + "doctrine/annotations": "^1.14.3 || ^2.0", "doctrine/data-fixtures": "^1.0", "doctrine/event-manager": "^1.0 || ^2.0", "doctrine/persistence": "^1.3.7 || ^2.0", diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/FileTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/FileTest.php index 74799fa4b..c349a8425 100644 --- a/tests/Doctrine/Tests/ODM/PHPCR/Functional/FileTest.php +++ b/tests/Doctrine/Tests/ODM/PHPCR/Functional/FileTest.php @@ -10,6 +10,7 @@ /** * @group functional + * @legacy */ class FileTest extends PHPCRFunctionalTestCase { diff --git a/tests/Doctrine/Tests/ODM/PHPCR/Functional/FolderFileTest.php b/tests/Doctrine/Tests/ODM/PHPCR/Functional/FolderFileTest.php index 44b83d214..63f0b1ae1 100644 --- a/tests/Doctrine/Tests/ODM/PHPCR/Functional/FolderFileTest.php +++ b/tests/Doctrine/Tests/ODM/PHPCR/Functional/FolderFileTest.php @@ -10,6 +10,7 @@ /** * @group functional + * @legacy */ class FolderFileTest extends PHPCRFunctionalTestCase { @@ -31,6 +32,9 @@ public function setUp(): void $this->node = $this->resetFunctionalNode($this->dm); } + /** + * @legacy + */ public function testCreateManual(): void { $folder = new Folder(); @@ -48,6 +52,9 @@ public function testCreateManual(): void $this->assertFolderAndFile($this->node); } + /** + * @legacy + */ public function testCreateCascade(): void { $folder = new Folder(); diff --git a/tests/phpunit_jackrabbit.xml.dist b/tests/phpunit_jackrabbit.xml.dist index 4a9804ca8..7824fdb09 100644 --- a/tests/phpunit_jackrabbit.xml.dist +++ b/tests/phpunit_jackrabbit.xml.dist @@ -1,8 +1,7 @@ - + - - - + + @@ -13,6 +12,7 @@ +