Merge pull request #380 from maikelohcfg/php8-patch

php 8.0 return types compatible
beberlei · Jun 21, 2022 · f3536d8 · f3536d8
2 parents 3d6abcb + b5d6a31
commit f3536d8
Show file tree

Hide file tree

Showing 175 changed files with 341 additions and 335 deletions.
diff --git a/src/Query/Mysql/Acos.php b/src/Query/Mysql/Acos.php
@@ -9,14 +9,14 @@ class Acos extends FunctionNode
 {
     public $arithmeticExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'ACOS(' . $sqlWalker->walkSimpleArithmeticExpression(
             $this->arithmeticExpression
         ) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/AddTime.php b/src/Query/Mysql/AddTime.php
@@ -14,12 +14,12 @@ class AddTime extends FunctionNode
 
     public $time;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'ADDTIME(' . $sqlWalker->walkArithmeticPrimary($this->date) . ', ' . $sqlWalker->walkArithmeticPrimary($this->time) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/AesDecrypt.php b/src/Query/Mysql/AesDecrypt.php
@@ -11,7 +11,7 @@ class AesDecrypt extends FunctionNode
 
     public $key = '';
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +21,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser)
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return sprintf(
             'AES_DECRYPT(%s, %s)',

diff --git a/src/Query/Mysql/AesEncrypt.php b/src/Query/Mysql/AesEncrypt.php
@@ -11,7 +11,7 @@ class AesEncrypt extends FunctionNode
 
     public $key = '';
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +21,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser)
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return sprintf(
             'AES_ENCRYPT(%s, %s)',

diff --git a/src/Query/Mysql/AnyValue.php b/src/Query/Mysql/AnyValue.php
@@ -9,15 +9,15 @@ class AnyValue extends FunctionNode
 {
     public $value;
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
         $this->value = $parser->StringPrimary();
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return sprintf(
             'ANY_VALUE(%s)',

diff --git a/src/Query/Mysql/Ascii.php b/src/Query/Mysql/Ascii.php
@@ -9,12 +9,12 @@ class Ascii extends FunctionNode
 {
     private $string;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'ASCII('.$sqlWalker->walkArithmeticPrimary($this->string).')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Asin.php b/src/Query/Mysql/Asin.php
@@ -9,14 +9,14 @@ class Asin extends FunctionNode
 {
     public $arithmeticExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'ASIN(' . $sqlWalker->walkSimpleArithmeticExpression(
             $this->arithmeticExpression
         ) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Atan.php b/src/Query/Mysql/Atan.php
@@ -12,7 +12,7 @@ class Atan extends FunctionNode
 
     public $optionalSecondExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         $secondArgument = '';
 
@@ -28,7 +28,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
         . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Atan2.php b/src/Query/Mysql/Atan2.php
@@ -11,7 +11,7 @@ class Atan2 extends FunctionNode
 
     public $secondExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         $firstArgument = $sqlWalker->walkSimpleArithmeticExpression(
             $this->firstExpression
@@ -24,7 +24,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
         return 'ATAN2(' . $firstArgument . ', ' . $secondArgument . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Binary.php b/src/Query/Mysql/Binary.php
@@ -12,7 +12,7 @@ class Binary extends FunctionNode
 {
     private $stringPrimary;
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -22,7 +22,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser)
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'BINARY('.$sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary).')';
     }

diff --git a/src/Query/Mysql/BitCount.php b/src/Query/Mysql/BitCount.php
@@ -9,15 +9,15 @@ class BitCount extends FunctionNode
 {
     public $arithmeticExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'BIT_COUNT(' . $sqlWalker->walkSimpleArithmeticExpression(
             $this->arithmeticExpression
         )
         . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/BitXor.php b/src/Query/Mysql/BitXor.php
@@ -14,14 +14,14 @@ class BitXor extends FunctionNode
 
     public $secondArithmetic;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return $this->firstArithmetic->dispatch($sqlWalker)
             . ' ^ '
             . $this->secondArithmetic->dispatch($sqlWalker);
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Cast.php b/src/Query/Mysql/Cast.php
@@ -30,7 +30,7 @@ class Cast extends FunctionNode
      *
      * @throws QueryException
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -70,7 +70,7 @@ public function parse(Parser $parser)
      *
      * @return string
      */
-    public function getSql(SqlWalker $sqlWalker)
+    public function getSql(SqlWalker $sqlWalker): string
     {
         return sprintf(
             'CAST(%s AS %s)',

diff --git a/src/Query/Mysql/Ceil.php b/src/Query/Mysql/Ceil.php
@@ -9,12 +9,12 @@ class Ceil extends FunctionNode
 {
     private $arithmeticExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'CEIL(' . $sqlWalker->walkSimpleArithmeticExpression($this->arithmeticExpression) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/CharLength.php b/src/Query/Mysql/CharLength.php
@@ -12,12 +12,12 @@ class CharLength extends FunctionNode
 {
     private $expr;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'CHAR_LENGTH('.$sqlWalker->walkArithmeticPrimary($this->expr1).')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Collate.php b/src/Query/Mysql/Collate.php
@@ -24,7 +24,7 @@ class Collate extends FunctionNode
     /**
      * @param \Doctrine\ORM\Query\Parser $parser
      */
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -45,7 +45,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser)
      * @param \Doctrine\ORM\Query\SqlWalker $sqlWalker
      * @return string
      */
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return sprintf('%s COLLATE %s', $sqlWalker->walkStringPrimary($this->stringPrimary), $this->collation);
     }

diff --git a/src/Query/Mysql/ConcatWs.php b/src/Query/Mysql/ConcatWs.php
@@ -14,7 +14,7 @@ class ConcatWs extends FunctionNode
 
     private $notEmpty = false;
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -53,7 +53,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser)
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         // Create an array to hold the query elements.
         $queryBuilder = ['CONCAT_WS('];

diff --git a/src/Query/Mysql/ConvertTz.php b/src/Query/Mysql/ConvertTz.php
@@ -21,7 +21,7 @@ class ConvertTz extends FunctionNode
     /**
      * @inheritdoc
      */
-    public function getSql(SqlWalker $sqlWalker)
+    public function getSql(SqlWalker $sqlWalker): string
     {
         return sprintf(
             'CONVERT_TZ(%s, %s, %s)',
@@ -34,7 +34,7 @@ public function getSql(SqlWalker $sqlWalker)
     /**
      * @inheritdoc
      */
-    public function parse(Parser $parser)
+    public function parse(Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Cos.php b/src/Query/Mysql/Cos.php
@@ -9,14 +9,14 @@ class Cos extends FunctionNode
 {
     public $arithmeticExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'COS(' . $sqlWalker->walkSimpleArithmeticExpression(
             $this->arithmeticExpression
         ) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Cot.php b/src/Query/Mysql/Cot.php
@@ -9,14 +9,14 @@ class Cot extends FunctionNode
 {
     public $arithmeticExpression;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'COT(' . $sqlWalker->walkSimpleArithmeticExpression(
             $this->arithmeticExpression
         ) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/CountIf.php b/src/Query/Mysql/CountIf.php
@@ -16,7 +16,7 @@ class CountIf extends FunctionNode
 
     private $inverse = false;
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -43,7 +43,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser)
         $parser->match(Lexer::T_CLOSE_PARENTHESIS);
     }
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return sprintf(
             'COUNT(CASE %s WHEN %s THEN %s END)',

diff --git a/src/Query/Mysql/Crc32.php b/src/Query/Mysql/Crc32.php
@@ -12,14 +12,14 @@ class Crc32 extends FunctionNode
 {
     public $stringPrimary;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'CRC32(' .
             $sqlWalker->walkStringPrimary($this->stringPrimary) .
         ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);

diff --git a/src/Query/Mysql/Date.php b/src/Query/Mysql/Date.php
@@ -12,12 +12,12 @@ class Date extends FunctionNode
 {
     public $date;
 
-    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
+    public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
     {
         return 'DATE(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
     }
 
-    public function parse(\Doctrine\ORM\Query\Parser $parser)
+    public function parse(\Doctrine\ORM\Query\Parser $parser): void
     {
         $parser->match(Lexer::T_IDENTIFIER);
         $parser->match(Lexer::T_OPEN_PARENTHESIS);