bump to php 8 because annotations are only available since PHP 8.0

doctrine · Sep 23, 2023 · f826d89 · f826d89
1 parent eeca094
commit f826d89
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 43 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,8 +1,7 @@
-<phpunit colors="true" bootstrap="bootstrap.php" backupGlobals="false" cacheTokens="true">
+<phpunit colors="true" bootstrap="bootstrap.php" backupGlobals="false" cacheTokens="true" failOnWarning="false">
     <php>
-        <!-- Disable E_USER_DEPRECATED until 3.0 -->
-        <!-- php -r 'echo -1 & ~E_USER_DEPRECATED;' -->
-        <ini name="error_reporting" value="-16385"/>
+        <!-- Disable PHP error reporting -->
+        <ini name="error_reporting" value="0"/>
 
         <var name="DOCTRINE_PHPCR_FACTORY" value="\Jackalope\RepositoryFactoryJackrabbit" />
         <var name="jackalope.jackrabbit_uri" value="http://localhost:8080/server/" />
@@ -13,6 +12,7 @@
         <!-- to adjust performance results to your specific hardware, use integers only. -->
         <!-- the InsertPerformanceTest tries to insert count nodes in one second -->
         <var name="DOCTRINE_PHPCR_PERFORMANCE_COUNT" value="100" />
+        <var name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
     </php>
 
     <testsuites>