Add PHP 8.2 compatibility

Author: javer

.github/workflows/tests.yml

@@ -16,6 +16,7 @@ jobs:
  - 7.4
  - 8.0
  - 8.1
+ - 8.2
 
  steps:
  - uses: actions/checkout@v2
@@ -39,3 +40,4 @@ jobs:
  - run: composer run test
 
  - run: composer run lint -- --dry-run
+ if: ${{ matrix.php <= '8.0' }}

composer.json

@@ -13,6 +13,7 @@
  "doctrine/orm": "^2.7"
  },
  "require-dev": {
+ "doctrine/cache": "^1.11",
  "friendsofphp/php-cs-fixer": "^2.14",
  "nesbot/carbon": "*",
  "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",

src/Query/Mysql/CharLength.php

@@ -10,7 +10,7 @@
  */
 class CharLength extends FunctionNode
 {
- private $expr;
+ private $expr1;
 
  public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
  {

src/Query/Mysql/Power.php

@@ -9,6 +9,8 @@ class Power extends FunctionNode
 {
  public $arithmeticExpression;
 
+ public $power;
+
  public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
  {
  return 'POWER(' . $this->arithmeticExpression->dispatch($sqlWalker) . ', '

src/Query/Sqlite/ConcatWs.php

@@ -63,7 +63,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
  // Iterate over the captured expressions and add them to the query.
  for ($i = 1; $i < count($this->values); $i++) {
  if ($i > 1) {
- $queryBuilder[] = " || '${separator}' || ";
+ $queryBuilder[] = " || '{$separator}' || ";
  }
 
  // Dispatch the walker on the current node.

tests/Entities/CarbonDate.php

@@ -33,4 +33,24 @@ class CarbonDate
  * @Column(type="CarbonTime", nullable=true)
  */
  public $time;
+
+ /**
+ * @Column(type="CarbonImmutableDate", nullable=true)
+ */
+ public $date_immutable;
+
+ /**
+ * @Column(type="CarbonImmutableDateTime", nullable=true)
+ */
+ public $datetime_immutable;
+
+ /**
+ * @Column(type="CarbonImmutableDateTimeTz", nullable=true)
+ */
+ public $datetime_tz_immutable;
+
+ /**
+ * @Column(type="CarbonImmutableTime", nullable=true)
+ */
+ public $time_immutable;
 }

tests/Query/Mysql/TrigTest.php

@@ -4,6 +4,8 @@
 
 class TrigTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
 {
+ private $entity;
+
  public function setUp(): void
  {
  parent::setUp();

tests/Types/CarbonDateTest.php

@@ -16,7 +16,7 @@
  */
 class CarbonDateTest extends TestCase
 {
- public $entityManager = null;
+ private $em;
 
  public static function setUpBeforeClass(): void
  {

tests/Types/ZendDateTest.php

@@ -12,7 +12,7 @@
  */
 class ZendDateTest extends TestCase
 {
- public $entityManager = null;
+ private $em;
 
  public static function setUpBeforeClass(): void
  {