php 8.2 compatibility fixes

.github/workflows/tests.yml

@@ -13,14 +13,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
-        include:
-          - php: '8.2'
-            allow-failure: true
+        php: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2']
 
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP ${{ matrix.php }}
         uses: shivammathur/setup-php@v2

CHANGELOG.md

@@ -1,3 +1,7 @@
+1.3.4 (2022-10-17)
+- php 8.2 compatibility fixes [#12](https://github.com/ovos/doctrine1/pull/12)
+- php 8.1 compatibility fixes [#11](https://github.com/ovos/doctrine1/pull/11)
+
 1.3.3 (2022-10-04)
 ------------------
 - php 8.0 compatibility fixes [#8](https://github.com/ovos/doctrine1/pull/8)

README.md

@@ -3,7 +3,7 @@ Doctrine 1
 
 [![Build Status](https://travis-ci.com/ovos/doctrine1.svg?branch=master)](https://travis-ci.com/ovos/doctrine1)
 
-This is a fork of [doctrine/doctrine1](https://github.com/doctrine/doctrine1), adjusted for compatibility with php 5.3-8.0
+This is a fork of [doctrine/doctrine1](https://github.com/doctrine/doctrine1), adjusted for compatibility with php 5.3-8.2
 and mysql 5.7 and 8.0. Tested only with mysql.
 
 It will be maintained as long as we are using it.

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "ovos/doctrine1",
     "type": "library",
-    "description": "PHP 5 Doctrine1 Object Relational Mapper (ORM)",
+    "description": "Doctrine v1, Database ORM, PHP 5.3-8.2 compatible",
     "keywords": [
         "php",
         "doctrine1",

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));
     }
 
     /**

lib/Doctrine/Connection.php

@@ -1255,7 +1255,6 @@ public function clear()
     public function evictTables()
     {
         $this->tables = array();
-        $this->exported = array();
     }
 
     /**

lib/Doctrine/Hydrator/Graph.php

@@ -36,6 +36,7 @@
 abstract class Doctrine_Hydrator_Graph extends Doctrine_Hydrator_Abstract
 {
     protected $_tables = array();
+    protected $_rootAlias;
 
     /**
      * Gets the custom field used for indexing for the specified component alias.

lib/Doctrine/Import/Builder.php

@@ -87,6 +87,11 @@ class Doctrine_Import_Builder extends Doctrine_Builder
      */
     protected $_generateTableClasses = false;
 
+    /**
+     * @var boolean
+     */
+    protected $_generateAccessors = false;
+
     /**
      * Prefix to use for generated base classes
      *

lib/Doctrine/Query.php

@@ -168,11 +168,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
      */

lib/Doctrine/Query/Abstract.php

@@ -279,6 +279,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
      *

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();
     }
 

lib/Doctrine/Sequence.php

@@ -33,6 +33,11 @@
  */
 class Doctrine_Sequence extends Doctrine_Connection_Module
 {
+    /**
+     * @var array
+     */
+    protected $warnings = array();
+
     /**
      * Returns the next free id of a sequence
      *

lib/Doctrine/Task/BuildAll.php

@@ -38,7 +38,12 @@ class Doctrine_Task_BuildAll extends Doctrine_Task
 
     protected $models,
               $tables;
-
+
+    /**
+     * @var Doctrine_Task_CreateDb
+     */
+    protected $createDb;
+
     public function __construct($dispatcher = null)
     {
         parent::__construct($dispatcher);

lib/Doctrine/Task/BuildAllLoad.php

@@ -35,7 +35,17 @@ class Doctrine_Task_BuildAllLoad extends Doctrine_Task
     public $description          =   'Calls build-all, and load-data',
            $requiredArguments    =   array(),
            $optionalArguments    =   array();
-
+
+    /**
+     * @var Doctrine_Task_BuildAll
+     */
+    protected $buildAll;
+
+    /**
+     * @var Doctrine_Task_LoadData
+     */
+    protected $loadData;
+
     public function __construct($dispatcher = null)
     {
         parent::__construct($dispatcher);

lib/Doctrine/Task/BuildAllReload.php

@@ -35,7 +35,17 @@ class Doctrine_Task_BuildAllReload extends Doctrine_Task
     public $description          =   'Calls rebuild-db and load-data',
            $requiredArguments    =   array(),
            $optionalArguments    =   array();
-
+
+    /**
+     * @var Doctrine_Task_RebuildDb
+     */
+    protected $rebuildDb;
+
+    /**
+     * @var Doctrine_Task_LoadData
+     */
+    protected $loadData;
+
     public function __construct($dispatcher = null)
     {
         parent::__construct($dispatcher);

lib/Doctrine/Task/RebuildDb.php

@@ -35,7 +35,22 @@ class Doctrine_Task_RebuildDb extends Doctrine_Task
     public $description          =   'Drops and re-creates databases',
            $requiredArguments    =   array(),
            $optionalArguments    =   array();
-
+
+    /**
+     * @var Doctrine_Task_DropDb
+     */
+    protected $dropDb;
+
+    /**
+     * @var Doctrine_Task_CreateDb
+     */
+    protected $createDb;
+
+    /**
+     * @var Doctrine_Task_CreateTables
+     */
+    protected $createTables;
+
     public function __construct($dispatcher = null)
     {
         parent::__construct($dispatcher);

tests/AuditLogTestCase.php

@@ -32,6 +32,10 @@
  */
 class Doctrine_AuditLog_TestCase extends Doctrine_UnitTestCase
 {
+    /**
+     * @var Doctrine_Connection_Profiler
+     */
+    private $profiler;
 
     public function prepareData()
     { }

tests/Cache/DbTestCase.php

@@ -33,6 +33,11 @@
  */
 class Doctrine_Cache_Db_TestCase extends Doctrine_Cache_Abstract_TestCase
 {
+    /**
+     * @var Doctrine_Cache_Db
+     */
+    private $cache;
+
     public function setUp()
     {
         parent::setUp();

tests/Connection/CustomTestCase.php

@@ -32,6 +32,16 @@
  */
 class Doctrine_Connection_Custom_TestCase extends Doctrine_UnitTestCase 
 {
+    /**
+     * @var Doctrine_Connection
+     */
+    protected $_conn;
+
+    /**
+     * @var Doctrine_Adapter_Interface
+     */
+    protected $_dbh;
+
     public function setUp()
     {
         $manager = Doctrine_Manager::getInstance();

tests/Connection/ProfilerTestCase.php

@@ -33,6 +33,11 @@
  */
 class Doctrine_Connection_Profiler_TestCase extends Doctrine_UnitTestCase 
 {
+    /**
+     * @var Doctrine_Connection_Profiler
+     */
+    private $profiler;
+
     public function prepareTables()
     {}
     public function prepareData() 

tests/Db/ProfilerTestCase.php

@@ -33,6 +33,11 @@
  */
 class Doctrine_Connection_Profiler_TestCase extends Doctrine_UnitTestCase 
 {
+    /**
+     * @var Doctrine_Connection_Profiler
+     */
+    protected $profiler;
+
     public function prepareTables()
     {}
     public function prepareData() 

tests/DoctrineTest/Doctrine_UnitTestCase.php

@@ -54,9 +54,13 @@ class Doctrine_UnitTestCase extends UnitTestCase
     protected $transaction;
     protected $_name;
 
-
     protected $init = false;
 
+    protected $query;
+    protected $exc;
+    protected $sequence;
+    protected $import;
+
     public function getName()
     {
         return $this->_name;

tests/DoctrineTest/GroupTest.php

@@ -5,6 +5,7 @@ class GroupTest extends UnitTestCase
     protected $_name;
     protected $_title;
     protected $_onlyRunFailed = false;
+    protected $_formatter;
 
     public function __construct($title, $name)
     {

tests/ManagerTestCase.php

@@ -31,6 +31,26 @@
  * @version     $Revision$
  */
 class Doctrine_Manager_TestCase extends Doctrine_UnitTestCase {
+    /**
+     * @var string
+     */
+    protected $conn1_database;
+
+    /**
+     * @var string
+     */
+    protected $conn2_database;
+
+    /**
+     * @var Doctrine_Connection
+     */
+    protected $conn1;
+
+    /**
+     * @var Doctrine_Connection
+     */
+    protected $conn2;
+
     public function testGetInstance() {
         $this->assertTrue(Doctrine_Manager::getInstance() instanceOf Doctrine_Manager);
     }

tests/Record/FromArrayTestCase.php

@@ -32,6 +32,8 @@
  */
 class Doctrine_Record_FromArray_TestCase extends Doctrine_UnitTestCase
 {
+    private $previous_group;
+
     public function prepareTables()
     {
         parent::prepareTables();

tests/Record/SynchronizeTestCase.php

@@ -32,6 +32,8 @@
  */
 class Doctrine_Record_Synchronize_TestCase extends Doctrine_UnitTestCase
 {
+    private $previous_group;
+
     public function prepareTables()
     {
         parent::prepareTables();

tests/Relation/OrderByTestCase.php

@@ -32,6 +32,11 @@
  */
 class Doctrine_Relation_OrderBy_TestCase extends Doctrine_UnitTestCase 
 {
+    /**
+     * @var Doctrine_Connection_Profiler
+     */
+    private $profiler;
+
     public function prepareTables()
     {
         $this->profiler = new Doctrine_Connection_Profiler();

tests/Search/FileTestCase.php

@@ -32,6 +32,11 @@
  */
 class Doctrine_Search_File_TestCase extends Doctrine_UnitTestCase
 {
+    /**
+     * @var Doctrine_Search_File
+     */
+    private $_search;
+
     public function prepareData()
     { }
     public function prepareTables()

tests/TableTestCase.php

@@ -142,9 +142,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() 

tests/Ticket/1106TestCase.php

@@ -32,6 +32,8 @@
  */
 class Doctrine_Ticket_1106_TestCase extends Doctrine_UnitTestCase
 {
+    private $user_id;
+
     public function prepareTables()
     {
         parent::prepareTables();

tests/Ticket/1131TestCase.php

@@ -32,6 +32,9 @@
  */
 class Doctrine_Ticket_1131_TestCase extends Doctrine_UnitTestCase
 {
+    private $role_one;
+    private $role_two;
+
     public function prepareTables()
     {
         //$this->tables = array();

tests/Ticket/1436TestCase.php

@@ -32,6 +32,10 @@
  */
 class Doctrine_Ticket_1436_TestCase extends Doctrine_UnitTestCase
 {
+    private $group_one;
+    private $group_two;
+    private $group_three;
+
     public function prepareTables()
     {
         parent::prepareTables();