Merge pull request #107 from oroinc/pr99_master

Pr99 master
oroinc · Jul 1, 2024 · b681c1d · b681c1d
2 parents cf002e0 + 0e33201
commit b681c1d
Show file tree

Hide file tree

Showing 28 changed files with 152 additions and 351 deletions.
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ Add the following dependency to your composer.json:
 ```json
 {
     "require": {
-        "oro/doctrine-extensions": "^2.0"
+        "oro/doctrine-extensions": "^3.0"
     }
 }
 ```
@@ -240,7 +240,3 @@ This library also provides the following field types:
 
 * `MoneyType`
 * `PercentType`
-* `ObjectType`
-* `ArrayType`
-
-`ObjectType` and `ArrayType` use Base64 encoded strings to store values in the database instead of storing serialized strings. For backward compatibility the values that are already stored in the database will be unserialized without Base64 encoding. The new values will be Base64 encoded before saving to the database and Base64 decoded before unserialization.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,3 +1,10 @@
+# Upgrade to 3.0
+Version 3.0 requires PHP 8.1 or newer and works with Doctrine/ORM 3.0 or newer.
+
+The following types are no longer supported :
+* `ObjectType`
+* `ArrayType`
+
 # Upgrade to 2.0
 
 Version 2.0 requires PHP 7.3 or newer and works with Doctrine/ORM 2.6 or newer.

diff --git a/composer.json b/composer.json
@@ -13,17 +13,17 @@
     ],
     "require": {
         "php": ">=8.1",
-        "doctrine/lexer": "~1.0|~2.0",
-        "doctrine/orm": "~2.8",
-        "doctrine/dbal": "~2.10|~3.0"
+        "doctrine/lexer": "~3.0",
+        "doctrine/orm": "~3.0",
+        "doctrine/dbal": "~3.0|~4.0"
     },
     "require-dev": {
         "phpunit/phpunit": "~10",
         "doctrine/data-fixtures": "^1.3",
         "symfony/yaml": "5.*",
         "symfony/cache": "5.*",
-        "squizlabs/php_codesniffer": "3.5.*",
-        "doctrine/annotations": ">1.0, <2.0"
+        "squizlabs/php_codesniffer": "3.9.*",
+        "doctrine/annotations": "~2.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Oro/DBAL/Types/ArrayType.php b/src/Oro/DBAL/Types/ArrayType.php
diff --git a/src/Oro/DBAL/Types/MoneyType.php b/src/Oro/DBAL/Types/MoneyType.php
@@ -25,7 +25,7 @@ public function getName()
      * @noinspection PhpMissingReturnTypeInspection
      * @noinspection ReturnTypeCanBeDeclaredInspection
      */
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform)
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         $column['precision'] = self::TYPE_PRECISION;
         $column['scale']     = self::TYPE_SCALE;
@@ -38,7 +38,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform)
      * @noinspection PhpMissingParentCallCommonInspection
      * @noinspection PhpDocSignatureInspection
      */
-    public function convertToPHPValue($value, AbstractPlatform $platform)
+    public function convertToPHPValue($value, AbstractPlatform $platform): mixed
     {
         return $value;
     }

diff --git a/src/Oro/DBAL/Types/ObjectType.php b/src/Oro/DBAL/Types/ObjectType.php
diff --git a/src/Oro/DBAL/Types/PercentType.php b/src/Oro/DBAL/Types/PercentType.php
@@ -24,7 +24,7 @@ public function getName()
      * @noinspection PhpMissingReturnTypeInspection
      * @noinspection ReturnTypeCanBeDeclaredInspection
      */
-    public function getSQLDeclaration(array $column, AbstractPlatform $platform)
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
         return $platform->getFloatDeclarationSQL($column);
     }
@@ -35,7 +35,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform)
      * @noinspection ReturnTypeCanBeDeclaredInspection
      * @noinspection PhpDocSignatureInspection
      */
-    public function convertToPHPValue($value, AbstractPlatform $platform)
+    public function convertToPHPValue($value, AbstractPlatform $platform): mixed
     {
         return (null === $value) ? null : (double) $value;
     }

diff --git a/src/Oro/ORM/Query/AST/Functions/AbstractPlatformAwareFunctionNode.php b/src/Oro/ORM/Query/AST/Functions/AbstractPlatformAwareFunctionNode.php
@@ -16,7 +16,7 @@ abstract class AbstractPlatformAwareFunctionNode extends FunctionNode
      * @noinspection ReturnTypeCanBeDeclaredInspection
      * {@inheritdoc}
      */
-    public function getSql(SqlWalker $sqlWalker)
+    public function getSql(SqlWalker $sqlWalker): string
     {
         $function = FunctionFactory::create(
             $sqlWalker->getConnection()->getDatabasePlatform(),

diff --git a/src/Oro/ORM/Query/AST/Functions/Cast.php b/src/Oro/ORM/Query/AST/Functions/Cast.php
@@ -4,7 +4,7 @@
 namespace Oro\ORM\Query\AST\Functions;
 
 use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\TokenType;
 
 class Cast extends AbstractPlatformAwareFunctionNode
 {
@@ -33,32 +33,32 @@ class Cast extends AbstractPlatformAwareFunctionNode
     /**
      * {@inheritdoc}
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
-        $parser->match(Lexer::T_IDENTIFIER);
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
         $this->parameters[self::PARAMETER_KEY] = $parser->ArithmeticExpression();
 
-        $parser->match(Lexer::T_AS);
+        $parser->match(TokenType::T_AS);
 
-        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(TokenType::T_IDENTIFIER);
         $lexer = $parser->getLexer();
         $type = $lexer->token->value;
 
-        if ($lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
-            $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        if ($lexer->isNextToken(TokenType::T_OPEN_PARENTHESIS)) {
+            $parser->match(TokenType::T_OPEN_PARENTHESIS);
             $parameter = $parser->Literal();
             $parameters = [
                 $parameter->value
             ];
-            if ($lexer->isNextToken(Lexer::T_COMMA)) {
-                while ($lexer->isNextToken(Lexer::T_COMMA)) {
-                    $parser->match(Lexer::T_COMMA);
+            if ($lexer->isNextToken(TokenType::T_COMMA)) {
+                while ($lexer->isNextToken(TokenType::T_COMMA)) {
+                    $parser->match(TokenType::T_COMMA);
                     $parameter = $parser->Literal();
                     $parameters[] = $parameter->value;
                 }
             }
-            $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+            $parser->match(TokenType::T_CLOSE_PARENTHESIS);
             $type .= '(' . \implode(', ', $parameters) . ')';
         }
 
@@ -75,7 +75,7 @@ public function parse(Parser $parser)
 
         $this->parameters[self::TYPE_KEY] = $type;
 
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 
     protected function isSupportedType(string $type): bool

diff --git a/src/Oro/ORM/Query/AST/Functions/DateTime/ConvertTz.php b/src/Oro/ORM/Query/AST/Functions/DateTime/ConvertTz.php
@@ -4,7 +4,7 @@
 namespace Oro\ORM\Query\AST\Functions\DateTime;
 
 use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\TokenType;
 use Oro\ORM\Query\AST\Functions\AbstractPlatformAwareFunctionNode;
 
 class ConvertTz extends AbstractPlatformAwareFunctionNode
@@ -16,15 +16,15 @@ class ConvertTz extends AbstractPlatformAwareFunctionNode
     /**
      * {@inheritdoc}
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
-        $parser->match(Lexer::T_IDENTIFIER);
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
         $this->parameters[self::VALUE_KEY] = $parser->ArithmeticPrimary();
-        $parser->match(Lexer::T_COMMA);
+        $parser->match(TokenType::T_COMMA);
         $this->parameters[self::FROM_TZ_KEY] = $parser->ArithmeticPrimary();
-        $parser->match(Lexer::T_COMMA);
+        $parser->match(TokenType::T_COMMA);
         $this->parameters[self::TO_TZ_KEY] = $parser->ArithmeticPrimary();
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 }
diff --git a/src/Oro/ORM/Query/AST/Functions/Numeric/Pow.php b/src/Oro/ORM/Query/AST/Functions/Numeric/Pow.php
@@ -4,7 +4,7 @@
 namespace Oro\ORM\Query\AST\Functions\Numeric;
 
 use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\TokenType;
 use Oro\ORM\Query\AST\Functions\AbstractPlatformAwareFunctionNode;
 
 class Pow extends AbstractPlatformAwareFunctionNode
@@ -15,13 +15,13 @@ class Pow extends AbstractPlatformAwareFunctionNode
     /**
      * {@inheritdoc}
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
-        $parser->match(Lexer::T_IDENTIFIER);
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
         $this->parameters[self::VALUE_KEY] = $parser->SimpleArithmeticExpression();
-        $parser->match(Lexer::T_COMMA);
+        $parser->match(TokenType::T_COMMA);
         $this->parameters[self::POWER_KEY] = $parser->ArithmeticPrimary();
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 }
diff --git a/src/Oro/ORM/Query/AST/Functions/Numeric/Round.php b/src/Oro/ORM/Query/AST/Functions/Numeric/Round.php
@@ -4,7 +4,7 @@
 namespace Oro\ORM\Query\AST\Functions\Numeric;
 
 use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\TokenType;
 use Oro\ORM\Query\AST\Functions\AbstractPlatformAwareFunctionNode;
 
 class Round extends AbstractPlatformAwareFunctionNode
@@ -15,19 +15,19 @@ class Round extends AbstractPlatformAwareFunctionNode
     /**
      * {@inheritdoc}
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
         $lexer = $parser->getLexer();
-        $parser->match(Lexer::T_IDENTIFIER);
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
         $this->parameters[self::VALUE] = $parser->SimpleArithmeticExpression();
 
         // parse second parameter if available
-        if (Lexer::T_COMMA === $lexer->lookahead['type']) {
-            $parser->match(Lexer::T_COMMA);
+        if (TokenType::T_COMMA === $lexer->lookahead->type) {
+            $parser->match(TokenType::T_COMMA);
             $this->parameters[self::PRECISION] = $parser->ArithmeticPrimary();
         }
 
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 }
diff --git a/src/Oro/ORM/Query/AST/Functions/Numeric/Sign.php b/src/Oro/ORM/Query/AST/Functions/Numeric/Sign.php
@@ -4,7 +4,7 @@
 namespace Oro\ORM\Query\AST\Functions\Numeric;
 
 use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\TokenType;
 use Oro\ORM\Query\AST\Functions\AbstractPlatformAwareFunctionNode;
 
 class Sign extends AbstractPlatformAwareFunctionNode
@@ -14,11 +14,11 @@ class Sign extends AbstractPlatformAwareFunctionNode
     /**
      * {@inheritdoc}
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
-        $parser->match(Lexer::T_IDENTIFIER);
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
         $this->parameters[self::PARAMETER_KEY] = $parser->SimpleArithmeticExpression();
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 }
diff --git a/src/Oro/ORM/Query/AST/Functions/Numeric/TimestampDiff.php b/src/Oro/ORM/Query/AST/Functions/Numeric/TimestampDiff.php
@@ -4,7 +4,7 @@
 namespace Oro\ORM\Query\AST\Functions\Numeric;
 
 use Doctrine\ORM\Query\Parser;
-use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\TokenType;
 use Oro\ORM\Query\AST\Functions\AbstractPlatformAwareFunctionNode;
 
 class TimestampDiff extends AbstractPlatformAwareFunctionNode
@@ -31,14 +31,14 @@ class TimestampDiff extends AbstractPlatformAwareFunctionNode
     /**
      * {@inheritdoc}
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
-        $parser->match(Lexer::T_IDENTIFIER);
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
-        $parser->match(Lexer::T_IDENTIFIER);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
 
         $lexer = $parser->getLexer();
-        $unit = strtoupper(trim($lexer->token['value']));
+        $unit = strtoupper(trim($lexer->token->value));
         if (!$this->isSupportedUnit($unit)) {
             $parser->syntaxError(
                 \sprintf(
@@ -51,11 +51,11 @@ public function parse(Parser $parser)
         }
 
         $this->parameters[self::UNIT_KEY] = $unit;
-        $parser->match(Lexer::T_COMMA);
+        $parser->match(TokenType::T_COMMA);
         $this->parameters[self::VAL1_KEY] = $parser->ArithmeticPrimary();
-        $parser->match(Lexer::T_COMMA);
+        $parser->match(TokenType::T_COMMA);
         $this->parameters[self::VAL2_KEY] = $parser->ArithmeticPrimary();
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 
     protected function isSupportedUnit(string $unit): bool