Merge pull request #91 from vemaeg/feature/php-8.2-changes

Add(php) Add PHP 8.2 support
FriendsOfSymfony1 · Jan 10, 2023 · 0ee6863 · 0ee6863
2 parents 6ff2997 + 0241c0b
commit 0ee6863
Show file tree

Hide file tree

Showing 31 changed files with 84 additions and 15 deletions.
diff --git a/.docker/php74_81/Dockerfile → .docker/php74_82/Dockerfile b/.docker/php74_81/Dockerfile → .docker/php74_82/Dockerfile
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -20,6 +20,7 @@ jobs:
                     - "7.4"
                     - "8.0"
                     - "8.1"
+                    - "8.2"
 
         steps:
             - name: "Checkout"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -103,24 +103,31 @@ services:
   php74:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '7.4'
 
   php80:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '8.0'
 
   php81:
     <<: *services_php54
     build:
-      context: .docker/php74_81
+      context: .docker/php74_82
       args:
         PHP_VERSION: '8.1'
 
+  php82:
+    <<: *services_php54
+    build:
+      context: .docker/php74_82
+      args:
+        PHP_VERSION: '8.2'
+
   db:
     image: mysql:5.5.62
     environment:

diff --git a/lib/Doctrine/Cli/AnsiColorFormatter.php b/lib/Doctrine/Cli/AnsiColorFormatter.php
@@ -115,7 +115,7 @@ public function formatSection($section, $text, $size = null)
     {
         $width = 9 + strlen($this->format('', 'INFO'));
 
-        return sprintf(">> %-${width}s %s", $this->format($section, 'INFO'), $this->excerpt($text, $size));
+        return sprintf(">> %-{$width}s %s", $this->format($section, 'INFO'), $this->excerpt($text, $size));
     }
 
     /**

diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php
@@ -188,6 +188,7 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
      */
     protected $_tableCache;
     protected $_tableCacheTTL;
+    protected $exported;
 
     /**
      * the constructor

diff --git a/lib/Doctrine/Hydrator/Graph.php b/lib/Doctrine/Hydrator/Graph.php
@@ -35,7 +35,9 @@
  */
 abstract class Doctrine_Hydrator_Graph extends Doctrine_Hydrator_Abstract
 {
-    protected $_tables = array();
+    protected
+        $_tables = array(),
+        $_rootAlias = null;
 
     /**
      * Gets the custom field used for indexing for the specified component alias.

diff --git a/lib/Doctrine/Import/Builder.php b/lib/Doctrine/Import/Builder.php
@@ -36,6 +36,7 @@
  * @author      Nicolas Bérard-Nault <[email protected]>
  * @author      Jonathan H. Wage <[email protected]>
  */
+#[\AllowDynamicProperties]
 class Doctrine_Import_Builder extends Doctrine_Builder
 {
     /**

diff --git a/lib/Doctrine/Manager.php b/lib/Doctrine/Manager.php
@@ -411,6 +411,10 @@ protected function _buildDsnPartsArray($dsn)
         // silence any warnings
         $parts = @parse_url($dsn);
 
+        if ($parts === false) {
+            $parts = array();
+        }
+
         $names = array('dsn', 'scheme', 'host', 'port', 'user', 'pass', 'path', 'query', 'fragment');
 
         foreach ($names as $name) {

diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
@@ -160,11 +160,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
      */
     protected $_parsers = array();
 
-    /**
-     * @var array $_pendingJoinConditions    an array containing pending joins
-     */
-    protected $_pendingJoinConditions = array();
-
     /**
      * @var array
      */

diff --git a/lib/Doctrine/Query/Abstract.php b/lib/Doctrine/Query/Abstract.php
@@ -267,6 +267,11 @@ abstract class Doctrine_Query_Abstract
      */
     protected $_preQueried = false;
 
+    /**
+     * @var array $_pendingJoinConditions    an array containing pending joins
+     */
+    protected $_pendingJoinConditions = array();
+
     /**
      * Fix for http://www.doctrine-project.org/jira/browse/DC-701
      *

diff --git a/lib/Doctrine/RawSql.php b/lib/Doctrine/RawSql.php
@@ -59,7 +59,7 @@ function __construct(Doctrine_Connection $connection = null, Doctrine_Hydrator_A
 
     protected function clear()
     {
-        $this->_preQuery = false;
+        $this->_preQueried = false;
         $this->_pendingJoinConditions = array();
     }
 

diff --git a/lib/Doctrine/Sequence/Mssql.php b/lib/Doctrine/Sequence/Mssql.php
@@ -32,6 +32,8 @@
  */
 class Doctrine_Sequence_Mssql extends Doctrine_Sequence
 {
+    protected $warnings;
+
     /**
      * Returns the next free id of a sequence
      *

diff --git a/lib/Doctrine/Task/BuildAll.php b/lib/Doctrine/Task/BuildAll.php
@@ -37,6 +37,7 @@ class Doctrine_Task_BuildAll extends Doctrine_Task
            $optionalArguments    =   array();
 
     protected $models,
+              $createDb,
               $tables;
 
     public function __construct($dispatcher = null)

diff --git a/lib/Doctrine/Task/BuildAllLoad.php b/lib/Doctrine/Task/BuildAllLoad.php
@@ -35,6 +35,9 @@ class Doctrine_Task_BuildAllLoad extends Doctrine_Task
     public $description          =   'Calls build-all, and load-data',
            $requiredArguments    =   array(),
            $optionalArguments    =   array();
+
+    protected $buildAll,
+              $loadData;
 
     public function __construct($dispatcher = null)
     {

diff --git a/lib/Doctrine/Task/BuildAllReload.php b/lib/Doctrine/Task/BuildAllReload.php
@@ -35,6 +35,9 @@ class Doctrine_Task_BuildAllReload extends Doctrine_Task
     public $description          =   'Calls rebuild-db and load-data',
            $requiredArguments    =   array(),
            $optionalArguments    =   array();
+
+    protected $rebuildDb,
+              $loadData;
 
     public function __construct($dispatcher = null)
     {

diff --git a/lib/Doctrine/Task/RebuildDb.php b/lib/Doctrine/Task/RebuildDb.php
@@ -35,6 +35,10 @@ class Doctrine_Task_RebuildDb extends Doctrine_Task
     public $description          =   'Drops and re-creates databases',
            $requiredArguments    =   array(),
            $optionalArguments    =   array();
+
+    protected $dropDb,
+              $createDb,
+              $createTables;
 
     public function __construct($dispatcher = null)
     {

diff --git a/tests/Cache/DbTestCase.php b/tests/Cache/DbTestCase.php
@@ -33,6 +33,8 @@
  */
 class Doctrine_Cache_Db_TestCase extends Doctrine_Cache_Abstract_TestCase
 {
+    protected $cache;
+
     public function setUp()
     {
         parent::setUp();

diff --git a/tests/Connection/CustomTestCase.php b/tests/Connection/CustomTestCase.php
@@ -32,6 +32,9 @@
  */
 class Doctrine_Connection_Custom_TestCase extends Doctrine_UnitTestCase 
 {
+    protected $_conn;
+    protected $_dbh;
+
     public function setUp()
     {
         $manager = Doctrine_Manager::getInstance();

diff --git a/tests/DoctrineTest/Doctrine_UnitTestCase.php b/tests/DoctrineTest/Doctrine_UnitTestCase.php
@@ -53,7 +53,11 @@ class Doctrine_UnitTestCase extends UnitTestCase
     protected $dataDict;
     protected $transaction;
     protected $_name;
-
+    protected $query;
+    protected $profiler;
+    protected $import;
+    protected $sequence;
+    protected $exc;
 
     protected $init = false;
 

diff --git a/tests/DoctrineTest/GroupTest.php b/tests/DoctrineTest/GroupTest.php
@@ -6,6 +6,8 @@ class GroupTest extends UnitTestCase
     protected $_title;
     protected $_onlyRunFailed = false;
 
+    protected $_formatter;
+
     public function __construct($title, $name)
     {
         $this->_title = $title;

diff --git a/tests/ManagerTestCase.php b/tests/ManagerTestCase.php
@@ -32,6 +32,12 @@
  */
 class Doctrine_Manager_TestCase extends Doctrine_UnitTestCase
 {
+    protected $conn1_database;
+    protected $conn2_database;
+
+    protected $conn1;
+    protected $conn2;
+
     public function testGetInstance() {
         $this->assertTrue(Doctrine_Manager::getInstance() instanceOf Doctrine_Manager);
     }

diff --git a/tests/Record/FromArrayTestCase.php b/tests/Record/FromArrayTestCase.php
@@ -32,6 +32,8 @@
  */
 class Doctrine_Record_FromArray_TestCase extends Doctrine_UnitTestCase
 {
+    protected $previous_group;
+
     public function prepareTables()
     {
         parent::prepareTables();

diff --git a/tests/Record/SynchronizeTestCase.php b/tests/Record/SynchronizeTestCase.php
@@ -32,6 +32,8 @@
  */
 class Doctrine_Record_Synchronize_TestCase extends Doctrine_UnitTestCase
 {
+    private $previous_group;
+
     public function prepareTables()
     {
         parent::prepareTables();

diff --git a/tests/Search/FileTestCase.php b/tests/Search/FileTestCase.php
@@ -32,6 +32,8 @@
  */
 class Doctrine_Search_File_TestCase extends Doctrine_UnitTestCase
 {
+    protected $_search;
+
     public function prepareData()
     { }
     public function prepareTables()

diff --git a/tests/TableTestCase.php b/tests/TableTestCase.php
@@ -153,9 +153,9 @@ public function testGetData()
 
     public function testSetSequenceName()
     {
-        $this->objTable->sequenceName = 'test-seq';
+        $this->objTable->setOption('sequenceName', 'test-seq');
         $this->assertEqual($this->objTable->sequenceName, 'test-seq');
-        $this->objTable->sequenceName = null;
+        $this->objTable->setOption('sequenceName', null);
     }
 
     public function testCreate()

diff --git a/tests/Ticket/1106TestCase.php b/tests/Ticket/1106TestCase.php
@@ -32,6 +32,8 @@
  */
 class Doctrine_Ticket_1106_TestCase extends Doctrine_UnitTestCase
 {
+    protected $user_id;
+
     public function prepareTables()
     {
         parent::prepareTables();

diff --git a/tests/Ticket/1131TestCase.php b/tests/Ticket/1131TestCase.php
@@ -32,6 +32,8 @@
  */
 class Doctrine_Ticket_1131_TestCase extends Doctrine_UnitTestCase
 {
+    private $role_one, $role_two;
+
     public function prepareTables()
     {
         //$this->tables = array();

diff --git a/tests/Ticket/1436TestCase.php b/tests/Ticket/1436TestCase.php
@@ -32,6 +32,10 @@
  */
 class Doctrine_Ticket_1436_TestCase extends Doctrine_UnitTestCase
 {
+    protected $group_one;
+    protected $group_two;
+    protected $group_three;
+
     public function prepareTables()
     {
         parent::prepareTables();

diff --git a/tests/Ticket/1992TestCase.php b/tests/Ticket/1992TestCase.php
@@ -32,6 +32,10 @@
  */
 class Doctrine_Ticket_1992_TestCase extends Doctrine_UnitTestCase 
 {
+    protected $person;
+    protected $profile1;
+    protected $profile2;
+
     public function prepareTables()
     {
         $this->tables[] = 'Ticket_1992_Person';

diff --git a/tests/Ticket/2158TestCase.php b/tests/Ticket/2158TestCase.php
@@ -2,6 +2,8 @@
 
 class Doctrine_Ticket_2158_TestCase extends Doctrine_UnitTestCase
 {
+    protected $myModel;
+
     public function prepareTables()
     {
         $this->tables[] = "T2158_Model1";

diff --git a/tests/Ticket/982TestCase.php b/tests/Ticket/982TestCase.php
@@ -3,7 +3,10 @@
  * Test to ensure LocalKey Relations allow 0 for id value
  */
 class Doctrine_Ticket_982_TestCase extends Doctrine_UnitTestCase
-{    
+{
+    protected $myModelOne;
+    protected $myModelTwo;
+
     public function prepareTables()
     {
         $this->tables = array();
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,6 +20,7 @@ jobs: @@
                         - "7.4"
                         - "8.0"
                         - "8.1"
+                        - "8.2"
             steps:
                 - name: "Checkout"
@@ Expand Down @@