diff --git a/.gitattributes b/.gitattributes
index d26dd985..7fae8139 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,7 +5,7 @@
/tests export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
-/.php_cs export-ignore
/.travis.yml export-ignore
/Makefile export-ignore
+/phpcs.xml.dist export-ignore
/phpunit.xml.dist export-ignore
diff --git a/.github/workflows/coding-standards.yml b/.github/workflows/coding-standards.yml
new file mode 100644
index 00000000..02e836b4
--- /dev/null
+++ b/.github/workflows/coding-standards.yml
@@ -0,0 +1,27 @@
+name: "Coding Standards"
+
+on:
+ pull_request:
+ branches:
+ - "master"
+ paths:
+ - .github/workflows/coding-standards.yml
+ - bin/**
+ - composer.*
+ - src/**
+ - phpcs.xml.dist
+ - tests/**
+ push:
+ branches:
+ - "master"
+ paths:
+ - .github/workflows/coding-standards.yml
+ - bin/**
+ - composer.*
+ - src/**
+ - phpcs.xml.dist
+ - tests/**
+
+jobs:
+ coding-standards:
+ uses: "doctrine/.github/.github/workflows/coding-standards.yml@4.0.0"
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index ff84ddde..a2a27168 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -39,6 +39,3 @@ jobs:
run: composer install --prefer-dist --no-progress --no-suggest
- run: composer run test
-
- - run: composer run lint -- --dry-run
- if: ${{ matrix.php <= '8.0' }}
diff --git a/.gitignore b/.gitignore
index f163a4c9..8f86d402 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.phpcs-cache
.phpunit.result.cache
/composer.lock
/tests/phpunit.xml
diff --git a/.php_cs b/.php_cs
deleted file mode 100644
index 29d497ae..00000000
--- a/.php_cs
+++ /dev/null
@@ -1,95 +0,0 @@
-notPath('vendor')
- ->in(__DIR__)
- ->name('*.php')
- ->ignoreDotFiles(true)
- ->ignoreVCS(true);
-;
-
-$config = PhpCsFixer\Config::create()
- ->setFinder($finder)
- ->setRiskyAllowed(true)
- ->setRules([
- '@PSR1' => true,
- '@PSR2' => true,
- 'align_multiline_comment' => true,
- 'array_syntax' => ['syntax' => 'short'],
- 'blank_line_after_opening_tag' => true,
- 'blank_line_before_return' => true,
- 'blank_line_before_statement' => true,
- 'cast_spaces' => true,
- 'class_attributes_separation' => true,
- 'combine_consecutive_issets' => true,
- 'combine_consecutive_unsets' => true,
- 'comment_to_phpdoc' => true,
- 'compact_nullable_typehint' => true,
- 'explicit_indirect_variable' => true,
- 'explicit_string_variable' => true,
- 'fully_qualified_strict_types' => true,
- 'function_typehint_space' => true,
- 'general_phpdoc_annotation_remove' => ['category', 'license'],
- 'hash_to_slash_comment' => true,
- 'heredoc_to_nowdoc' => true,
- 'include' => true,
- 'lowercase_cast' => true,
- 'method_chaining_indentation' => true,
- 'multiline_comment_opening_closing' => true,
- 'native_function_casing' => true,
- 'new_with_braces' => true,
- 'no_alias_functions' => true,
- 'no_alternative_syntax' => true,
- 'no_blank_lines_after_class_opening' => true,
- 'no_blank_lines_after_phpdoc' => true,
- 'no_empty_phpdoc' => true,
- 'no_extra_blank_lines' => ['tokens' => ['break', 'continue', 'throw', 'use']],
- 'no_extra_consecutive_blank_lines' => true,
- 'no_leading_import_slash' => true,
- 'no_leading_namespace_whitespace' => true,
- 'no_multiline_whitespace_around_double_arrow' => true,
- 'no_multiline_whitespace_before_semicolons' => true,
- 'no_short_bool_cast' => true,
- 'no_short_echo_tag' => true,
- 'no_singleline_whitespace_before_semicolons' => true,
- 'no_superfluous_elseif' => true,
- 'no_trailing_comma_in_list_call' => true,
- 'no_trailing_comma_in_singleline_array' => true,
- 'no_unneeded_control_parentheses' => true,
- 'no_unneeded_curly_braces' => true,
- 'no_unneeded_final_method' => true,
- 'no_unreachable_default_argument_value' => true,
- 'no_unused_imports' => true,
- 'no_useless_else' => true,
- 'no_useless_return' => true,
- 'no_whitespace_before_comma_in_array' => true,
- 'object_operator_without_whitespace' => true,
- 'ordered_class_elements' => true,
- 'ordered_imports' => true,
- 'phpdoc_annotation_without_dot' => true,
- 'phpdoc_indent' => true,
- 'phpdoc_no_empty_return' => true,
- 'phpdoc_no_package' => true,
- 'phpdoc_order' => true,
- 'phpdoc_scalar' => true,
- 'phpdoc_trim' => true,
- 'phpdoc_types' => true,
- 'phpdoc_var_without_name' => true,
- 'psr4' => true,
- 'self_accessor' => true,
- 'semicolon_after_instruction' => true,
- 'short_scalar_cast' => true,
- 'simplified_null_return' => true,
- 'single_blank_line_before_namespace' => true,
- 'single_quote' => true,
- 'space_after_semicolon' => true,
- 'standardize_not_equals' => true,
- 'string_line_ending' => true,
- 'ternary_operator_spaces' => true,
- 'trailing_comma_in_multiline_array' => true,
- 'unary_operator_spaces' => true,
- 'whitespace_after_comma_in_array' => true,
- ])
-;
-
-return $config;
diff --git a/composer.json b/composer.json
index c74a3fd9..4d7780d6 100644
--- a/composer.json
+++ b/composer.json
@@ -14,9 +14,10 @@
},
"require-dev": {
"doctrine/cache": "^1.11",
- "friendsofphp/php-cs-fixer": "^2.14",
+ "doctrine/coding-standard": "^9.0.2 || ^12.0",
"nesbot/carbon": "*",
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
+ "squizlabs/php_codesniffer": "^3.8",
"symfony/yaml": "^4.4 || ^5.3 || ^6.0",
"zf1/zend-date": "^1.12",
"zf1/zend-registry": "^1.12"
@@ -28,10 +29,12 @@
"psr-4": {"DoctrineExtensions\\Tests\\": "tests/"}
},
"config": {
- "sort-packages": true
+ "sort-packages": true,
+ "allow-plugins": {
+ "dealerdirect/phpcodesniffer-composer-installer": true
+ }
},
"scripts": {
- "lint": "php-cs-fixer fix --ansi --diff --diff-format udiff --show-progress=none --verbose",
"test": "phpunit --colors=always"
}
}
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
new file mode 100644
index 00000000..560e2b53
--- /dev/null
+++ b/phpcs.xml.dist
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ src
+ tests
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/Query/Mysql/Acos.php b/src/Query/Mysql/Acos.php
index 4e2f71b6..46a5b795 100644
--- a/src/Query/Mysql/Acos.php
+++ b/src/Query/Mysql/Acos.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Acos extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'ACOS(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 30a16cb0..37d9a037 100644
--- a/src/Query/Mysql/AddTime.php
+++ b/src/Query/Mysql/AddTime.php
@@ -4,22 +4,22 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Pascal Wacker
- */
+/** @author Pascal Wacker */
class AddTime extends FunctionNode
{
public $date;
public $time;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'ADDTIME(' . $sqlWalker->walkArithmeticPrimary($this->date) . ', ' . $sqlWalker->walkArithmeticPrimary($this->time) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 0c52242e..2ae70124 100644
--- a/src/Query/Mysql/AesDecrypt.php
+++ b/src/Query/Mysql/AesDecrypt.php
@@ -4,6 +4,10 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class AesDecrypt extends FunctionNode
{
@@ -11,7 +15,7 @@ class AesDecrypt extends FunctionNode
public $key = '';
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +25,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'AES_DECRYPT(%s, %s)',
diff --git a/src/Query/Mysql/AesEncrypt.php b/src/Query/Mysql/AesEncrypt.php
index 804a627d..7bef1ca2 100644
--- a/src/Query/Mysql/AesEncrypt.php
+++ b/src/Query/Mysql/AesEncrypt.php
@@ -4,6 +4,10 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class AesEncrypt extends FunctionNode
{
@@ -11,7 +15,7 @@ class AesEncrypt extends FunctionNode
public $key = '';
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +25,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'AES_ENCRYPT(%s, %s)',
diff --git a/src/Query/Mysql/AnyValue.php b/src/Query/Mysql/AnyValue.php
index c7db908f..faffd93f 100644
--- a/src/Query/Mysql/AnyValue.php
+++ b/src/Query/Mysql/AnyValue.php
@@ -4,12 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class AnyValue extends FunctionNode
{
public $value;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -17,7 +21,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'ANY_VALUE(%s)',
diff --git a/src/Query/Mysql/Ascii.php b/src/Query/Mysql/Ascii.php
index 28893478..85ff4a84 100644
--- a/src/Query/Mysql/Ascii.php
+++ b/src/Query/Mysql/Ascii.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Ascii extends FunctionNode
{
private $string;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'ASCII('.$sqlWalker->walkArithmeticPrimary($this->string).')';
+ return 'ASCII(' . $sqlWalker->walkArithmeticPrimary($this->string) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index c2d29684..f168ceb5 100644
--- a/src/Query/Mysql/Asin.php
+++ b/src/Query/Mysql/Asin.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Asin extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'ASIN(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 866e3737..508f3d01 100644
--- a/src/Query/Mysql/Atan.php
+++ b/src/Query/Mysql/Atan.php
@@ -4,7 +4,9 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\QueryException;
+use Doctrine\ORM\Query\SqlWalker;
class Atan extends FunctionNode
{
@@ -12,7 +14,7 @@ class Atan extends FunctionNode
public $optionalSecondExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$secondArgument = '';
@@ -24,11 +26,11 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
return 'ATAN(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
- ) . (($secondArgument) ? ', ' . $secondArgument : '')
+ ) . ($secondArgument ? ', ' . $secondArgument : '')
. ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 70b2de98..50e7fa71 100644
--- a/src/Query/Mysql/Atan2.php
+++ b/src/Query/Mysql/Atan2.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Atan2 extends FunctionNode
{
@@ -11,7 +13,7 @@ class Atan2 extends FunctionNode
public $secondExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$firstArgument = $sqlWalker->walkSimpleArithmeticExpression(
$this->firstExpression
@@ -24,7 +26,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
return 'ATAN2(' . $firstArgument . ', ' . $secondArgument . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 23bdfc47..8d9db224 100644
--- a/src/Query/Mysql/Binary.php
+++ b/src/Query/Mysql/Binary.php
@@ -4,15 +4,15 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Sarjono Mukti Aji
- */
+/** @author Sarjono Mukti Aji */
class Binary extends FunctionNode
{
private $stringPrimary;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -22,8 +22,8 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'BINARY('.$sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary).')';
+ return 'BINARY(' . $sqlWalker->walkSimpleArithmeticExpression($this->stringPrimary) . ')';
}
}
diff --git a/src/Query/Mysql/BitCount.php b/src/Query/Mysql/BitCount.php
index 9042b810..4e02d1e0 100644
--- a/src/Query/Mysql/BitCount.php
+++ b/src/Query/Mysql/BitCount.php
@@ -4,12 +4,14 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class BitCount extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'BIT_COUNT(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
@@ -17,7 +19,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
. ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 211b5e32..3d6a5c1e 100644
--- a/src/Query/Mysql/BitXor.php
+++ b/src/Query/Mysql/BitXor.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
* "BIT_XOR" "(" ArithmeticPrimary "," ArithmeticPrimary ")"
@@ -14,14 +16,14 @@ class BitXor extends FunctionNode
public $secondArithmetic;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return $this->firstArithmetic->dispatch($sqlWalker)
. ' ^ '
. $this->secondArithmetic->dispatch($sqlWalker);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 974013ce..a54d86df 100644
--- a/src/Query/Mysql/Cast.php
+++ b/src/Query/Mysql/Cast.php
@@ -10,12 +10,16 @@
use Doctrine\ORM\Query\QueryException;
use Doctrine\ORM\Query\SqlWalker;
+use function assert;
+use function implode;
+use function sprintf;
+
/**
* "CAST" "(" "$fieldIdentifierExpression" "AS" "$castingTypeExpression" ")"
*
- * @example SELECT CAST(foo.bar AS SIGNED) FROM dual;
- *
* @link https://dev.mysql.com/doc/refman/en/cast-functions.html#function_cast
+ *
+ * @example SELECT CAST(foo.bar AS SIGNED) FROM dual;
*/
class Cast extends FunctionNode
{
@@ -25,11 +29,7 @@ class Cast extends FunctionNode
/** @var string */
protected $castingTypeExpression;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -44,20 +44,20 @@ public function parse(Parser $parser): void
if ($parser->getLexer()->isNextToken(Lexer::T_OPEN_PARENTHESIS)) {
$parser->match(Lexer::T_OPEN_PARENTHESIS);
- /** @var Literal $parameter */
$parameter = $parser->Literal();
+ assert($parameter instanceof Literal);
$parameters = [$parameter->value];
if ($parser->getLexer()->isNextToken(Lexer::T_COMMA)) {
while ($parser->getLexer()->isNextToken(Lexer::T_COMMA)) {
$parser->match(Lexer::T_COMMA);
- $parameter = $parser->Literal();
+ $parameter = $parser->Literal();
$parameters[] = $parameter->value;
}
}
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
- $type .= '('.implode(', ', $parameters).')';
+ $type .= '(' . implode(', ', $parameters) . ')';
}
$this->castingTypeExpression = $type;
@@ -65,11 +65,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
diff --git a/src/Query/Mysql/Ceil.php b/src/Query/Mysql/Ceil.php
index a7cf1cf8..9808dc3e 100644
--- a/src/Query/Mysql/Ceil.php
+++ b/src/Query/Mysql/Ceil.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Ceil extends FunctionNode
{
private $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'CEIL(' . $sqlWalker->walkSimpleArithmeticExpression($this->arithmeticExpression) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 59dc6838..58a755f4 100644
--- a/src/Query/Mysql/CharLength.php
+++ b/src/Query/Mysql/CharLength.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Metod
- */
+/** @author Metod */
class CharLength extends FunctionNode
{
private $expr1;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'CHAR_LENGTH('.$sqlWalker->walkArithmeticPrimary($this->expr1).')';
+ return 'CHAR_LENGTH(' . $sqlWalker->walkArithmeticPrimary($this->expr1) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index ad773eb3..88d4f841 100644
--- a/src/Query/Mysql/Collate.php
+++ b/src/Query/Mysql/Collate.php
@@ -4,27 +4,25 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
/**
* @link https://dev.mysql.com/doc/refman/en/charset-collate.html
+ *
* @author Peter Tanath
*/
class Collate extends FunctionNode
{
- /**
- * @var null
- */
+ /** @var null */
public $stringPrimary = null;
- /**
- * @var null
- */
+ /** @var null */
public $collation = null;
- /**
- * @param \Doctrine\ORM\Query\Parser $parser
- */
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -41,11 +39,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param \Doctrine\ORM\Query\SqlWalker $sqlWalker
- * @return string
- */
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(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
index 6cc655c7..fb86097a 100644
--- a/src/Query/Mysql/ConcatWs.php
+++ b/src/Query/Mysql/ConcatWs.php
@@ -4,17 +4,22 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andrew Mackrodt
- */
+use function count;
+use function implode;
+use function sprintf;
+use function strtolower;
+
+/** @author Andrew Mackrodt */
class ConcatWs extends FunctionNode
{
private $values = [];
private $notEmpty = false;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -27,33 +32,33 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$lexer = $parser->getLexer();
- while (count($this->values) < 3 || $lexer->lookahead->type == Lexer::T_COMMA) {
+ while (count($this->values) < 3 || $lexer->lookahead->type === Lexer::T_COMMA) {
$parser->match(Lexer::T_COMMA);
$peek = $lexer->glimpse();
- $this->values[] = $peek->value == '('
+ $this->values[] = $peek->value === '('
? $parser->FunctionDeclaration()
: $parser->ArithmeticExpression();
}
- while ($lexer->lookahead->type == Lexer::T_IDENTIFIER) {
+ while ($lexer->lookahead->type === Lexer::T_IDENTIFIER) {
switch (strtolower($lexer->lookahead->value)) {
case 'notempty':
$parser->match(Lexer::T_IDENTIFIER);
$this->notEmpty = true;
- break;
+ break;
default: // Identifier not recognized (causes exception).
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
- break;
+ break;
}
}
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(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
index 732505eb..e3e96105 100644
--- a/src/Query/Mysql/ConvertTz.php
+++ b/src/Query/Mysql/ConvertTz.php
@@ -7,9 +7,9 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
-/**
- * @link https://dev.mysql.com/doc/refman/en/date-and-time-functions.html#function_convert-tz
- */
+use function sprintf;
+
+/** @link https://dev.mysql.com/doc/refman/en/date-and-time-functions.html#function_convert-tz */
class ConvertTz extends FunctionNode
{
protected $dateExpression;
@@ -18,9 +18,6 @@ class ConvertTz extends FunctionNode
protected $toTz;
- /**
- * @inheritdoc
- */
public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
@@ -31,9 +28,6 @@ public function getSql(SqlWalker $sqlWalker): string
);
}
- /**
- * @inheritdoc
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
diff --git a/src/Query/Mysql/Cos.php b/src/Query/Mysql/Cos.php
index 47ef44c9..ea12c9ca 100644
--- a/src/Query/Mysql/Cos.php
+++ b/src/Query/Mysql/Cos.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Cos extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'COS(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index cf597205..eaf2fa1c 100644
--- a/src/Query/Mysql/Cot.php
+++ b/src/Query/Mysql/Cot.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Cot extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'COT(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index 027bad16..88475e36 100644
--- a/src/Query/Mysql/CountIf.php
+++ b/src/Query/Mysql/CountIf.php
@@ -4,10 +4,13 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andrew Mackrodt
- */
+use function sprintf;
+use function strtolower;
+
+/** @author Andrew Mackrodt */
class CountIf extends FunctionNode
{
private $expr1;
@@ -16,7 +19,7 @@ class CountIf extends FunctionNode
private $inverse = false;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -26,30 +29,30 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$lexer = $parser->getLexer();
- while ($lexer->lookahead->type == Lexer::T_IDENTIFIER) {
+ while ($lexer->lookahead->type === Lexer::T_IDENTIFIER) {
switch (strtolower($lexer->lookahead->value)) {
case 'inverse':
$parser->match(Lexer::T_IDENTIFIER);
$this->inverse = true;
- break;
+ break;
default: // Identifier not recognized (causes exception).
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
- break;
+ break;
}
}
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'COUNT(CASE %s WHEN %s THEN %s END)',
$sqlWalker->walkArithmeticPrimary($this->expr1),
$sqlWalker->walkArithmeticPrimary($this->expr2),
- !$this->inverse ? '1 ELSE NULL' : 'NULL ELSE 1'
+ ! $this->inverse ? '1 ELSE NULL' : 'NULL ELSE 1'
);
}
}
diff --git a/src/Query/Mysql/Crc32.php b/src/Query/Mysql/Crc32.php
index 9172c06e..23b42002 100644
--- a/src/Query/Mysql/Crc32.php
+++ b/src/Query/Mysql/Crc32.php
@@ -4,22 +4,22 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Igor Timoshenko
- */
+/** @author Igor Timoshenko */
class Crc32 extends FunctionNode
{
public $stringPrimary;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'CRC32(' .
$sqlWalker->walkStringPrimary($this->stringPrimary) .
')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(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
index d65deee9..4ad78ffb 100644
--- a/src/Query/Mysql/Date.php
+++ b/src/Query/Mysql/Date.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Steve Lacey
- */
+/** @author Steve Lacey */
class Date extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'DATE(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/DateAdd.php b/src/Query/Mysql/DateAdd.php
index 6280e9f9..bc5e2c7b 100644
--- a/src/Query/Mysql/DateAdd.php
+++ b/src/Query/Mysql/DateAdd.php
@@ -4,7 +4,13 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\QueryException;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function in_array;
+use function is_string;
+use function strtoupper;
class DateAdd extends FunctionNode
{
@@ -37,7 +43,7 @@ class DateAdd extends FunctionNode
'YEAR_MONTH',
];
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -53,11 +59,11 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$unit = strtoupper(is_string($this->unit) ? $this->unit : $this->unit->value);
- if (!in_array($unit, self::$allowedUnits)) {
+ if (! in_array($unit, self::$allowedUnits)) {
throw QueryException::semanticalError('DATE_ADD() does not support unit "' . $unit . '".');
}
diff --git a/src/Query/Mysql/DateDiff.php b/src/Query/Mysql/DateDiff.php
index d66ca8a7..b1796400 100644
--- a/src/Query/Mysql/DateDiff.php
+++ b/src/Query/Mysql/DateDiff.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class DateDiff extends FunctionNode
{
@@ -11,7 +13,7 @@ class DateDiff extends FunctionNode
public $secondDateExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +23,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'DATEDIFF(' .
$sqlWalker->walkArithmeticTerm($this->firstDateExpression) . ', ' .
diff --git a/src/Query/Mysql/DateFormat.php b/src/Query/Mysql/DateFormat.php
index 28770a6e..951f7d09 100644
--- a/src/Query/Mysql/DateFormat.php
+++ b/src/Query/Mysql/DateFormat.php
@@ -4,17 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Steve Lacey
- */
+/** @author Steve Lacey */
class DateFormat extends FunctionNode
{
public $dateExpression = null;
public $patternExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -24,7 +24,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'DATE_FORMAT(' .
$this->dateExpression->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Mysql/DateSub.php b/src/Query/Mysql/DateSub.php
index 5f66e7fa..795e10c4 100644
--- a/src/Query/Mysql/DateSub.php
+++ b/src/Query/Mysql/DateSub.php
@@ -3,22 +3,21 @@
namespace DoctrineExtensions\Query\Mysql;
use Doctrine\ORM\Query\QueryException;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Vas N
- */
+use function in_array;
+use function is_string;
+use function strtoupper;
+
+/** @author Vas N */
class DateSub extends DateAdd
{
- /**
- * @param \Doctrine\ORM\Query\SqlWalker $sqlWalker
- * @throws QueryException
- * @return string
- */
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ /** @throws QueryException */
+ public function getSql(SqlWalker $sqlWalker): string
{
$unit = strtoupper(is_string($this->unit) ? $this->unit : $this->unit->value);
- if (!in_array($unit, self::$allowedUnits)) {
+ if (! in_array($unit, self::$allowedUnits)) {
throw QueryException::semanticalError('DATE_SUB() does not support unit "' . $unit . '".');
}
diff --git a/src/Query/Mysql/Day.php b/src/Query/Mysql/Day.php
index 36954cb9..237f4c46 100644
--- a/src/Query/Mysql/Day.php
+++ b/src/Query/Mysql/Day.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
* @author Rafael Kassner
@@ -13,12 +15,12 @@ class Day extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'DAY(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/DayName.php b/src/Query/Mysql/DayName.php
index 70c14352..e7958a3d 100644
--- a/src/Query/Mysql/DayName.php
+++ b/src/Query/Mysql/DayName.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Steve Lacey
- */
+/** @author Steve Lacey */
class DayName extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'DAYNAME(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/DayOfWeek.php b/src/Query/Mysql/DayOfWeek.php
index 68cf981f..3e256deb 100644
--- a/src/Query/Mysql/DayOfWeek.php
+++ b/src/Query/Mysql/DayOfWeek.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class DayOfWeek extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'DAYOFWEEK(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/DayOfYear.php b/src/Query/Mysql/DayOfYear.php
index 7285d982..2b41c2cd 100644
--- a/src/Query/Mysql/DayOfYear.php
+++ b/src/Query/Mysql/DayOfYear.php
@@ -3,28 +3,21 @@
namespace DoctrineExtensions\Query\Mysql;
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\Node;
use Doctrine\ORM\Query\Lexer;
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
class DayOfYear extends FunctionNode
{
- /**
- * @var \Doctrine\ORM\Query\AST\Node
- */
+ /** @var Node */
public $date;
- /**
- * @inheritdoc
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'DAYOFYEAR(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- /**
- * @inheritdoc
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
diff --git a/src/Query/Mysql/Degrees.php b/src/Query/Mysql/Degrees.php
index b516cf74..55ffa726 100644
--- a/src/Query/Mysql/Degrees.php
+++ b/src/Query/Mysql/Degrees.php
@@ -4,12 +4,14 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Degrees extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'DEGREES(' .
$sqlWalker->walkSimpleArithmeticExpression(
@@ -18,7 +20,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Div.php b/src/Query/Mysql/Div.php
index 1d86b8bc..62bcaad6 100644
--- a/src/Query/Mysql/Div.php
+++ b/src/Query/Mysql/Div.php
@@ -3,38 +3,26 @@
namespace DoctrineExtensions\Query\Mysql;
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\Node;
use Doctrine\ORM\Query\Lexer;
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
-/**
- * @link https://dev.mysql.com/doc/refman/en/arithmetic-functions.html#operator_div
- */
+/** @link https://dev.mysql.com/doc/refman/en/arithmetic-functions.html#operator_div */
class Div extends FunctionNode
{
- /**
- * @var \Doctrine\ORM\Query\AST\Node
- */
+ /** @var Node */
private $dividend;
- /**
- * @var \Doctrine\ORM\Query\AST\Node
- */
+ /** @var Node */
private $divisor;
- /**
- * @inheritdoc
- */
public function getSql(SqlWalker $sqlWalker): string
{
- return
- $sqlWalker->walkArithmeticPrimary($this->dividend) . ' DIV ' .
+ return $sqlWalker->walkArithmeticPrimary($this->dividend) . ' DIV ' .
$sqlWalker->walkArithmeticPrimary($this->divisor);
}
- /**
- * @inheritdoc
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
diff --git a/src/Query/Mysql/Exp.php b/src/Query/Mysql/Exp.php
index c119f40f..37b72a97 100644
--- a/src/Query/Mysql/Exp.php
+++ b/src/Query/Mysql/Exp.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Exp extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'EXP(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Extract.php b/src/Query/Mysql/Extract.php
index dc24f4dc..ff6af97a 100644
--- a/src/Query/Mysql/Extract.php
+++ b/src/Query/Mysql/Extract.php
@@ -3,24 +3,27 @@
namespace DoctrineExtensions\Query\Mysql;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\QueryException;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Ahwalian Masykur
- */
+use function in_array;
+use function strtoupper;
+
+/** @author Ahwalian Masykur */
class Extract extends DateAdd
{
public $date = null;
public $unit = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$parser->match(Lexer::T_IDENTIFIER);
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
$this->unit = $lexer->token->value;
$parser->match(Lexer::T_IDENTIFIER);
@@ -29,13 +32,13 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$unit = strtoupper($this->unit);
- if (!in_array($unit, self::$allowedUnits)) {
+ if (! in_array($unit, self::$allowedUnits)) {
throw QueryException::semanticalError('EXTRACT() does not support unit "' . $unit . '".');
}
- return 'EXTRACT(' . $unit . ' FROM '. $this->date->dispatch($sqlWalker) . ')';
+ return 'EXTRACT(' . $unit . ' FROM ' . $this->date->dispatch($sqlWalker) . ')';
}
}
diff --git a/src/Query/Mysql/Field.php b/src/Query/Mysql/Field.php
index 6739ea66..849ca9ac 100644
--- a/src/Query/Mysql/Field.php
+++ b/src/Query/Mysql/Field.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Jeremy Hicks
- */
+use function count;
+
+/** @author Jeremy Hicks */
class Field extends FunctionNode
{
private $field = null;
private $values = [];
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -27,8 +29,10 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$lexer = $parser->getLexer();
- while (count($this->values) < 1 ||
- $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
+ while (
+ count($this->values) < 1 ||
+ $lexer->lookahead->type !== Lexer::T_CLOSE_PARENTHESIS
+ ) {
$parser->match(Lexer::T_COMMA);
$this->values[] = $parser->ArithmeticPrimary();
}
@@ -36,7 +40,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$query = 'FIELD(';
diff --git a/src/Query/Mysql/FindInSet.php b/src/Query/Mysql/FindInSet.php
index 5b31c787..7cbc85e3 100644
--- a/src/Query/Mysql/FindInSet.php
+++ b/src/Query/Mysql/FindInSet.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class FindInSet extends FunctionNode
{
@@ -11,7 +13,7 @@ class FindInSet extends FunctionNode
public $haystack = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +23,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'FIND_IN_SET(' .
$this->needle->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Mysql/Floor.php b/src/Query/Mysql/Floor.php
index 7e89a983..c2381d6c 100644
--- a/src/Query/Mysql/Floor.php
+++ b/src/Query/Mysql/Floor.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Floor extends FunctionNode
{
private $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'FLOOR(' . $sqlWalker->walkSimpleArithmeticExpression($this->arithmeticExpression) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Format.php b/src/Query/Mysql/Format.php
index 469a6b35..f42f48ad 100644
--- a/src/Query/Mysql/Format.php
+++ b/src/Query/Mysql/Format.php
@@ -4,17 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Wally Noveno
- */
+/** @author Wally Noveno */
class Format extends FunctionNode
{
public $numberExpression = null;
public $patternExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -24,7 +24,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'FORMAT(' .
$this->numberExpression->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Mysql/FromBase64.php b/src/Query/Mysql/FromBase64.php
index 13ae69ac..3912133c 100644
--- a/src/Query/Mysql/FromBase64.php
+++ b/src/Query/Mysql/FromBase64.php
@@ -10,9 +10,9 @@
/**
* "FROM_BASE64" "(" "$fieldIdentifierExpression" ")"
*
- * @example SELECT FROM_BASE64(foo) FROM dual;
- *
* @link https://dev.mysql.com/doc/refman/en/string-functions.html#function_from-base64
+ *
+ * @example SELECT FROM_BASE64(foo) FROM dual;
*/
class FromBase64 extends FunctionNode
{
diff --git a/src/Query/Mysql/FromUnixtime.php b/src/Query/Mysql/FromUnixtime.php
index 670fd188..be8fda18 100644
--- a/src/Query/Mysql/FromUnixtime.php
+++ b/src/Query/Mysql/FromUnixtime.php
@@ -4,19 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Nima S
- */
+/** @author Nima S */
class FromUnixtime extends FunctionNode
{
public $firstExpression = null;
public $secondExpression = null;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- if (null !== $this->secondExpression) {
+ if ($this->secondExpression !== null) {
return 'FROM_UNIXTIME('
. $this->firstExpression->dispatch($sqlWalker)
. ','
@@ -27,7 +27,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
return 'FROM_UNIXTIME(' . $this->firstExpression->dispatch($sqlWalker) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$lexer = $parser->getLexer();
@@ -37,7 +37,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$this->firstExpression = $parser->ArithmeticPrimary();
// parse second parameter if available
- if (Lexer::T_COMMA === $lexer->lookahead->type) {
+ if ($lexer->lookahead->type === Lexer::T_COMMA) {
$parser->match(Lexer::T_COMMA);
$this->secondExpression = $parser->ArithmeticPrimary();
}
diff --git a/src/Query/Mysql/Greatest.php b/src/Query/Mysql/Greatest.php
index 826a19e8..97c4e450 100644
--- a/src/Query/Mysql/Greatest.php
+++ b/src/Query/Mysql/Greatest.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function count;
+
/**
* @author Vas N
* @author Guven Atbakan
@@ -17,18 +19,17 @@ class Greatest extends FunctionNode
private $values = [];
- /**
- * @param Parser $parser
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->field = $parser->ArithmeticExpression();
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
- while (count($this->values) < 1 ||
- $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
+ while (
+ count($this->values) < 1 ||
+ $lexer->lookahead->type !== Lexer::T_CLOSE_PARENTHESIS
+ ) {
$parser->match(Lexer::T_COMMA);
$this->values[] = $parser->ArithmeticExpression();
}
@@ -36,10 +37,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
$query = 'GREATEST(';
diff --git a/src/Query/Mysql/GroupConcat.php b/src/Query/Mysql/GroupConcat.php
index 0299c4b4..932d71aa 100644
--- a/src/Query/Mysql/GroupConcat.php
+++ b/src/Query/Mysql/GroupConcat.php
@@ -4,6 +4,12 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function implode;
+use function sprintf;
+use function strtolower;
class GroupConcat extends FunctionNode
{
@@ -15,7 +21,7 @@ class GroupConcat extends FunctionNode
public $orderBy = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -48,6 +54,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
if (strtolower($lexer->lookahead->value) !== 'separator') {
$parser->syntaxError('separator');
}
+
$parser->match(Lexer::T_IDENTIFIER);
$this->separator = $parser->StringPrimary();
@@ -56,7 +63,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$result = 'GROUP_CONCAT(' . ($this->isDistinct ? 'DISTINCT ' : '');
@@ -68,11 +75,11 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
$result .= sprintf('%s', implode(', ', $fields));
if ($this->orderBy) {
- $result .= ' '.$sqlWalker->walkOrderByClause($this->orderBy);
+ $result .= ' ' . $sqlWalker->walkOrderByClause($this->orderBy);
}
if ($this->separator) {
- $result .= ' SEPARATOR '.$sqlWalker->walkStringPrimary($this->separator);
+ $result .= ' SEPARATOR ' . $sqlWalker->walkStringPrimary($this->separator);
}
$result .= ')';
diff --git a/src/Query/Mysql/Hex.php b/src/Query/Mysql/Hex.php
index 716992df..7537da57 100644
--- a/src/Query/Mysql/Hex.php
+++ b/src/Query/Mysql/Hex.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Hex extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'HEX(' . $sqlWalker->walkSimpleArithmeticExpression($this->arithmeticExpression) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Hour.php b/src/Query/Mysql/Hour.php
index 9a6817c9..e7f23595 100644
--- a/src/Query/Mysql/Hour.php
+++ b/src/Query/Mysql/Hour.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Dawid Nowak
- */
+/** @author Dawid Nowak */
class Hour extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'HOUR('.$sqlWalker->walkArithmeticPrimary($this->date).')';
+ return 'HOUR(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/IfElse.php b/src/Query/Mysql/IfElse.php
index 1493ba2b..aa17e75b 100644
--- a/src/Query/Mysql/IfElse.php
+++ b/src/Query/Mysql/IfElse.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andrew Mackrodt
- */
+use function sprintf;
+
+/** @author Andrew Mackrodt */
class IfElse extends FunctionNode
{
private $expr = [];
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -25,6 +27,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
} else {
$this->expr[] = $parser->ArithmeticExpression();
}
+
$parser->match(Lexer::T_COMMA);
if ($parser->getLexer()->isNextToken(Lexer::T_NULL)) {
$parser->match(Lexer::T_NULL);
@@ -36,7 +39,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'IF(%s, %s, %s)',
diff --git a/src/Query/Mysql/IfNull.php b/src/Query/Mysql/IfNull.php
index 26d32e77..a563222e 100644
--- a/src/Query/Mysql/IfNull.php
+++ b/src/Query/Mysql/IfNull.php
@@ -4,17 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andrew Mackrodt
- */
+/** @author Andrew Mackrodt */
class IfNull extends FunctionNode
{
private $expr1;
private $expr2;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -24,10 +24,10 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'IFNULL('
- .$sqlWalker->walkArithmeticPrimary($this->expr1). ', '
- .$sqlWalker->walkArithmeticPrimary($this->expr2).')';
+ . $sqlWalker->walkArithmeticPrimary($this->expr1) . ', '
+ . $sqlWalker->walkArithmeticPrimary($this->expr2) . ')';
}
}
diff --git a/src/Query/Mysql/Inet6Aton.php b/src/Query/Mysql/Inet6Aton.php
index 430e5fc1..6aec54d7 100644
--- a/src/Query/Mysql/Inet6Aton.php
+++ b/src/Query/Mysql/Inet6Aton.php
@@ -13,11 +13,7 @@ class Inet6Aton extends FunctionNode
{
public $valueExpression = null;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,11 +22,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'INET6_ATON('
@@ -39,6 +30,6 @@ public function getSql(SqlWalker $sqlWalker): string
? $this->valueExpression->dispatch($sqlWalker)
: "'" . $this->valueExpression . "'"
)
- .')';
+ . ')';
}
}
diff --git a/src/Query/Mysql/Inet6Ntoa.php b/src/Query/Mysql/Inet6Ntoa.php
index 5d641271..0780c085 100644
--- a/src/Query/Mysql/Inet6Ntoa.php
+++ b/src/Query/Mysql/Inet6Ntoa.php
@@ -13,11 +13,7 @@ class Inet6Ntoa extends FunctionNode
{
public $valueExpression = null;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,11 +22,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'INET6_NTOA('
@@ -39,6 +30,6 @@ public function getSql(SqlWalker $sqlWalker): string
? $this->valueExpression->dispatch($sqlWalker)
: "'" . $this->valueExpression . "'"
)
- .')';
+ . ')';
}
}
diff --git a/src/Query/Mysql/InetAton.php b/src/Query/Mysql/InetAton.php
index a03e8530..ce7a03ec 100644
--- a/src/Query/Mysql/InetAton.php
+++ b/src/Query/Mysql/InetAton.php
@@ -13,11 +13,7 @@ class InetAton extends FunctionNode
{
public $valueExpression = null;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,11 +22,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'INET_ATON('
@@ -39,6 +30,6 @@ public function getSql(SqlWalker $sqlWalker): string
? $this->valueExpression->dispatch($sqlWalker)
: "'" . $this->valueExpression . "'"
)
- .')';
+ . ')';
}
}
diff --git a/src/Query/Mysql/InetNtoa.php b/src/Query/Mysql/InetNtoa.php
index 4e2f55d2..4a09cb7f 100644
--- a/src/Query/Mysql/InetNtoa.php
+++ b/src/Query/Mysql/InetNtoa.php
@@ -13,11 +13,7 @@ class InetNtoa extends FunctionNode
{
public $valueExpression = null;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,11 +22,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'INET_NTOA('
@@ -39,6 +30,6 @@ public function getSql(SqlWalker $sqlWalker): string
? $this->valueExpression->dispatch($sqlWalker)
: "'" . $this->valueExpression . "'"
)
- .')';
+ . ')';
}
}
diff --git a/src/Query/Mysql/Instr.php b/src/Query/Mysql/Instr.php
index e939bdbb..809c253e 100644
--- a/src/Query/Mysql/Instr.php
+++ b/src/Query/Mysql/Instr.php
@@ -7,15 +7,14 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
class Instr extends FunctionNode
{
public $originalString = null;
public $subString = null;
- /**
- * @param \Doctrine\ORM\Query\Parser $parser
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,10 +25,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param \Doctrine\ORM\Query\SqlWalker $sqlWalker
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
diff --git a/src/Query/Mysql/IsIpv4.php b/src/Query/Mysql/IsIpv4.php
index 959b6e6d..e45f9b21 100644
--- a/src/Query/Mysql/IsIpv4.php
+++ b/src/Query/Mysql/IsIpv4.php
@@ -13,11 +13,7 @@ class IsIpv4 extends FunctionNode
{
public $valueExpression = null;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,11 +22,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'IS_IPV4('
@@ -39,6 +30,6 @@ public function getSql(SqlWalker $sqlWalker): string
? $this->valueExpression->dispatch($sqlWalker)
: "'" . $this->valueExpression . "'"
)
- .')';
+ . ')';
}
}
diff --git a/src/Query/Mysql/IsIpv4Compat.php b/src/Query/Mysql/IsIpv4Compat.php
index 13e221a2..fa402157 100644
--- a/src/Query/Mysql/IsIpv4Compat.php
+++ b/src/Query/Mysql/IsIpv4Compat.php
@@ -13,11 +13,7 @@ class IsIpv4Compat extends FunctionNode
{
public $valueExpression = null;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,11 +22,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'IS_IPV4_COMPAT('
@@ -39,6 +30,6 @@ public function getSql(SqlWalker $sqlWalker): string
? $this->valueExpression->dispatch($sqlWalker)
: "'" . $this->valueExpression . "'"
)
- .')';
+ . ')';
}
}
diff --git a/src/Query/Mysql/IsIpv4Mapped.php b/src/Query/Mysql/IsIpv4Mapped.php
index e8f91e2f..4aec2c86 100644
--- a/src/Query/Mysql/IsIpv4Mapped.php
+++ b/src/Query/Mysql/IsIpv4Mapped.php
@@ -13,11 +13,7 @@ class IsIpv4Mapped extends FunctionNode
{
public $valueExpression = null;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,11 +22,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'IS_IPV4_MAPPED('
@@ -39,6 +30,6 @@ public function getSql(SqlWalker $sqlWalker): string
? $this->valueExpression->dispatch($sqlWalker)
: "'" . $this->valueExpression . "'"
)
- .')';
+ . ')';
}
}
diff --git a/src/Query/Mysql/IsIpv6.php b/src/Query/Mysql/IsIpv6.php
index 1bb1d453..835a8b3a 100644
--- a/src/Query/Mysql/IsIpv6.php
+++ b/src/Query/Mysql/IsIpv6.php
@@ -13,11 +13,7 @@ class IsIpv6 extends FunctionNode
{
public $valueExpression = null;
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -26,11 +22,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- *
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return 'IS_IPV6('
@@ -39,6 +30,6 @@ public function getSql(SqlWalker $sqlWalker): string
? $this->valueExpression->dispatch($sqlWalker)
: "'" . $this->valueExpression . "'"
)
- .')';
+ . ')';
}
}
diff --git a/src/Query/Mysql/JsonContains.php b/src/Query/Mysql/JsonContains.php
index e307225b..73e80293 100644
--- a/src/Query/Mysql/JsonContains.php
+++ b/src/Query/Mysql/JsonContains.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
class JsonContains extends FunctionNode
{
protected $target;
@@ -37,7 +39,7 @@ public function parse(Parser $parser): void
public function getSql(SqlWalker $sqlWalker): string
{
- $target = $sqlWalker->walkStringPrimary($this->target);
+ $target = $sqlWalker->walkStringPrimary($this->target);
$candidate = $sqlWalker->walkStringPrimary($this->candidate);
if ($this->path !== null) {
diff --git a/src/Query/Mysql/JsonDepth.php b/src/Query/Mysql/JsonDepth.php
index cfbaa2b0..b70366ae 100644
--- a/src/Query/Mysql/JsonDepth.php
+++ b/src/Query/Mysql/JsonDepth.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
class JsonDepth extends FunctionNode
{
protected $target;
diff --git a/src/Query/Mysql/JsonLength.php b/src/Query/Mysql/JsonLength.php
index e7731a51..c16ac82c 100644
--- a/src/Query/Mysql/JsonLength.php
+++ b/src/Query/Mysql/JsonLength.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
class JsonLength extends FunctionNode
{
protected $target;
diff --git a/src/Query/Mysql/Lag.php b/src/Query/Mysql/Lag.php
index 967756e8..d6bb169c 100755
--- a/src/Query/Mysql/Lag.php
+++ b/src/Query/Mysql/Lag.php
@@ -26,6 +26,7 @@ public function getSql(SqlWalker $sqlWalker): string
if (isset($this->offset, $this->defaultValue)) {
return 'LAG(' . $sqlWalker->walkAggregateExpression($this->aggregateExpression) . ', ' . $sqlWalker->walkArithmeticPrimary($this->offset) . ', ' . $sqlWalker->walkSimpleArithmeticExpression($this->defaultValue) . ')';
}
+
if (isset($this->offset)) {
return 'LAG(' . $sqlWalker->walkAggregateExpression($this->aggregateExpression) . ', ' . $sqlWalker->walkArithmeticPrimary($this->offset) . ')';
}
@@ -40,11 +41,12 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->aggregateExpression = $parser->StringExpression();
- if (!$lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
+ if (! $lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
$parser->match(Lexer::T_COMMA);
$this->offset = $parser->ArithmeticPrimary();
}
- if (!$lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
+
+ if (! $lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
$parser->match(Lexer::T_COMMA);
$this->defaultValue = $parser->SimpleArithmeticExpression();
}
diff --git a/src/Query/Mysql/LastDay.php b/src/Query/Mysql/LastDay.php
index bc167ff8..c62c7a38 100644
--- a/src/Query/Mysql/LastDay.php
+++ b/src/Query/Mysql/LastDay.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
* @author Rafael Kassner
@@ -13,12 +15,12 @@ class LastDay extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'LAST_DAY(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Lead.php b/src/Query/Mysql/Lead.php
index 033af7eb..331706a7 100755
--- a/src/Query/Mysql/Lead.php
+++ b/src/Query/Mysql/Lead.php
@@ -26,6 +26,7 @@ public function getSql(SqlWalker $sqlWalker): string
if (isset($this->offset, $this->defaultValue)) {
return 'LEAD(' . $sqlWalker->walkAggregateExpression($this->aggregateExpression) . ', ' . $sqlWalker->walkArithmeticPrimary($this->offset) . ', ' . $sqlWalker->walkSimpleArithmeticExpression($this->defaultValue) . ')';
}
+
if (isset($this->offset)) {
return 'LEAD(' . $sqlWalker->walkAggregateExpression($this->aggregateExpression) . ', ' . $sqlWalker->walkArithmeticPrimary($this->offset) . ')';
}
@@ -40,11 +41,12 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->aggregateExpression = $parser->StringExpression();
- if (!$lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
+ if (! $lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
$parser->match(Lexer::T_COMMA);
$this->offset = $parser->ArithmeticPrimary();
}
- if (!$lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
+
+ if (! $lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
$parser->match(Lexer::T_COMMA);
$this->defaultValue = $parser->SimpleArithmeticExpression();
}
diff --git a/src/Query/Mysql/Least.php b/src/Query/Mysql/Least.php
index c72109dd..4547a9b5 100644
--- a/src/Query/Mysql/Least.php
+++ b/src/Query/Mysql/Least.php
@@ -7,27 +7,26 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Vas N
- */
+use function count;
+
+/** @author Vas N */
class Least extends FunctionNode
{
private $field = null;
private $values = [];
- /**
- * @param Parser $parser
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->field = $parser->ArithmeticExpression();
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
- while (count($this->values) < 1 ||
- $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
+ while (
+ count($this->values) < 1 ||
+ $lexer->lookahead->type !== Lexer::T_CLOSE_PARENTHESIS
+ ) {
$parser->match(Lexer::T_COMMA);
$this->values[] = $parser->ArithmeticExpression();
}
@@ -35,10 +34,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
$query = 'LEAST(';
diff --git a/src/Query/Mysql/Log.php b/src/Query/Mysql/Log.php
index 28c6afd7..619c6b1f 100644
--- a/src/Query/Mysql/Log.php
+++ b/src/Query/Mysql/Log.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Log extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'LOG(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Log10.php b/src/Query/Mysql/Log10.php
index f5fd868a..ad6f6b78 100644
--- a/src/Query/Mysql/Log10.php
+++ b/src/Query/Mysql/Log10.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Log10 extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'LOG10(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Log2.php b/src/Query/Mysql/Log2.php
index 6cae3d94..c1416aed 100644
--- a/src/Query/Mysql/Log2.php
+++ b/src/Query/Mysql/Log2.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Log2 extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'LOG2(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Lpad.php b/src/Query/Mysql/Lpad.php
index cf20dd70..ffc47eb1 100644
--- a/src/Query/Mysql/Lpad.php
+++ b/src/Query/Mysql/Lpad.php
@@ -4,10 +4,10 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Giulia Santoiemma
- */
+/** @author Giulia Santoiemma */
class Lpad extends FunctionNode
{
public $string = null;
@@ -16,7 +16,7 @@ class Lpad extends FunctionNode
public $padstring = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -28,7 +28,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'LPAD(' .
$this->string->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Mysql/MakeDate.php b/src/Query/Mysql/MakeDate.php
index 37a8253b..5e82f460 100644
--- a/src/Query/Mysql/MakeDate.php
+++ b/src/Query/Mysql/MakeDate.php
@@ -4,14 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class MakeDate extends FunctionNode
{
- public $year = null;
+ public $year = null;
public $dayOfYear = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,11 +23,11 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'MAKEDATE('.
- $sqlWalker->walkArithmeticPrimary($this->year).', '.
- $sqlWalker->walkArithmeticPrimary($this->dayOfYear).
+ return 'MAKEDATE(' .
+ $sqlWalker->walkArithmeticPrimary($this->year) . ', ' .
+ $sqlWalker->walkArithmeticPrimary($this->dayOfYear) .
')';
}
}
diff --git a/src/Query/Mysql/MatchAgainst.php b/src/Query/Mysql/MatchAgainst.php
index e87f3e16..b1527d67 100644
--- a/src/Query/Mysql/MatchAgainst.php
+++ b/src/Query/Mysql/MatchAgainst.php
@@ -3,11 +3,18 @@
namespace DoctrineExtensions\Query\Mysql;
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
+use Doctrine\ORM\Query\AST\PathExpression;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function implode;
+use function sprintf;
+use function strtolower;
class MatchAgainst extends FunctionNode
{
- /** @var array list of \Doctrine\ORM\Query\AST\PathExpression */
+ /** @var array */
protected $pathExp = null;
/** @var string */
@@ -19,14 +26,14 @@ class MatchAgainst extends FunctionNode
/** @var bool */
protected $queryExpansion = false;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
// match
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
// first Path Expression is mandatory
- $this->pathExp = [];
+ $this->pathExp = [];
$this->pathExp[] = $parser->StateFieldPathExpression();
// Subsequent Path Expressions are optional
@@ -56,11 +63,13 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
if (strtolower($lexer->lookahead->value) !== 'boolean') {
$parser->syntaxError('boolean');
}
+
$parser->match(Lexer::T_IDENTIFIER);
if (strtolower($lexer->lookahead->value) !== 'mode') {
$parser->syntaxError('mode');
}
+
$parser->match(Lexer::T_IDENTIFIER);
$this->booleanMode = true;
@@ -75,11 +84,13 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
if (strtolower($lexer->lookahead->value) !== 'query') {
$parser->syntaxError('query');
}
+
$parser->match(Lexer::T_IDENTIFIER);
if (strtolower($lexer->lookahead->value) !== 'expansion') {
$parser->syntaxError('expansion');
}
+
$parser->match(Lexer::T_IDENTIFIER);
$this->queryExpansion = true;
@@ -88,7 +99,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $walker): string
+ public function getSql(SqlWalker $walker): string
{
$fields = [];
diff --git a/src/Query/Mysql/Md5.php b/src/Query/Mysql/Md5.php
index 412abe9d..3ebcd663 100644
--- a/src/Query/Mysql/Md5.php
+++ b/src/Query/Mysql/Md5.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andreas Gallien
- */
+/** @author Andreas Gallien */
class Md5 extends FunctionNode
{
public $stringPrimary;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'MD5(' . $sqlWalker->walkStringPrimary($this->stringPrimary) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Minute.php b/src/Query/Mysql/Minute.php
index 84d2829a..28a3118f 100644
--- a/src/Query/Mysql/Minute.php
+++ b/src/Query/Mysql/Minute.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Martin Štekl
- */
+/** @author Martin Štekl */
class Minute extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'MINUTE('.$sqlWalker->walkArithmeticPrimary($this->date).')';
+ return 'MINUTE(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Month.php b/src/Query/Mysql/Month.php
index 3efc45c7..eac0d3a6 100644
--- a/src/Query/Mysql/Month.php
+++ b/src/Query/Mysql/Month.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
* @author Rafael Kassner
@@ -13,12 +15,12 @@ class Month extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'MONTH(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/MonthName.php b/src/Query/Mysql/MonthName.php
index 5b24cdec..d369b969 100644
--- a/src/Query/Mysql/MonthName.php
+++ b/src/Query/Mysql/MonthName.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Steve Lacey
- */
+/** @author Steve Lacey */
class MonthName extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'MONTHNAME(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Now.php b/src/Query/Mysql/Now.php
index dd0a4120..0f235339 100644
--- a/src/Query/Mysql/Now.php
+++ b/src/Query/Mysql/Now.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Now extends FunctionNode
{
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'NOW()';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/NullIf.php b/src/Query/Mysql/NullIf.php
index cc77b4e5..330213c9 100644
--- a/src/Query/Mysql/NullIf.php
+++ b/src/Query/Mysql/NullIf.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andrew Mackrodt
- */
+use function sprintf;
+
+/** @author Andrew Mackrodt */
class NullIf extends FunctionNode
{
private $expr1;
private $expr2;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -24,7 +26,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'NULLIF(%s, %s)',
diff --git a/src/Query/Mysql/Over.php b/src/Query/Mysql/Over.php
index d98b30cc..26a46ce0 100755
--- a/src/Query/Mysql/Over.php
+++ b/src/Query/Mysql/Over.php
@@ -9,6 +9,9 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function count;
+use function trim;
+
class Over extends FunctionNode
{
/** @var ArithmeticExpression */
@@ -31,10 +34,11 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->arithmeticExpression = $parser->ArithmeticExpression();
- if (!$lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
+ if (! $lexer->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
$parser->match(Lexer::T_COMMA);
$this->orderByClause = $parser->OrderByClause();
}
+
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
}
diff --git a/src/Query/Mysql/PeriodDiff.php b/src/Query/Mysql/PeriodDiff.php
index e6cc3f80..715e4ba3 100644
--- a/src/Query/Mysql/PeriodDiff.php
+++ b/src/Query/Mysql/PeriodDiff.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class PeriodDiff extends FunctionNode
{
@@ -11,7 +13,7 @@ class PeriodDiff extends FunctionNode
public $secondDateExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +23,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'PERIOD_DIFF(' .
$sqlWalker->walkArithmeticTerm($this->firstDateExpression) . ', ' .
diff --git a/src/Query/Mysql/Pi.php b/src/Query/Mysql/Pi.php
index 0b0173a5..8b6f66a7 100644
--- a/src/Query/Mysql/Pi.php
+++ b/src/Query/Mysql/Pi.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Pi extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'PI()';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Power.php b/src/Query/Mysql/Power.php
index bc900c55..076f66a6 100644
--- a/src/Query/Mysql/Power.php
+++ b/src/Query/Mysql/Power.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Power extends FunctionNode
{
@@ -11,13 +13,13 @@ class Power extends FunctionNode
public $power;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'POWER(' . $this->arithmeticExpression->dispatch($sqlWalker) . ', '
. $this->power->dispatch($sqlWalker) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Quarter.php b/src/Query/Mysql/Quarter.php
index b7c6465b..9a5b8875 100644
--- a/src/Query/Mysql/Quarter.php
+++ b/src/Query/Mysql/Quarter.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Martin Štekl
- */
+/** @author Martin Štekl */
class Quarter extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'QUARTER('.$sqlWalker->walkArithmeticPrimary($this->date).')';
+ return 'QUARTER(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Radians.php b/src/Query/Mysql/Radians.php
index c829c343..d6e3e738 100644
--- a/src/Query/Mysql/Radians.php
+++ b/src/Query/Mysql/Radians.php
@@ -4,12 +4,14 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Radians extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'RADIANS(' .
$sqlWalker->walkSimpleArithmeticExpression(
@@ -18,7 +20,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Rand.php b/src/Query/Mysql/Rand.php
index cf7fd83f..7ed91acd 100644
--- a/src/Query/Mysql/Rand.php
+++ b/src/Query/Mysql/Rand.php
@@ -5,15 +5,15 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\AST\SimpleArithmeticExpression;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Rand extends FunctionNode
{
- /**
- * @var SimpleArithmeticExpression
- */
+ /** @var SimpleArithmeticExpression */
private $expression = null;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
if ($this->expression) {
return 'RAND(' . $this->expression->dispatch($sqlWalker) . ')';
@@ -22,13 +22,13 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
return 'RAND()';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$lexer = $parser->getLexer();
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
- if (Lexer::T_CLOSE_PARENTHESIS !== $lexer->lookahead->type) {
+ if ($lexer->lookahead->type !== Lexer::T_CLOSE_PARENTHESIS) {
$this->expression = $parser->SimpleArithmeticExpression();
}
diff --git a/src/Query/Mysql/Regexp.php b/src/Query/Mysql/Regexp.php
index a0760697..6fbe908c 100644
--- a/src/Query/Mysql/Regexp.php
+++ b/src/Query/Mysql/Regexp.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Regexp extends FunctionNode
{
@@ -11,7 +13,7 @@ class Regexp extends FunctionNode
public $regexp = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +23,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return '(' . $this->value->dispatch($sqlWalker) . ' REGEXP ' . $this->regexp->dispatch($sqlWalker) . ')';
}
diff --git a/src/Query/Mysql/Replace.php b/src/Query/Mysql/Replace.php
index d3ac2def..33321c9c 100644
--- a/src/Query/Mysql/Replace.php
+++ b/src/Query/Mysql/Replace.php
@@ -4,10 +4,10 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Jarek Kostrz
- */
+/** @author Jarek Kostrz */
class Replace extends FunctionNode
{
public $search = null;
@@ -16,7 +16,7 @@ class Replace extends FunctionNode
public $subject = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -28,7 +28,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'REPLACE(' .
$this->subject->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Mysql/Round.php b/src/Query/Mysql/Round.php
index 2ccabd6a..27c439ab 100644
--- a/src/Query/Mysql/Round.php
+++ b/src/Query/Mysql/Round.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Round extends FunctionNode
{
@@ -11,7 +13,7 @@ class Round extends FunctionNode
private $secondExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$lexer = $parser->getLexer();
$parser->match(Lexer::T_IDENTIFIER);
@@ -19,7 +21,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$this->firstExpression = $parser->SimpleArithmeticExpression();
// parse second parameter if available
- if (Lexer::T_COMMA === $lexer->lookahead->type) {
+ if ($lexer->lookahead->type === Lexer::T_COMMA) {
$parser->match(Lexer::T_COMMA);
$this->secondExpression = $parser->ArithmeticPrimary();
}
@@ -27,10 +29,10 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
// use second parameter if parsed
- if (null !== $this->secondExpression) {
+ if ($this->secondExpression !== null) {
return 'ROUND('
. $this->firstExpression->dispatch($sqlWalker)
. ', '
diff --git a/src/Query/Mysql/Rpad.php b/src/Query/Mysql/Rpad.php
index bf733a6a..4b94f097 100644
--- a/src/Query/Mysql/Rpad.php
+++ b/src/Query/Mysql/Rpad.php
@@ -4,10 +4,10 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Giulia Santoiemma
- */
+/** @author Giulia Santoiemma */
class Rpad extends FunctionNode
{
public $string = null;
@@ -16,7 +16,7 @@ class Rpad extends FunctionNode
public $padstring = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -28,7 +28,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'RPAD(' .
$this->string->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Mysql/SecToTime.php b/src/Query/Mysql/SecToTime.php
index 0816586d..7a4e4c8c 100644
--- a/src/Query/Mysql/SecToTime.php
+++ b/src/Query/Mysql/SecToTime.php
@@ -4,22 +4,25 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
- * @example SELECT SEC_TO_TIME(2378);
* @link https://dev.mysql.com/doc/refman/en/date-and-time-functions.html#function_sec-to-time
+ *
+ * @example SELECT SEC_TO_TIME(2378);
* @author Clemens Bastian
*/
class SecToTime extends FunctionNode
{
public $time;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'SEC_TO_TIME('.$sqlWalker->walkArithmeticPrimary($this->time).')';
+ return 'SEC_TO_TIME(' . $sqlWalker->walkArithmeticPrimary($this->time) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Second.php b/src/Query/Mysql/Second.php
index c9304469..98b225a5 100644
--- a/src/Query/Mysql/Second.php
+++ b/src/Query/Mysql/Second.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Martin Štekl
- */
+/** @author Martin Štekl */
class Second extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'SECOND('.$sqlWalker->walkArithmeticPrimary($this->date).')';
+ return 'SECOND(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Sha1.php b/src/Query/Mysql/Sha1.php
index bdb1d0aa..9948b755 100644
--- a/src/Query/Mysql/Sha1.php
+++ b/src/Query/Mysql/Sha1.php
@@ -4,22 +4,22 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andreas Gallien
- */
+/** @author Andreas Gallien */
class Sha1 extends FunctionNode
{
public $stringPrimary;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'SHA1(' .
$sqlWalker->walkStringPrimary($this->stringPrimary) .
')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Sha2.php b/src/Query/Mysql/Sha2.php
index cf23aa4f..a512f8bd 100644
--- a/src/Query/Mysql/Sha2.php
+++ b/src/Query/Mysql/Sha2.php
@@ -4,17 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andreas Gallien
- */
+/** @author Andreas Gallien */
class Sha2 extends FunctionNode
{
public $stringPrimary;
public $simpleArithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'SHA2(' .
$sqlWalker->walkStringPrimary($this->stringPrimary) .
@@ -23,7 +23,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Sin.php b/src/Query/Mysql/Sin.php
index e40e53fb..0f813a4b 100644
--- a/src/Query/Mysql/Sin.php
+++ b/src/Query/Mysql/Sin.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Sin extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'SIN(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Soundex.php b/src/Query/Mysql/Soundex.php
index b5d39a48..ec37adc9 100644
--- a/src/Query/Mysql/Soundex.php
+++ b/src/Query/Mysql/Soundex.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Steve Tauber
- */
+/** @author Steve Tauber */
class Soundex extends FunctionNode
{
public $stringPrimary;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'SOUNDEX('.$sqlWalker->walkStringPrimary($this->stringPrimary).')';
+ return 'SOUNDEX(' . $sqlWalker->walkStringPrimary($this->stringPrimary) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Std.php b/src/Query/Mysql/Std.php
index d8b9df85..a7825053 100644
--- a/src/Query/Mysql/Std.php
+++ b/src/Query/Mysql/Std.php
@@ -4,20 +4,22 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Toni Uebernickel
- */
+use function sprintf;
+
+/** @author Toni Uebernickel */
class Std extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf('STD(%s)', $sqlWalker->walkSimpleArithmeticExpression($this->arithmeticExpression));
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/StdDev.php b/src/Query/Mysql/StdDev.php
index c25329a5..e5429df7 100644
--- a/src/Query/Mysql/StdDev.php
+++ b/src/Query/Mysql/StdDev.php
@@ -4,20 +4,22 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Joachim Schirrmacher
- */
+use function sprintf;
+
+/** @author Joachim Schirrmacher */
class StdDev extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf('STDDEV(%s)', $sqlWalker->walkSimpleArithmeticExpression($this->arithmeticExpression));
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/StrToDate.php b/src/Query/Mysql/StrToDate.php
index 863caba5..dcbeaf00 100644
--- a/src/Query/Mysql/StrToDate.php
+++ b/src/Query/Mysql/StrToDate.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class StrToDate extends FunctionNode
{
@@ -11,7 +13,7 @@ class StrToDate extends FunctionNode
public $dateFormat = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +23,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'STR_TO_DATE(' .
$this->dateString->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Mysql/SubstringIndex.php b/src/Query/Mysql/SubstringIndex.php
index 5d05a8d1..d1d0fc33 100644
--- a/src/Query/Mysql/SubstringIndex.php
+++ b/src/Query/Mysql/SubstringIndex.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
class SubstringIndex extends FunctionNode
{
public $string = null;
@@ -15,9 +17,6 @@ class SubstringIndex extends FunctionNode
public $count = null;
- /**
- * @param \Doctrine\ORM\Query\Parser $parser
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
@@ -30,10 +29,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param \Doctrine\ORM\Query\SqlWalker $sqlWalker
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
diff --git a/src/Query/Mysql/Tan.php b/src/Query/Mysql/Tan.php
index 23dd70f6..17c9e30d 100644
--- a/src/Query/Mysql/Tan.php
+++ b/src/Query/Mysql/Tan.php
@@ -4,19 +4,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Tan extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'TAN(' . $sqlWalker->walkSimpleArithmeticExpression(
$this->arithmeticExpression
) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Time.php b/src/Query/Mysql/Time.php
index dc6d2c65..76753db5 100644
--- a/src/Query/Mysql/Time.php
+++ b/src/Query/Mysql/Time.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
* @author Steve Lacey
@@ -13,12 +15,12 @@ class Time extends FunctionNode
{
public $time;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'TIME(' . $sqlWalker->walkArithmeticPrimary($this->time) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/TimeDiff.php b/src/Query/Mysql/TimeDiff.php
index ede2a411..dda1973f 100644
--- a/src/Query/Mysql/TimeDiff.php
+++ b/src/Query/Mysql/TimeDiff.php
@@ -4,6 +4,10 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class TimeDiff extends FunctionNode
{
@@ -11,7 +15,7 @@ class TimeDiff extends FunctionNode
public $secondDateExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +25,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'TIMEDIFF(%s, %s)',
diff --git a/src/Query/Mysql/TimeToSec.php b/src/Query/Mysql/TimeToSec.php
index 7cd27a8f..70af6ecf 100644
--- a/src/Query/Mysql/TimeToSec.php
+++ b/src/Query/Mysql/TimeToSec.php
@@ -4,22 +4,25 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
- * @example SELECT TIME_TO_SEC('22:23:00');
* @link https://dev.mysql.com/doc/refman/en/date-and-time-functions.html#function_time-to-sec
+ *
+ * @example SELECT TIME_TO_SEC('22:23:00');
* @author Pawel Stasicki
*/
class TimeToSec extends FunctionNode
{
public $time;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'TIME_TO_SEC('.$sqlWalker->walkArithmeticPrimary($this->time).')';
+ return 'TIME_TO_SEC(' . $sqlWalker->walkArithmeticPrimary($this->time) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/TimestampAdd.php b/src/Query/Mysql/TimestampAdd.php
index 6774d2c9..97062048 100644
--- a/src/Query/Mysql/TimestampAdd.php
+++ b/src/Query/Mysql/TimestampAdd.php
@@ -4,10 +4,12 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Alessandro Tagliapietra
- */
+use function sprintf;
+
+/** @author Alessandro Tagliapietra */
class TimestampAdd extends FunctionNode
{
public $firstDatetimeExpression = null;
@@ -16,12 +18,12 @@ class TimestampAdd extends FunctionNode
public $unit = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$parser->match(Lexer::T_IDENTIFIER);
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
$this->unit = $lexer->token->value;
$parser->match(Lexer::T_COMMA);
$this->firstDatetimeExpression = $parser->ArithmeticPrimary();
@@ -30,13 +32,13 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sql_walker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'TIMESTAMPADD(%s, %s, %s)',
$this->unit,
- $this->firstDatetimeExpression->dispatch($sql_walker),
- $this->secondDatetimeExpression->dispatch($sql_walker)
+ $this->firstDatetimeExpression->dispatch($sqlWalker),
+ $this->secondDatetimeExpression->dispatch($sqlWalker)
);
}
}
diff --git a/src/Query/Mysql/TimestampDiff.php b/src/Query/Mysql/TimestampDiff.php
index 094738fa..49697f69 100644
--- a/src/Query/Mysql/TimestampDiff.php
+++ b/src/Query/Mysql/TimestampDiff.php
@@ -4,10 +4,12 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Przemek Sobstel
- */
+use function sprintf;
+
+/** @author Przemek Sobstel */
class TimestampDiff extends FunctionNode
{
public $firstDatetimeExpression = null;
@@ -16,12 +18,12 @@ class TimestampDiff extends FunctionNode
public $unit = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$parser->match(Lexer::T_IDENTIFIER);
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
$this->unit = $lexer->token->value;
$parser->match(Lexer::T_COMMA);
$this->firstDatetimeExpression = $parser->ArithmeticPrimary();
@@ -30,13 +32,13 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sql_walker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'TIMESTAMPDIFF(%s, %s, %s)',
$this->unit,
- $this->firstDatetimeExpression->dispatch($sql_walker),
- $this->secondDatetimeExpression->dispatch($sql_walker)
+ $this->firstDatetimeExpression->dispatch($sqlWalker),
+ $this->secondDatetimeExpression->dispatch($sqlWalker)
);
}
}
diff --git a/src/Query/Mysql/Truncate.php b/src/Query/Mysql/Truncate.php
index 5557f5bb..487f7a35 100644
--- a/src/Query/Mysql/Truncate.php
+++ b/src/Query/Mysql/Truncate.php
@@ -4,17 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Evgeny Savich
- */
+/** @author Evgeny Savich */
class Truncate extends FunctionNode
{
public $numberExpression = null;
public $patternExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -24,7 +24,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'TRUNCATE(' .
$this->numberExpression->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Mysql/Unhex.php b/src/Query/Mysql/Unhex.php
index 41cbf27b..4fa000d2 100644
--- a/src/Query/Mysql/Unhex.php
+++ b/src/Query/Mysql/Unhex.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Unhex extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'UNHEX(' . $sqlWalker->walkSimpleArithmeticExpression($this->arithmeticExpression) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/UnixTimestamp.php b/src/Query/Mysql/UnixTimestamp.php
index 7a49c2c8..16b23a84 100644
--- a/src/Query/Mysql/UnixTimestamp.php
+++ b/src/Query/Mysql/UnixTimestamp.php
@@ -4,6 +4,10 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
/**
* @author Rafael Kassner
@@ -13,7 +17,7 @@ class UnixTimestamp extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'UNIX_TIMESTAMP(%s)',
@@ -21,12 +25,12 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
- if (!$parser->getLexer()->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
+ if (! $parser->getLexer()->isNextToken(Lexer::T_CLOSE_PARENTHESIS)) {
$this->date = $parser->ArithmeticPrimary();
}
diff --git a/src/Query/Mysql/UtcTimestamp.php b/src/Query/Mysql/UtcTimestamp.php
index a32577f3..096918eb 100644
--- a/src/Query/Mysql/UtcTimestamp.php
+++ b/src/Query/Mysql/UtcTimestamp.php
@@ -4,18 +4,18 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Marius Krämer
- */
+/** @author Marius Krämer */
class UtcTimestamp extends FunctionNode
{
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'UTC_TIMESTAMP()';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/UuidShort.php b/src/Query/Mysql/UuidShort.php
index 41922c1a..b999d70d 100644
--- a/src/Query/Mysql/UuidShort.php
+++ b/src/Query/Mysql/UuidShort.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class UuidShort extends FunctionNode
{
public $arithmeticExpression;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'UUID_SHORT()';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Variance.php b/src/Query/Mysql/Variance.php
index cadab86f..59a12744 100644
--- a/src/Query/Mysql/Variance.php
+++ b/src/Query/Mysql/Variance.php
@@ -8,6 +8,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
class Variance extends FunctionNode
{
/** @var SimpleArithmeticExpression */
diff --git a/src/Query/Mysql/Week.php b/src/Query/Mysql/Week.php
index 900edbc0..e34eeb2a 100644
--- a/src/Query/Mysql/Week.php
+++ b/src/Query/Mysql/Week.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
* @author Rafael Kassner
@@ -16,25 +18,26 @@ class Week extends FunctionNode
public $mode;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$sql = 'WEEK(' . $sqlWalker->walkArithmeticPrimary($this->date);
- if ($this->mode != null) {
+ if ($this->mode !== null) {
$sql .= ', ' . $sqlWalker->walkLiteral($this->mode);
}
+
$sql .= ')';
return $sql;
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->date = $parser->ArithmeticPrimary();
- if (Lexer::T_COMMA === $parser->getLexer()->lookahead->type) {
+ if ($parser->getLexer()->lookahead->type === Lexer::T_COMMA) {
$parser->match(Lexer::T_COMMA);
$this->mode = $parser->Literal();
}
diff --git a/src/Query/Mysql/WeekDay.php b/src/Query/Mysql/WeekDay.php
index 187b2569..e16e7dba 100644
--- a/src/Query/Mysql/WeekDay.php
+++ b/src/Query/Mysql/WeekDay.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Pavlo Cherniavskyi
- */
+/** @author Pavlo Cherniavskyi */
class WeekDay extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'WEEKDAY(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/WeekOfYear.php b/src/Query/Mysql/WeekOfYear.php
index ce7fb57d..29915f2d 100644
--- a/src/Query/Mysql/WeekOfYear.php
+++ b/src/Query/Mysql/WeekOfYear.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class WeekOfYear extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'WEEKOFYEAR(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/Year.php b/src/Query/Mysql/Year.php
index f9519b88..2464743d 100644
--- a/src/Query/Mysql/Year.php
+++ b/src/Query/Mysql/Year.php
@@ -4,20 +4,20 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Rafael Kassner
- */
+/** @author Rafael Kassner */
class Year extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'YEAR(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/YearMonth.php b/src/Query/Mysql/YearMonth.php
index e8046494..df51e844 100644
--- a/src/Query/Mysql/YearMonth.php
+++ b/src/Query/Mysql/YearMonth.php
@@ -4,12 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class YearMonth extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(YEAR_MONTH FROM %s)',
@@ -17,7 +21,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Mysql/YearWeek.php b/src/Query/Mysql/YearWeek.php
index a550274f..04f2e136 100644
--- a/src/Query/Mysql/YearWeek.php
+++ b/src/Query/Mysql/YearWeek.php
@@ -4,35 +4,36 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Michael Kimpton
- */
+/** @author Michael Kimpton */
class YearWeek extends FunctionNode
{
public $date;
public $mode;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$sql = 'YEARWEEK(' . $sqlWalker->walkArithmeticPrimary($this->date);
- if ($this->mode != null) {
+ if ($this->mode !== null) {
$sql .= ', ' . $sqlWalker->walkLiteral($this->mode);
}
+
$sql .= ')';
return $sql;
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->date = $parser->ArithmeticPrimary();
- if (Lexer::T_COMMA === $parser->getLexer()->lookahead->type) {
+ if ($parser->getLexer()->lookahead->type === Lexer::T_COMMA) {
$parser->match(Lexer::T_COMMA);
$this->mode = $parser->Literal();
}
diff --git a/src/Query/MysqlWalker.php b/src/Query/MysqlWalker.php
index 4d79b428..e49d31b6 100644
--- a/src/Query/MysqlWalker.php
+++ b/src/Query/MysqlWalker.php
@@ -4,12 +4,14 @@
use Doctrine\ORM\Query\SqlWalker;
+use function str_replace;
+
class MysqlWalker extends SqlWalker
{
/**
- * @inheritdoc
- *
* @return array|string
+ *
+ * @inheritdoc
*/
public function walkSelectClause($selectClause)
{
@@ -28,9 +30,7 @@ public function walkSelectClause($selectClause)
return $sql;
}
- /**
- * @inheritdoc
- */
+ /** @inheritdoc */
public function walkGroupByClause($groupByClause): string
{
$sql = parent::walkGroupByClause($groupByClause);
diff --git a/src/Query/Oracle/Ceil.php b/src/Query/Oracle/Ceil.php
index a26b5529..5af8c3b2 100755
--- a/src/Query/Oracle/Ceil.php
+++ b/src/Query/Oracle/Ceil.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Jefferson Vantuir
- */
+use function sprintf;
+
+/** @author Jefferson Vantuir */
class Ceil extends FunctionNode
{
private $number;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'CEIL(%s)',
@@ -20,7 +22,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/Day.php b/src/Query/Oracle/Day.php
index f9e4e534..9fa2e6c2 100644
--- a/src/Query/Oracle/Day.php
+++ b/src/Query/Oracle/Day.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andréia Bohner
- */
+use function sprintf;
+
+/** @author Andréia Bohner */
class Day extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(DAY FROM %s)',
@@ -20,7 +22,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/Floor.php b/src/Query/Oracle/Floor.php
index a05e1e83..ddfe1ba5 100755
--- a/src/Query/Oracle/Floor.php
+++ b/src/Query/Oracle/Floor.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Jefferson Vantuir
- */
+use function sprintf;
+
+/** @author Jefferson Vantuir */
class Floor extends FunctionNode
{
private $number;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'FLOOR(%s)',
@@ -20,7 +22,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/Hour.php b/src/Query/Oracle/Hour.php
index d8cb6e65..f308cd38 100644
--- a/src/Query/Oracle/Hour.php
+++ b/src/Query/Oracle/Hour.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andréia Bohner
- */
+use function sprintf;
+
+/** @author Andréia Bohner */
class Hour extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(HOUR FROM %s)',
@@ -20,7 +22,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/Listagg.php b/src/Query/Oracle/Listagg.php
index 967ee1f2..562849fb 100644
--- a/src/Query/Oracle/Listagg.php
+++ b/src/Query/Oracle/Listagg.php
@@ -9,34 +9,25 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Alexey Kalinin
- */
+use function count;
+use function implode;
+use function strtolower;
+
+/** @author Alexey Kalinin */
class Listagg extends FunctionNode
{
- /**
- * @var Node
- */
+ /** @var Node */
public $separator = null;
- /**
- * @var Node
- */
+ /** @var Node */
public $listaggField = null;
- /**
- * @var OrderByClause
- */
+ /** @var OrderByClause */
public $orderBy;
- /**
- * @var Node[]
- */
+ /** @var Node[] */
public $partitionBy = [];
- /**
- * @inheritdoc
- */
public function parse(Parser $parser): void
{
$lexer = $parser->getLexer();
@@ -49,11 +40,13 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_COMMA);
$this->separator = $parser->StringExpression();
}
+
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
- if (!$lexer->isNextToken(Lexer::T_IDENTIFIER) || strtolower($lexer->lookahead->value) != 'within') {
+ if (! $lexer->isNextToken(Lexer::T_IDENTIFIER) || strtolower($lexer->lookahead->value) !== 'within') {
$parser->syntaxError('WITHIN GROUP');
}
+
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_GROUP);
@@ -62,15 +55,17 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
if ($lexer->isNextToken(Lexer::T_IDENTIFIER)) {
- if (strtolower($lexer->lookahead->value) != 'over') {
+ if (strtolower($lexer->lookahead->value) !== 'over') {
$parser->syntaxError('OVER');
}
+
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
- if (!$lexer->isNextToken(Lexer::T_IDENTIFIER) || strtolower($lexer->lookahead->value) != 'partition') {
+ if (! $lexer->isNextToken(Lexer::T_IDENTIFIER) || strtolower($lexer->lookahead->value) !== 'partition') {
$parser->syntaxError('PARTITION BY');
}
+
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_BY);
@@ -85,9 +80,6 @@ public function parse(Parser $parser): void
}
}
- /**
- * @inheritdoc
- */
public function getSql(SqlWalker $sqlWalker): string
{
$result = 'LISTAGG(' . $this->listaggField->dispatch($sqlWalker);
diff --git a/src/Query/Oracle/Minute.php b/src/Query/Oracle/Minute.php
index a6026a51..4af5a515 100644
--- a/src/Query/Oracle/Minute.php
+++ b/src/Query/Oracle/Minute.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andréia Bohner
- */
+use function sprintf;
+
+/** @author Andréia Bohner */
class Minute extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(MINUTE FROM %s)',
@@ -20,7 +22,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/Month.php b/src/Query/Oracle/Month.php
index 6129874e..f0752111 100644
--- a/src/Query/Oracle/Month.php
+++ b/src/Query/Oracle/Month.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andréia Bohner
- */
+use function sprintf;
+
+/** @author Andréia Bohner */
class Month extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(MONTH FROM %s)',
@@ -20,7 +22,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/Nvl.php b/src/Query/Oracle/Nvl.php
index 44702afa..967d0c9b 100644
--- a/src/Query/Oracle/Nvl.php
+++ b/src/Query/Oracle/Nvl.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andréia Bohner
- */
+use function sprintf;
+
+/** @author Andréia Bohner */
class Nvl extends FunctionNode
{
private $expr1;
private $expr2;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'NVL(%s, %s)',
@@ -23,7 +25,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/Second.php b/src/Query/Oracle/Second.php
index 2b27aac2..49e629df 100644
--- a/src/Query/Oracle/Second.php
+++ b/src/Query/Oracle/Second.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andréia Bohner
- */
+use function sprintf;
+
+/** @author Andréia Bohner */
class Second extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'FLOOR(EXTRACT(SECOND FROM %s))',
@@ -20,7 +22,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/ToChar.php b/src/Query/Oracle/ToChar.php
index 75d873b1..d9963f74 100755
--- a/src/Query/Oracle/ToChar.php
+++ b/src/Query/Oracle/ToChar.php
@@ -4,10 +4,12 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Cédric Bertolini
- */
+use function sprintf;
+
+/** @author Cédric Bertolini */
class ToChar extends FunctionNode
{
private $datetime;
@@ -16,7 +18,7 @@ class ToChar extends FunctionNode
private $nls = null;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
if ($this->nls) {
return sprintf(
@@ -34,7 +36,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$lexer = $parser->getLexer();
diff --git a/src/Query/Oracle/ToDate.php b/src/Query/Oracle/ToDate.php
index 9acc84c8..f5782f4e 100644
--- a/src/Query/Oracle/ToDate.php
+++ b/src/Query/Oracle/ToDate.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Mohammad ZeinEddin
- */
+use function sprintf;
+
+/** @author Mohammad ZeinEddin */
class ToDate extends FunctionNode
{
private $date;
private $fmt;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'TO_DATE(%s, %s)',
@@ -23,7 +25,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Oracle/Trunc.php b/src/Query/Oracle/Trunc.php
index 56650a59..a32aa689 100755
--- a/src/Query/Oracle/Trunc.php
+++ b/src/Query/Oracle/Trunc.php
@@ -5,23 +5,21 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\AST\Node;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Mohammad ZeinEddin
- */
+use function sprintf;
+
+/** @author Mohammad ZeinEddin */
class Trunc extends FunctionNode
{
- /**
- * @var Node
- */
+ /** @var Node */
private $date;
- /**
- * @var Node
- */
+ /** @var Node */
private $fmt;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
if ($this->fmt) {
return sprintf(
@@ -37,7 +35,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$lexer = $parser->getLexer();
diff --git a/src/Query/Oracle/Year.php b/src/Query/Oracle/Year.php
index 7dc76e0f..2a54076f 100644
--- a/src/Query/Oracle/Year.php
+++ b/src/Query/Oracle/Year.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Andréia Bohner
- */
+use function sprintf;
+
+/** @author Andréia Bohner */
class Year extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(YEAR FROM %s)',
@@ -20,7 +22,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Postgresql/AtTimeZoneFunction.php b/src/Query/Postgresql/AtTimeZoneFunction.php
index c9ee23f9..409e484d 100644
--- a/src/Query/Postgresql/AtTimeZoneFunction.php
+++ b/src/Query/Postgresql/AtTimeZoneFunction.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
/**
* AtTimeZoneFunction ::= "AT_TIME_ZONE" "(" ArithmeticPrimary "," ArithmeticPrimary ")"
*/
diff --git a/src/Query/Postgresql/CountFilterFunction.php b/src/Query/Postgresql/CountFilterFunction.php
index 1a562a78..3d24a58c 100644
--- a/src/Query/Postgresql/CountFilterFunction.php
+++ b/src/Query/Postgresql/CountFilterFunction.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
/**
* CountFilterFunction ::= "COUNT_FILTER" "(" ArithmeticPrimary "," ArithmeticPrimary ")"
*/
diff --git a/src/Query/Postgresql/Date.php b/src/Query/Postgresql/Date.php
index d847862b..d7e128c5 100644
--- a/src/Query/Postgresql/Date.php
+++ b/src/Query/Postgresql/Date.php
@@ -4,17 +4,19 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Date extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'DATE(' . $sqlWalker->walkArithmeticPrimary($this->date) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Postgresql/DateFormat.php b/src/Query/Postgresql/DateFormat.php
index 7dd6a67a..59031420 100644
--- a/src/Query/Postgresql/DateFormat.php
+++ b/src/Query/Postgresql/DateFormat.php
@@ -4,17 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Silvio
- */
+/** @author Silvio */
class DateFormat extends FunctionNode
{
public $dateExpression = null;
public $patternExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -24,7 +24,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'TO_CHAR(' .
$this->dateExpression->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Postgresql/DatePart.php b/src/Query/Postgresql/DatePart.php
index faba0a80..f162aa6e 100644
--- a/src/Query/Postgresql/DatePart.php
+++ b/src/Query/Postgresql/DatePart.php
@@ -7,9 +7,7 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Geovani Roggeo
- */
+/** @author Geovani Roggeo */
class DatePart extends FunctionNode
{
public $dateString = null;
diff --git a/src/Query/Postgresql/DateTrunc.php b/src/Query/Postgresql/DateTrunc.php
index 9ceefbf8..b2e6e1a5 100644
--- a/src/Query/Postgresql/DateTrunc.php
+++ b/src/Query/Postgresql/DateTrunc.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
class DateTrunc extends FunctionNode
{
public $fieldText = null;
diff --git a/src/Query/Postgresql/Day.php b/src/Query/Postgresql/Day.php
index 57d4bcd5..d3339f40 100644
--- a/src/Query/Postgresql/Day.php
+++ b/src/Query/Postgresql/Day.php
@@ -4,12 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class Day extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(DAY FROM %s)',
@@ -17,7 +21,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Postgresql/ExtractFunction.php b/src/Query/Postgresql/ExtractFunction.php
index 333b1dad..2cd0126a 100644
--- a/src/Query/Postgresql/ExtractFunction.php
+++ b/src/Query/Postgresql/ExtractFunction.php
@@ -10,6 +10,8 @@
use Doctrine\ORM\Query\QueryException;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
class ExtractFunction extends FunctionNode
{
/** @var string */
@@ -18,12 +20,7 @@ class ExtractFunction extends FunctionNode
/** @var PathExpression */
private $value;
- /**
- * @param SqlWalker $sqlWalker
- *
- * @throws ASTException
- * @return string
- */
+ /** @throws ASTException */
public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
@@ -33,11 +30,7 @@ public function getSql(SqlWalker $sqlWalker): string
);
}
- /**
- * @param Parser $parser
- *
- * @throws QueryException
- */
+ /** @throws QueryException */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
diff --git a/src/Query/Postgresql/Greatest.php b/src/Query/Postgresql/Greatest.php
index c1dd1b36..f3d5950b 100644
--- a/src/Query/Postgresql/Greatest.php
+++ b/src/Query/Postgresql/Greatest.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function count;
+
/**
* @author Vas N
* @author Guven Atbakan
@@ -18,18 +20,17 @@ class Greatest extends FunctionNode
private $values = [];
- /**
- * @param Parser $parser
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->field = $parser->ArithmeticExpression();
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
- while (count($this->values) < 1 ||
- $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
+ while (
+ count($this->values) < 1 ||
+ $lexer->lookahead->type !== Lexer::T_CLOSE_PARENTHESIS
+ ) {
$parser->match(Lexer::T_COMMA);
$this->values[] = $parser->ArithmeticExpression();
}
@@ -37,10 +38,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
$query = 'GREATEST(';
diff --git a/src/Query/Postgresql/Hour.php b/src/Query/Postgresql/Hour.php
index 27b37707..9f3989a5 100644
--- a/src/Query/Postgresql/Hour.php
+++ b/src/Query/Postgresql/Hour.php
@@ -4,12 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class Hour extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(HOUR FROM %s)',
@@ -17,7 +21,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Postgresql/Least.php b/src/Query/Postgresql/Least.php
index a2ecb371..6190452e 100644
--- a/src/Query/Postgresql/Least.php
+++ b/src/Query/Postgresql/Least.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function count;
+
/**
* @author Vas N
* @author Leonardo B Motyczka
@@ -17,18 +19,17 @@ class Least extends FunctionNode
private $values = [];
- /**
- * @param Parser $parser
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->field = $parser->ArithmeticExpression();
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
- while (count($this->values) < 1 ||
- $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
+ while (
+ count($this->values) < 1 ||
+ $lexer->lookahead->type !== Lexer::T_CLOSE_PARENTHESIS
+ ) {
$parser->match(Lexer::T_COMMA);
$this->values[] = $parser->ArithmeticExpression();
}
@@ -36,10 +37,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
$query = 'LEAST(';
diff --git a/src/Query/Postgresql/Minute.php b/src/Query/Postgresql/Minute.php
index 2464dcdf..a1676c08 100644
--- a/src/Query/Postgresql/Minute.php
+++ b/src/Query/Postgresql/Minute.php
@@ -4,12 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class Minute extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(MINUTE FROM %s)',
@@ -17,7 +21,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Postgresql/Month.php b/src/Query/Postgresql/Month.php
index 3437d658..16492a5d 100644
--- a/src/Query/Postgresql/Month.php
+++ b/src/Query/Postgresql/Month.php
@@ -4,12 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class Month extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(MONTH FROM %s)',
@@ -17,7 +21,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Postgresql/RegexpReplace.php b/src/Query/Postgresql/RegexpReplace.php
index a9dfe85b..ea82e6e5 100644
--- a/src/Query/Postgresql/RegexpReplace.php
+++ b/src/Query/Postgresql/RegexpReplace.php
@@ -4,10 +4,13 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
/**
- * @example SELECT REGEXP_REPLACE(string, search, replace)
* @link https://www.postgresql.org/docs/current/functions-matching.html#FUNCTIONS-POSIX-TABLE
+ *
+ * @example SELECT REGEXP_REPLACE(string, search, replace)
*/
class RegexpReplace extends FunctionNode
{
@@ -17,12 +20,12 @@ class RegexpReplace extends FunctionNode
private $replace;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
- return 'REGEXP_REPLACE('.$this->string->dispatch($sqlWalker).', '.$this->search->dispatch($sqlWalker).', '.$this->replace->dispatch($sqlWalker).')';
+ return 'REGEXP_REPLACE(' . $this->string->dispatch($sqlWalker) . ', ' . $this->search->dispatch($sqlWalker) . ', ' . $this->replace->dispatch($sqlWalker) . ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Postgresql/Second.php b/src/Query/Postgresql/Second.php
index 4bd64232..21790beb 100644
--- a/src/Query/Postgresql/Second.php
+++ b/src/Query/Postgresql/Second.php
@@ -4,12 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class Second extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'FLOOR(EXTRACT(SECOND FROM %s))',
@@ -17,7 +21,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Postgresql/StrToDate.php b/src/Query/Postgresql/StrToDate.php
index 55d57121..205c1a89 100644
--- a/src/Query/Postgresql/StrToDate.php
+++ b/src/Query/Postgresql/StrToDate.php
@@ -4,6 +4,8 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class StrToDate extends FunctionNode
{
@@ -11,7 +13,7 @@ class StrToDate extends FunctionNode
public $dateFormat = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -21,7 +23,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'TO_DATE(' .
$this->dateString->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Postgresql/StringAgg.php b/src/Query/Postgresql/StringAgg.php
index 67b6688b..73d34d6d 100644
--- a/src/Query/Postgresql/StringAgg.php
+++ b/src/Query/Postgresql/StringAgg.php
@@ -8,6 +8,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function sprintf;
+
/**
* @author Roberto Júnior
* @author Vaskevich Eugeniy
@@ -47,7 +49,7 @@ public function parse(Parser $parser): void
public function getSql(SqlWalker $sqlWalker): string
{
- return \sprintf(
+ return sprintf(
'string_agg(%s%s, %s%s)',
($this->isDistinct ? 'DISTINCT ' : ''),
$sqlWalker->walkPathExpression($this->expression),
diff --git a/src/Query/Postgresql/Year.php b/src/Query/Postgresql/Year.php
index 4c9d2328..83a168d7 100644
--- a/src/Query/Postgresql/Year.php
+++ b/src/Query/Postgresql/Year.php
@@ -4,12 +4,16 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function sprintf;
class Year extends FunctionNode
{
private $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'EXTRACT(YEAR FROM %s)',
@@ -17,7 +21,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
);
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/SortableNullsWalker.php b/src/Query/SortableNullsWalker.php
index 34cdc021..fa5f8c5f 100644
--- a/src/Query/SortableNullsWalker.php
+++ b/src/Query/SortableNullsWalker.php
@@ -4,6 +4,11 @@
use Doctrine\ORM\Query;
+use function count;
+use function is_array;
+use function str_replace;
+use function strtoupper;
+
/**
* The SortableNullsWalker is a TreeWalker that walks over a DQL AST and constructs
* the corresponding SQL to allow ORDER BY x ASC NULLS FIRST|LAST.
@@ -33,12 +38,11 @@ class SortableNullsWalker extends Query\SqlWalker
public const NULLS_LAST = 'NULLS LAST';
/**
- * @param $orderByItem
- * @return array|string
+ * {@inheritDoc}
*/
public function walkOrderByItem($orderByItem)
{
- $sql = parent::walkOrderByItem($orderByItem);
+ $sql = parent::walkOrderByItem($orderByItem);
$hint = $this->getQuery()->getHint('sortableNulls.fields');
$expr = $orderByItem->expression;
$type = strtoupper($orderByItem->type);
@@ -47,12 +51,12 @@ public function walkOrderByItem($orderByItem)
// check for a state field
if (
$expr instanceof Query\AST\PathExpression &&
- $expr->type == Query\AST\PathExpression::TYPE_STATE_FIELD
+ $expr->type === Query\AST\PathExpression::TYPE_STATE_FIELD
) {
$fieldName = $expr->field;
- $dqlAlias = $expr->identificationVariable;
- $search = $this->walkPathExpression($expr) . ' ' . $type;
- $index = $dqlAlias . '.' . $fieldName;
+ $dqlAlias = $expr->identificationVariable;
+ $search = $this->walkPathExpression($expr) . ' ' . $type;
+ $index = $dqlAlias . '.' . $fieldName;
if (isset($hint[$index])) {
$sql = str_replace($search, $search . ' ' . $hint[$index], $sql);
}
diff --git a/src/Query/Sqlite/AbstractStrfTime.php b/src/Query/Sqlite/AbstractStrfTime.php
index 8fde4ed9..c8ce727d 100644
--- a/src/Query/Sqlite/AbstractStrfTime.php
+++ b/src/Query/Sqlite/AbstractStrfTime.php
@@ -4,15 +4,15 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
abstract class AbstractStrfTime extends FunctionNode
{
public $date;
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return "STRFTIME('"
. $this->getFormat()
@@ -21,7 +21,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
. ')';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Sqlite/ConcatWs.php b/src/Query/Sqlite/ConcatWs.php
index d479fa12..62b474ac 100644
--- a/src/Query/Sqlite/ConcatWs.php
+++ b/src/Query/Sqlite/ConcatWs.php
@@ -4,17 +4,22 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Bas de Ruiter
- */
+use function count;
+use function implode;
+use function sprintf;
+use function strtolower;
+
+/** @author Bas de Ruiter */
class ConcatWs extends FunctionNode
{
private $values = [];
private $notEmpty = false;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -27,16 +32,16 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$lexer = $parser->getLexer();
- while (count($this->values) < 3 || $lexer->lookahead->type == Lexer::T_COMMA) {
+ while (count($this->values) < 3 || $lexer->lookahead->type === Lexer::T_COMMA) {
$parser->match(Lexer::T_COMMA);
$peek = $lexer->glimpse();
- $this->values[] = $peek->value == '('
+ $this->values[] = $peek->value === '('
? $parser->FunctionDeclaration()
: $parser->ArithmeticExpression();
}
- while ($lexer->lookahead->type == Lexer::T_IDENTIFIER) {
+ while ($lexer->lookahead->type === Lexer::T_IDENTIFIER) {
switch (strtolower($lexer->lookahead->value)) {
case 'notempty':
$parser->match(Lexer::T_IDENTIFIER);
@@ -53,7 +58,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
$separator = $this->values[0]->simpleArithmeticExpression->value;
@@ -63,7 +68,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.
diff --git a/src/Query/Sqlite/Date.php b/src/Query/Sqlite/Date.php
index f6173545..f1efdfa8 100644
--- a/src/Query/Sqlite/Date.php
+++ b/src/Query/Sqlite/Date.php
@@ -2,9 +2,7 @@
namespace DoctrineExtensions\Query\Sqlite;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
class Date extends AbstractStrfTime
{
protected function getFormat(): string
diff --git a/src/Query/Sqlite/DateFormat.php b/src/Query/Sqlite/DateFormat.php
index 8ed2e81e..b700c823 100644
--- a/src/Query/Sqlite/DateFormat.php
+++ b/src/Query/Sqlite/DateFormat.php
@@ -5,6 +5,10 @@
use Doctrine\ORM\Query\AST\ArithmeticExpression;
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
+
+use function str_replace;
/**
* This class fakes a DATE_FORMAT method for SQLite, so that we can use sqlite as drop-in replacement
@@ -18,11 +22,7 @@ class DateFormat extends FunctionNode
private $format;
- /**
- * @param \Doctrine\ORM\Query\SqlWalker $sqlWalker
- * @return string
- */
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'STRFTIME('
. $sqlWalker->walkArithmeticPrimary($this->format)
@@ -31,10 +31,7 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
. ')';
}
- /**
- * @param \Doctrine\ORM\Query\Parser $parser
- */
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -46,8 +43,6 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
/**
* Convert the MySql DATE_FORMAT() substitutions to Sqlite STRFTIME() substitutions
- * @param ArithmeticExpression $expr
- * @return ArithmeticExpression
*/
private function convertFormat(ArithmeticExpression $expr): ArithmeticExpression
{
diff --git a/src/Query/Sqlite/Day.php b/src/Query/Sqlite/Day.php
index 0c316829..61942c57 100644
--- a/src/Query/Sqlite/Day.php
+++ b/src/Query/Sqlite/Day.php
@@ -2,9 +2,7 @@
namespace DoctrineExtensions\Query\Sqlite;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
class Day extends NumberFromStrfTime
{
protected function getFormat(): string
diff --git a/src/Query/Sqlite/Greatest.php b/src/Query/Sqlite/Greatest.php
index d577b1c2..7d820203 100644
--- a/src/Query/Sqlite/Greatest.php
+++ b/src/Query/Sqlite/Greatest.php
@@ -7,6 +7,8 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
+use function count;
+
/**
* @author Vas N
* @author Guven Atbakan
@@ -17,18 +19,17 @@ class Greatest extends FunctionNode
private $values = [];
- /**
- * @param Parser $parser
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->field = $parser->ArithmeticExpression();
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
- while (count($this->values) < 1 ||
- $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
+ while (
+ count($this->values) < 1 ||
+ $lexer->lookahead->type !== Lexer::T_CLOSE_PARENTHESIS
+ ) {
$parser->match(Lexer::T_COMMA);
$this->values[] = $parser->ArithmeticExpression();
}
@@ -36,10 +37,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
$query = 'MAX(';
diff --git a/src/Query/Sqlite/Hour.php b/src/Query/Sqlite/Hour.php
index 230d07e1..60893137 100644
--- a/src/Query/Sqlite/Hour.php
+++ b/src/Query/Sqlite/Hour.php
@@ -2,9 +2,7 @@
namespace DoctrineExtensions\Query\Sqlite;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
class Hour extends NumberFromStrfTime
{
protected function getFormat(): string
diff --git a/src/Query/Sqlite/IfElse.php b/src/Query/Sqlite/IfElse.php
index f54f49c6..f57fe325 100644
--- a/src/Query/Sqlite/IfElse.php
+++ b/src/Query/Sqlite/IfElse.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Mikhail Bubnov
- */
+use function sprintf;
+
+/** @author Mikhail Bubnov */
class IfElse extends FunctionNode
{
private $expr = [];
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -26,7 +28,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return sprintf(
'CASE WHEN %s THEN %s ELSE %s END',
diff --git a/src/Query/Sqlite/IfNull.php b/src/Query/Sqlite/IfNull.php
index 77f26c43..11cb6eb9 100644
--- a/src/Query/Sqlite/IfNull.php
+++ b/src/Query/Sqlite/IfNull.php
@@ -4,17 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author winkbrace
- */
+/** @author winkbrace */
class IfNull extends FunctionNode
{
private $expr1;
private $expr2;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -24,7 +24,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'IFNULL('
. $sqlWalker->walkArithmeticPrimary($this->expr1)
diff --git a/src/Query/Sqlite/JulianDay.php b/src/Query/Sqlite/JulianDay.php
index 4341b732..3d50ee5f 100644
--- a/src/Query/Sqlite/JulianDay.php
+++ b/src/Query/Sqlite/JulianDay.php
@@ -2,9 +2,7 @@
namespace DoctrineExtensions\Query\Sqlite;
-/**
- * @author Einar Gangsø
- */
+/** @author Einar Gangsø */
class JulianDay extends NumberFromStrfTime
{
protected function getFormat(): string
diff --git a/src/Query/Sqlite/Least.php b/src/Query/Sqlite/Least.php
index 6d17c35e..0ce11c0e 100644
--- a/src/Query/Sqlite/Least.php
+++ b/src/Query/Sqlite/Least.php
@@ -7,27 +7,26 @@
use Doctrine\ORM\Query\Parser;
use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Vas N
- */
+use function count;
+
+/** @author Vas N */
class Least extends FunctionNode
{
private $field = null;
private $values = [];
- /**
- * @param Parser $parser
- */
public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->field = $parser->ArithmeticExpression();
- $lexer = $parser->getLexer();
+ $lexer = $parser->getLexer();
- while (count($this->values) < 1 ||
- $lexer->lookahead->type != Lexer::T_CLOSE_PARENTHESIS) {
+ while (
+ count($this->values) < 1 ||
+ $lexer->lookahead->type !== Lexer::T_CLOSE_PARENTHESIS
+ ) {
$parser->match(Lexer::T_COMMA);
$this->values[] = $parser->ArithmeticExpression();
}
@@ -35,10 +34,6 @@ public function parse(Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- /**
- * @param SqlWalker $sqlWalker
- * @return string
- */
public function getSql(SqlWalker $sqlWalker): string
{
$query = 'MIN(';
diff --git a/src/Query/Sqlite/Minute.php b/src/Query/Sqlite/Minute.php
index c787b743..d6686a1c 100644
--- a/src/Query/Sqlite/Minute.php
+++ b/src/Query/Sqlite/Minute.php
@@ -2,9 +2,7 @@
namespace DoctrineExtensions\Query\Sqlite;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
class Minute extends NumberFromStrfTime
{
protected function getFormat(): string
diff --git a/src/Query/Sqlite/Month.php b/src/Query/Sqlite/Month.php
index 49dfcbb7..7cecd9eb 100644
--- a/src/Query/Sqlite/Month.php
+++ b/src/Query/Sqlite/Month.php
@@ -2,9 +2,7 @@
namespace DoctrineExtensions\Query\Sqlite;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
class Month extends NumberFromStrfTime
{
protected function getFormat(): string
diff --git a/src/Query/Sqlite/NumberFromStrfTime.php b/src/Query/Sqlite/NumberFromStrfTime.php
index d071b72b..bbc45859 100644
--- a/src/Query/Sqlite/NumberFromStrfTime.php
+++ b/src/Query/Sqlite/NumberFromStrfTime.php
@@ -2,9 +2,11 @@
namespace DoctrineExtensions\Query\Sqlite;
+use Doctrine\ORM\Query\SqlWalker;
+
abstract class NumberFromStrfTime extends AbstractStrfTime
{
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return "CAST(STRFTIME('"
. $this->getFormat()
diff --git a/src/Query/Sqlite/Random.php b/src/Query/Sqlite/Random.php
index b13cfdb4..4c9b3b60 100644
--- a/src/Query/Sqlite/Random.php
+++ b/src/Query/Sqlite/Random.php
@@ -4,15 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
class Random extends FunctionNode
{
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'RANDOM()';
}
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
diff --git a/src/Query/Sqlite/Replace.php b/src/Query/Sqlite/Replace.php
index 6b00f1c6..cbbfd36d 100644
--- a/src/Query/Sqlite/Replace.php
+++ b/src/Query/Sqlite/Replace.php
@@ -4,10 +4,10 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author winkbrace
- */
+/** @author winkbrace */
class Replace extends FunctionNode
{
public $search = null;
@@ -16,7 +16,7 @@ class Replace extends FunctionNode
public $subject = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
@@ -28,7 +28,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
return 'REPLACE(' .
$this->subject->dispatch($sqlWalker) . ', ' .
diff --git a/src/Query/Sqlite/Round.php b/src/Query/Sqlite/Round.php
index 8d96e9a8..658ff4fa 100644
--- a/src/Query/Sqlite/Round.php
+++ b/src/Query/Sqlite/Round.php
@@ -4,17 +4,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author winkbrace
- */
+/** @author winkbrace */
class Round extends FunctionNode
{
private $firstExpression = null;
private $secondExpression = null;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$lexer = $parser->getLexer();
$parser->match(Lexer::T_IDENTIFIER);
@@ -22,7 +22,7 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$this->firstExpression = $parser->SimpleArithmeticExpression();
// parse second parameter if available
- if (Lexer::T_COMMA === $lexer->lookahead->type) {
+ if ($lexer->lookahead->type === Lexer::T_COMMA) {
$parser->match(Lexer::T_COMMA);
$this->secondExpression = $parser->ArithmeticPrimary();
}
@@ -30,10 +30,10 @@ public function parse(\Doctrine\ORM\Query\Parser $parser): void
$parser->match(Lexer::T_CLOSE_PARENTHESIS);
}
- public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker): string
+ public function getSql(SqlWalker $sqlWalker): string
{
// use second parameter if parsed
- if (null !== $this->secondExpression) {
+ if ($this->secondExpression !== null) {
return 'ROUND('
. $this->firstExpression->dispatch($sqlWalker)
. ', '
diff --git a/src/Query/Sqlite/StrfTime.php b/src/Query/Sqlite/StrfTime.php
index b329632d..280bb32a 100644
--- a/src/Query/Sqlite/StrfTime.php
+++ b/src/Query/Sqlite/StrfTime.php
@@ -5,23 +5,17 @@
use Doctrine\ORM\Query\AST\Functions\FunctionNode;
use Doctrine\ORM\Query\Lexer;
use Doctrine\ORM\Query\Parser;
+use Doctrine\ORM\Query\QueryException;
use Doctrine\ORM\Query\SqlWalker;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
class StrfTime extends FunctionNode
{
public $date;
public $formatter;
- /**
- * @param SqlWalker $sqlWalker
- *
- * @throws \Doctrine\ORM\Query\QueryException
- * @return string
- */
+ /** @throws QueryException */
public function getSql(SqlWalker $sqlWalker): string
{
return 'strftime('
diff --git a/src/Query/Sqlite/Week.php b/src/Query/Sqlite/Week.php
index 3fdb3926..5d48a2bb 100644
--- a/src/Query/Sqlite/Week.php
+++ b/src/Query/Sqlite/Week.php
@@ -3,26 +3,26 @@
namespace DoctrineExtensions\Query\Sqlite;
use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\Parser;
-/**
- * @author Aleksandr Klimenkov
- */
+/** @author Aleksandr Klimenkov */
class Week extends NumberFromStrfTime
{
/**
* Currently not in use
+ *
* @var int
*/
public $mode;
- public function parse(\Doctrine\ORM\Query\Parser $parser): void
+ public function parse(Parser $parser): void
{
$parser->match(Lexer::T_IDENTIFIER);
$parser->match(Lexer::T_OPEN_PARENTHESIS);
$this->date = $parser->ArithmeticPrimary();
- if (Lexer::T_COMMA === $parser->getLexer()->lookahead->type) {
+ if ($parser->getLexer()->lookahead->type === Lexer::T_COMMA) {
$parser->match(Lexer::T_COMMA);
$this->mode = $parser->Literal();
}
diff --git a/src/Query/Sqlite/WeekDay.php b/src/Query/Sqlite/WeekDay.php
index 99635afd..fe860885 100644
--- a/src/Query/Sqlite/WeekDay.php
+++ b/src/Query/Sqlite/WeekDay.php
@@ -2,9 +2,7 @@
namespace DoctrineExtensions\Query\Sqlite;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
class WeekDay extends NumberFromStrfTime
{
protected function getFormat(): string
diff --git a/src/Query/Sqlite/Year.php b/src/Query/Sqlite/Year.php
index 1cd4ae5c..8807ab4c 100644
--- a/src/Query/Sqlite/Year.php
+++ b/src/Query/Sqlite/Year.php
@@ -2,9 +2,7 @@
namespace DoctrineExtensions\Query\Sqlite;
-/**
- * @author Tarjei Huse
- */
+/** @author Tarjei Huse */
class Year extends NumberFromStrfTime
{
protected function getFormat(): string
diff --git a/src/Types/CarbonDateTimeType.php b/src/Types/CarbonDateTimeType.php
index 7535cf79..03350b46 100644
--- a/src/Types/CarbonDateTimeType.php
+++ b/src/Types/CarbonDateTimeType.php
@@ -3,6 +3,8 @@
namespace DoctrineExtensions\Types;
use Carbon\Carbon;
+use DateTime;
+use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\DateTimeType;
@@ -10,22 +12,33 @@ class CarbonDateTimeType extends DateTimeType
{
public const CARBONDATETIME = 'carbondatetime';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
- return static::CARBONDATETIME;
+ return self::CARBONDATETIME;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return Carbon|DateTimeInterface
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
$result = parent::convertToPHPValue($value, $platform);
- if ($result instanceof \DateTime) {
+ if ($result instanceof DateTime) {
return Carbon::instance($result);
}
return $result;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/src/Types/CarbonDateTimeTzType.php b/src/Types/CarbonDateTimeTzType.php
index 08794863..ff8f183b 100644
--- a/src/Types/CarbonDateTimeTzType.php
+++ b/src/Types/CarbonDateTimeTzType.php
@@ -3,6 +3,8 @@
namespace DoctrineExtensions\Types;
use Carbon\Carbon;
+use DateTime;
+use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\DateTimeTzType;
@@ -10,22 +12,33 @@ class CarbonDateTimeTzType extends DateTimeTzType
{
public const CARBONDATETIMETZ = 'carbondatetimetz';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
- return static::CARBONDATETIMETZ;
+ return self::CARBONDATETIMETZ;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return Carbon|DateTimeInterface
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
$result = parent::convertToPHPValue($value, $platform);
- if ($result instanceof \DateTime) {
+ if ($result instanceof DateTime) {
return Carbon::instance($result);
}
return $result;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/src/Types/CarbonDateType.php b/src/Types/CarbonDateType.php
index 0f7ebf82..0e398cc4 100644
--- a/src/Types/CarbonDateType.php
+++ b/src/Types/CarbonDateType.php
@@ -3,6 +3,8 @@
namespace DoctrineExtensions\Types;
use Carbon\Carbon;
+use DateTime;
+use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\DateType;
@@ -10,22 +12,33 @@ class CarbonDateType extends DateType
{
public const CARBONDATE = 'carbondate';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
- return static::CARBONDATE;
+ return self::CARBONDATE;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return Carbon|DateTimeInterface
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
$result = parent::convertToPHPValue($value, $platform);
- if ($result instanceof \DateTime) {
+ if ($result instanceof DateTime) {
return Carbon::instance($result);
}
return $result;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/src/Types/CarbonImmutableDateTimeType.php b/src/Types/CarbonImmutableDateTimeType.php
index 327c95d8..d03dcadf 100644
--- a/src/Types/CarbonImmutableDateTimeType.php
+++ b/src/Types/CarbonImmutableDateTimeType.php
@@ -3,6 +3,8 @@
namespace DoctrineExtensions\Types;
use Carbon\CarbonImmutable;
+use DateTime;
+use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\DateTimeType;
@@ -10,22 +12,33 @@ class CarbonImmutableDateTimeType extends DateTimeType
{
public const CARBONDATETIME = 'carbondatetime_immutable';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
- return static::CARBONDATETIME;
+ return self::CARBONDATETIME;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return CarbonImmutable|DateTimeInterface
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
$result = parent::convertToPHPValue($value, $platform);
- if ($result instanceof \DateTime) {
+ if ($result instanceof DateTime) {
return CarbonImmutable::instance($result);
}
return $result;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/src/Types/CarbonImmutableDateTimeTzType.php b/src/Types/CarbonImmutableDateTimeTzType.php
index f7fa0bc4..f73747cf 100644
--- a/src/Types/CarbonImmutableDateTimeTzType.php
+++ b/src/Types/CarbonImmutableDateTimeTzType.php
@@ -3,6 +3,8 @@
namespace DoctrineExtensions\Types;
use Carbon\CarbonImmutable;
+use DateTime;
+use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\DateTimeTzType;
@@ -10,22 +12,33 @@ class CarbonImmutableDateTimeTzType extends DateTimeTzType
{
public const CARBONDATETIMETZ = 'carbondatetimetz_immutable';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
- return static::CARBONDATETIMETZ;
+ return self::CARBONDATETIMETZ;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return CarbonImmutable|DateTimeInterface
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
$result = parent::convertToPHPValue($value, $platform);
- if ($result instanceof \DateTime) {
+ if ($result instanceof DateTime) {
return CarbonImmutable::instance($result);
}
return $result;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/src/Types/CarbonImmutableDateType.php b/src/Types/CarbonImmutableDateType.php
index efc99e2c..72cc6e11 100644
--- a/src/Types/CarbonImmutableDateType.php
+++ b/src/Types/CarbonImmutableDateType.php
@@ -3,6 +3,8 @@
namespace DoctrineExtensions\Types;
use Carbon\CarbonImmutable;
+use DateTime;
+use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\DateType;
@@ -10,22 +12,33 @@ class CarbonImmutableDateType extends DateType
{
public const CARBONDATE = 'carbondate_immutable';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
- return static::CARBONDATE;
+ return self::CARBONDATE;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return CarbonImmutable|DateTimeInterface
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
$result = parent::convertToPHPValue($value, $platform);
- if ($result instanceof \DateTime) {
+ if ($result instanceof DateTime) {
return CarbonImmutable::instance($result);
}
return $result;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/src/Types/CarbonImmutableTimeType.php b/src/Types/CarbonImmutableTimeType.php
index dd55b131..b1402fc8 100644
--- a/src/Types/CarbonImmutableTimeType.php
+++ b/src/Types/CarbonImmutableTimeType.php
@@ -3,6 +3,8 @@
namespace DoctrineExtensions\Types;
use Carbon\CarbonImmutable;
+use DateTime;
+use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\TimeType;
@@ -10,22 +12,33 @@ class CarbonImmutableTimeType extends TimeType
{
public const CARBONTIME = 'carbontime_immutable';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
- return static::CARBONTIME;
+ return self::CARBONTIME;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return CarbonImmutable|DateTimeInterface
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
$result = parent::convertToPHPValue($value, $platform);
- if ($result instanceof \DateTime) {
+ if ($result instanceof DateTime) {
return CarbonImmutable::instance($result);
}
return $result;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/src/Types/CarbonTimeType.php b/src/Types/CarbonTimeType.php
index 168c5c1e..fa38fcf8 100644
--- a/src/Types/CarbonTimeType.php
+++ b/src/Types/CarbonTimeType.php
@@ -3,6 +3,8 @@
namespace DoctrineExtensions\Types;
use Carbon\Carbon;
+use DateTime;
+use DateTimeInterface;
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\TimeType;
@@ -10,22 +12,33 @@ class CarbonTimeType extends TimeType
{
public const CARBONTIME = 'carbontime';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
- return static::CARBONTIME;
+ return self::CARBONTIME;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return Carbon|DateTimeInterface
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
$result = parent::convertToPHPValue($value, $platform);
- if ($result instanceof \DateTime) {
+ if ($result instanceof DateTime) {
return Carbon::instance($result);
}
return $result;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/src/Types/PolygonType.php b/src/Types/PolygonType.php
index 33ee1e8b..aba8d939 100644
--- a/src/Types/PolygonType.php
+++ b/src/Types/PolygonType.php
@@ -4,48 +4,75 @@
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
+use Exception;
+
+use function preg_match;
+use function sprintf;
class PolygonType extends Type
{
public const FIELD = 'polygon';
+ /**
+ * {@inheritDoc}
+ */
+ public function getName()
+ {
+ return self::FIELD;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
{
return 'POLYGON';
}
+ /**
+ * {@inheritDoc}
+ */
public function canRequireSQLConversion()
{
return true;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return string
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
preg_match('/POLYGON\(\((.*)\)\)/', $value, $matches);
- if (!isset($matches[1])) {
+ if (! isset($matches[1])) {
throw new Exception('No Polygon Points');
}
return $matches[1];
}
+ /**
+ * {@inheritDoc}
+ */
public function convertToPHPValueSQL($sqlExpr, $platform)
{
return sprintf('AsText(%s)', $sqlExpr);
}
+ /**
+ * {@inheritDoc}
+ */
public function convertToDatabaseValue($value, AbstractPlatform $platform)
{
return sprintf('POLYGON((%s))', $value);
}
+ /**
+ * {@inheritDoc}
+ */
public function convertToDatabaseValueSQL($sqlExpr, AbstractPlatform $platform)
{
return sprintf('ST_PolygonFromText(%s)', $sqlExpr);
}
-
- public function getName()
- {
- return self::FIELD;
- }
}
diff --git a/src/Types/ZendDateType.php b/src/Types/ZendDateType.php
index d770afc1..4a1e4cef 100755
--- a/src/Types/ZendDateType.php
+++ b/src/Types/ZendDateType.php
@@ -5,8 +5,12 @@
use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\ConversionException;
use Doctrine\DBAL\Types\Type;
+use Zend_Date;
+use Zend_Locale_Format;
-if (!class_exists('Zend_Date')) {
+use function class_exists;
+
+if (! class_exists('Zend_Date')) {
require_once 'Zend/Date.php';
}
@@ -19,43 +23,60 @@ class ZendDateType extends Type
{
public const ZENDDATE = 'zenddate';
+ /**
+ * {@inheritDoc}
+ */
public function getName()
{
return self::ZENDDATE;
}
+ /**
+ * {@inheritDoc}
+ */
public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
{
return $platform->getDateTimeTypeDeclarationSQL($fieldDeclaration);
}
+ /**
+ * {@inheritDoc}
+ */
public function convertToDatabaseValue($value, AbstractPlatform $platform)
{
- return ($value !== null)
- ? $value->toString(\Zend_Locale_Format::convertPhpToIsoFormat(
+ return $value !== null
+ ? $value->toString(Zend_Locale_Format::convertPhpToIsoFormat(
$platform->getDateTimeFormatString()
))
: null;
}
+ /**
+ * {@inheritDoc}
+ *
+ * @return Zend_Date
+ */
public function convertToPHPValue($value, AbstractPlatform $platform)
{
if ($value === null) {
- return;
+ return null;
}
- $dateTimeFormatString = \Zend_Locale_Format::convertPhpToIsoFormat(
+ $dateTimeFormatString = Zend_Locale_Format::convertPhpToIsoFormat(
$platform->getDateTimeFormatString()
);
- $val = new \Zend_Date($value, $dateTimeFormatString);
- if (!$val) {
+ $val = new Zend_Date($value, $dateTimeFormatString);
+ if (! $val) {
throw ConversionException::conversionFailed($value, $this->getName());
}
return $val;
}
+ /**
+ * {@inheritDoc}
+ */
public function requiresSQLCommentHint(AbstractPlatform $platform)
{
return true;
diff --git a/tests/Config/MysqlYamlTest.php b/tests/Config/MysqlYamlTest.php
index c116f6b2..bcae2f70 100755
--- a/tests/Config/MysqlYamlTest.php
+++ b/tests/Config/MysqlYamlTest.php
@@ -3,22 +3,35 @@
namespace DoctrineExtensions\Tests\Config;
use PHPUnit\Framework\TestCase;
+use Symfony\Component\Yaml\Parser;
+
+use function array_diff;
+use function array_keys;
+use function array_map;
+use function array_merge;
+use function basename;
+use function explode;
+use function file_get_contents;
+use function glob;
+use function implode;
+use function preg_match;
+use function sort;
+use function str_replace;
+use function strtolower;
/**
* Test that checks the README describes all of the query types
- *
- * @author Steve Lacey
*/
class MysqlYamlTest extends TestCase
{
- /** @var array */
+ /** @var array */
protected $functions;
public function setUp(): void
{
- $yaml = new \Symfony\Component\Yaml\Parser();
+ $yaml = new Parser();
- $config = $yaml->parse(file_get_contents(__DIR__ . '/../../config/mysql.yml'));
+ $config = $yaml->parse(file_get_contents(__DIR__ . '/../../config/mysql.yml'));
$this->functions = array_merge(
$config['doctrine']['orm']['dql']['datetime_functions'],
$config['doctrine']['orm']['dql']['numeric_functions'],
@@ -26,12 +39,12 @@ public function setUp(): void
);
}
- public function testFunctions()
+ public function testFunctions(): void
{
$documented = $this->functions;
$available = array_map(
- function ($path) {
+ static function ($path) {
return 'DoctrineExtensions\\Query\\Mysql\\' . str_replace('.php', '', basename($path));
},
glob(__DIR__ . '/../../src/Query/Mysql/*')
@@ -49,7 +62,7 @@ function ($path) {
}
}
- public function testReadme()
+ public function testReadme(): void
{
preg_match('#\| MySQL \| `(.*)` \|#', file_get_contents(__DIR__ . '/../../README.md'), $matches);
diff --git a/tests/Entities/Blank.php b/tests/Entities/Blank.php
index 1b55da0a..4963e9e0 100644
--- a/tests/Entities/Blank.php
+++ b/tests/Entities/Blank.php
@@ -2,11 +2,13 @@
namespace DoctrineExtensions\Tests\Entities;
-/**
- * @Entity
- */
+/** @Entity */
class Blank
{
- /** @Id @Column(type="string") @GeneratedValue */
+ /**
+ * @Id
+ * @Column(type="string")
+ * @GeneratedValue
+ */
public $id;
}
diff --git a/tests/Entities/BlogPost.php b/tests/Entities/BlogPost.php
index 3db402c3..ca1c372d 100644
--- a/tests/Entities/BlogPost.php
+++ b/tests/Entities/BlogPost.php
@@ -2,26 +2,22 @@
namespace DoctrineExtensions\Tests\Entities;
-/**
- * @Entity
- */
+/** @Entity */
class BlogPost
{
- /** @Id @Column(type="string") @GeneratedValue */
- public $id;
-
/**
- * @Column(type="DateTime")
+ * @Id
+ * @Column(type="string")
+ * @GeneratedValue
*/
+ public $id;
+
+ /** @Column(type="DateTime") */
public $created;
- /**
- * @Column(type="decimal", precision=12, scale=8)
- */
+ /** @Column(type="decimal", precision=12, scale=8) */
public $longitude;
- /**
- * @Column(type="decimal", precision=12, scale=8)
- */
+ /** @Column(type="decimal", precision=12, scale=8) */
public $latitude;
}
diff --git a/tests/Entities/CarbonDate.php b/tests/Entities/CarbonDate.php
index 65d3b6fe..375b479d 100644
--- a/tests/Entities/CarbonDate.php
+++ b/tests/Entities/CarbonDate.php
@@ -14,43 +14,27 @@ class CarbonDate
*/
public $id;
- /**
- * @Column(type="CarbonDate", nullable=true)
- */
+ /** @Column(type="CarbonDate", nullable=true) */
public $date;
- /**
- * @Column(type="CarbonDateTime", nullable=true)
- */
+ /** @Column(type="CarbonDateTime", nullable=true) */
public $datetime;
- /**
- * @Column(type="CarbonDateTimeTz", nullable=true)
- */
- public $datetime_tz;
+ /** @Column(type="CarbonDateTimeTz", nullable=true) */
+ public $datetimeTz;
- /**
- * @Column(type="CarbonTime", nullable=true)
- */
+ /** @Column(type="CarbonTime", nullable=true) */
public $time;
- /**
- * @Column(type="CarbonImmutableDate", nullable=true)
- */
- public $date_immutable;
+ /** @Column(type="CarbonImmutableDate", nullable=true) */
+ public $dateImmutable;
- /**
- * @Column(type="CarbonImmutableDateTime", nullable=true)
- */
- public $datetime_immutable;
+ /** @Column(type="CarbonImmutableDateTime", nullable=true) */
+ public $datetimeImmutable;
- /**
- * @Column(type="CarbonImmutableDateTimeTz", nullable=true)
- */
- public $datetime_tz_immutable;
+ /** @Column(type="CarbonImmutableDateTimeTz", nullable=true) */
+ public $datetimeTzImmutable;
- /**
- * @Column(type="CarbonImmutableTime", nullable=true)
- */
- public $time_immutable;
+ /** @Column(type="CarbonImmutableTime", nullable=true) */
+ public $timeImmutable;
}
diff --git a/tests/Entities/Date.php b/tests/Entities/Date.php
index 5af9358a..904fe987 100644
--- a/tests/Entities/Date.php
+++ b/tests/Entities/Date.php
@@ -2,16 +2,16 @@
namespace DoctrineExtensions\Tests\Entities;
-/**
- * @Entity
- */
+/** @Entity */
class Date
{
- /** @Id @Column(type="string") @GeneratedValue */
- public $id;
-
/**
- * @Column(type="datetime")
+ * @Id
+ * @Column(type="string")
+ * @GeneratedValue
*/
+ public $id;
+
+ /** @Column(type="datetime") */
public $created;
}
diff --git a/tests/Entities/Product.php b/tests/Entities/Product.php
index 80ad23ea..772251b0 100644
--- a/tests/Entities/Product.php
+++ b/tests/Entities/Product.php
@@ -2,31 +2,25 @@
namespace DoctrineExtensions\Tests\Entities;
-/**
- * @Entity
- */
+/** @Entity */
class Product
{
- /** @Id @Column(type="string") @GeneratedValue */
- public $id;
-
/**
+ * @Id
* @Column(type="string")
+ * @GeneratedValue
*/
+ public $id;
+
+ /** @Column(type="string") */
public $name;
- /**
- * @Column(type="DateTime")
- */
+ /** @Column(type="DateTime") */
public $created;
- /**
- * @Column(type="decimal", precision=10, scale=2)
- */
+ /** @Column(type="decimal", precision=10, scale=2) */
public $price;
- /**
- * @Column(type="decimal", precision=5, scale=2)
- */
+ /** @Column(type="decimal", precision=5, scale=2) */
public $weight;
}
diff --git a/tests/Entities/Set.php b/tests/Entities/Set.php
index dec693ad..810fc2f8 100644
--- a/tests/Entities/Set.php
+++ b/tests/Entities/Set.php
@@ -2,16 +2,16 @@
namespace DoctrineExtensions\Tests\Entities;
-/**
- * @Entity
- */
+/** @Entity */
class Set
{
- /** @Id @Column(type="string") @GeneratedValue */
- public $id;
-
/**
- * @Column(type="String")
+ * @Id
+ * @Column(type="string")
+ * @GeneratedValue
*/
+ public $id;
+
+ /** @Column(type="String") */
public $set;
}
diff --git a/tests/Entities/ZendDate.php b/tests/Entities/ZendDate.php
index b1531371..576698d5 100644
--- a/tests/Entities/ZendDate.php
+++ b/tests/Entities/ZendDate.php
@@ -14,14 +14,12 @@ class ZendDate
*/
public $id;
- /**
- * @Column(type="ZendDate")
- */
+ /** @Column(type="ZendDate") */
public $date;
public function __construct($id, $date)
{
- $this->id = $id;
+ $this->id = $id;
$this->date = $date;
}
}
diff --git a/tests/Query/ConfigLoader.php b/tests/Query/ConfigLoader.php
index febbf474..f5d04a46 100644
--- a/tests/Query/ConfigLoader.php
+++ b/tests/Query/ConfigLoader.php
@@ -5,21 +5,22 @@
use Doctrine\ORM\Configuration;
use Symfony\Component\Yaml\Parser;
+use function array_key_exists;
+use function file_get_contents;
+use function realpath;
+use function strtoupper;
+
class ConfigLoader
{
- const MYSQL = 'mysql';
+ public const MYSQL = 'mysql';
- const ORACLE = 'oracle';
+ public const ORACLE = 'oracle';
- const POSTGRES = 'postgres';
+ public const POSTGRES = 'postgres';
- const SQLITE = 'sqlite';
+ public const SQLITE = 'sqlite';
- /**
- * @param Configuration $configuration
- * @param string $database
- */
- public static function load(Configuration $configuration, $database)
+ public static function load(Configuration $configuration, string $database): void
{
$parser = new Parser();
// Load the corresponding config file.
@@ -28,17 +29,19 @@ public static function load(Configuration $configuration, $database)
// Load the existing function classes.
if (array_key_exists('datetime_functions', $parsed)) {
- foreach ($parsed[ 'datetime_functions' ] as $key => $value) {
+ foreach ($parsed['datetime_functions'] as $key => $value) {
$configuration->addCustomDatetimeFunction(strtoupper($key), $value);
}
}
+
if (array_key_exists('numeric_functions', $parsed)) {
- foreach ($parsed[ 'numeric_functions' ] as $key => $value) {
+ foreach ($parsed['numeric_functions'] as $key => $value) {
$configuration->addCustomNumericFunction(strtoupper($key), $value);
}
}
+
if (array_key_exists('string_functions', $parsed)) {
- foreach ($parsed[ 'string_functions' ] as $key => $value) {
+ foreach ($parsed['string_functions'] as $key => $value) {
$configuration->addCustomStringFunction(strtoupper($key), $value);
}
}
diff --git a/tests/Query/DbTestCase.php b/tests/Query/DbTestCase.php
index be0b5378..12ab1e8a 100644
--- a/tests/Query/DbTestCase.php
+++ b/tests/Query/DbTestCase.php
@@ -24,10 +24,10 @@ public function setUp(): void
$this->configuration->setProxyNamespace('DoctrineExtensions\Tests\Proxies');
$this->configuration->setAutoGenerateProxyClasses(true);
$this->configuration->setMetadataDriverImpl($this->configuration->newDefaultAnnotationDriver(__DIR__ . '/../Entities'));
- $this->entityManager = EntityManager::create(['driver' => 'pdo_sqlite', 'memory' => true ], $this->configuration);
+ $this->entityManager = EntityManager::create(['driver' => 'pdo_sqlite', 'memory' => true], $this->configuration);
}
- public function assertDqlProducesSql($actualDql, $expectedSql, $params = [])
+ public function assertDqlProducesSql($actualDql, $expectedSql, $params = []): void
{
$q = $this->entityManager->createQuery($actualDql);
diff --git a/tests/Query/Mysql/AcosTest.php b/tests/Query/Mysql/AcosTest.php
index 330da45a..2751030c 100644
--- a/tests/Query/Mysql/AcosTest.php
+++ b/tests/Query/Mysql/AcosTest.php
@@ -6,10 +6,10 @@
class AcosTest extends MysqlTestCase
{
- public function testAcos()
+ public function testAcos(): void
{
$this->assertDqlProducesSql(
- "SELECT ACOS(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT ACOS(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT ACOS(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/AddTimeTest.php b/tests/Query/Mysql/AddTimeTest.php
index 2e97a58d..c1e8821a 100644
--- a/tests/Query/Mysql/AddTimeTest.php
+++ b/tests/Query/Mysql/AddTimeTest.php
@@ -6,7 +6,7 @@
class AddTimeTest extends MysqlTestCase
{
- public function testDateAdd()
+ public function testDateAdd(): void
{
$this->assertDqlProducesSql(
"SELECT ADDTIME('2019-03-01 14:35:00','01:02:03') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/AsciiTest.php b/tests/Query/Mysql/AsciiTest.php
index 433b57a7..2ff9fabc 100644
--- a/tests/Query/Mysql/AsciiTest.php
+++ b/tests/Query/Mysql/AsciiTest.php
@@ -6,10 +6,10 @@
class AsciiTest extends MysqlTestCase
{
- public function testAscii()
+ public function testAscii(): void
{
$this->assertDqlProducesSql(
- "SELECT ASCII(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT ASCII(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT ASCII(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/AsinTest.php b/tests/Query/Mysql/AsinTest.php
index 76857d71..7e0972f2 100644
--- a/tests/Query/Mysql/AsinTest.php
+++ b/tests/Query/Mysql/AsinTest.php
@@ -6,10 +6,10 @@
class AsinTest extends MysqlTestCase
{
- public function testAsin()
+ public function testAsin(): void
{
$this->assertDqlProducesSql(
- "SELECT ASIN(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT ASIN(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT ASIN(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/Atan2Test.php b/tests/Query/Mysql/Atan2Test.php
index 81ebfb99..9655f55f 100644
--- a/tests/Query/Mysql/Atan2Test.php
+++ b/tests/Query/Mysql/Atan2Test.php
@@ -4,10 +4,10 @@
class Atan2Test
{
- public function testAtan2()
+ public function testAtan2(): void
{
$this->assertDqlProducesSql(
- "SELECT ATAN2(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT ATAN2(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT ATAN2(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/AtanTest.php b/tests/Query/Mysql/AtanTest.php
index 1e9783c2..bc4a9495 100644
--- a/tests/Query/Mysql/AtanTest.php
+++ b/tests/Query/Mysql/AtanTest.php
@@ -6,10 +6,10 @@
class AtanTest extends MysqlTestCase
{
- public function testAtan()
+ public function testAtan(): void
{
$this->assertDqlProducesSql(
- "SELECT ATAN(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT ATAN(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT ATAN(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/BinaryTest.php b/tests/Query/Mysql/BinaryTest.php
index 694c7756..87287f70 100644
--- a/tests/Query/Mysql/BinaryTest.php
+++ b/tests/Query/Mysql/BinaryTest.php
@@ -6,7 +6,7 @@
class BinaryTest extends MysqlTestCase
{
- public function testBinary()
+ public function testBinary(): void
{
$this->assertDqlProducesSql(
"SELECT BINARY('TEST') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/BitCountTest.php b/tests/Query/Mysql/BitCountTest.php
index 16727380..66d8e721 100644
--- a/tests/Query/Mysql/BitCountTest.php
+++ b/tests/Query/Mysql/BitCountTest.php
@@ -6,10 +6,10 @@
class BitCountTest extends MysqlTestCase
{
- public function testBitCount()
+ public function testBitCount(): void
{
$this->assertDqlProducesSql(
- "SELECT BIT_COUNT(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT BIT_COUNT(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT BIT_COUNT(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/BitXorTest.php b/tests/Query/Mysql/BitXorTest.php
index 56730a3f..623e880b 100644
--- a/tests/Query/Mysql/BitXorTest.php
+++ b/tests/Query/Mysql/BitXorTest.php
@@ -6,10 +6,10 @@
class BitXorTest extends MysqlTestCase
{
- public function testBitCount()
+ public function testBitCount(): void
{
$this->assertDqlProducesSql(
- "SELECT BIT_XOR(2, 2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT BIT_XOR(2, 2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT 2 ^ 2 AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/CastTest.php b/tests/Query/Mysql/CastTest.php
index 9864e822..fdf573c2 100644
--- a/tests/Query/Mysql/CastTest.php
+++ b/tests/Query/Mysql/CastTest.php
@@ -10,38 +10,38 @@ class CastTest extends MysqlTestCase
private $entityShort = 'BlogPost';
- public function testSimpleSqlQuery()
+ public function testSimpleSqlQuery(): void
{
$query = $this->entityManager->createQuery(
- "SELECT CAST(blog.latitude AS SIGNED) FROM {$this->entityLong} blog"
+ 'SELECT CAST(blog.latitude AS SIGNED) FROM ' . $this->entityLong . ' blog'
);
static::assertEquals(
- "SELECT CAST(b0_.latitude AS SIGNED) AS sclr_0 FROM {$this->entityShort} b0_",
+ 'SELECT CAST(b0_.latitude AS SIGNED) AS sclr_0 FROM ' . $this->entityShort . ' b0_',
$query->getSQL()
);
}
- public function testMultipleCastWithFieldAliasSqlQuery()
+ public function testMultipleCastWithFieldAliasSqlQuery(): void
{
$query = $this->entityManager->createQuery(
- "SELECT CAST(blog.latitude AS UNSIGNED), CAST(blog.latitude AS SIGNED) FROM {$this->entityLong} blog"
+ 'SELECT CAST(blog.latitude AS UNSIGNED), CAST(blog.latitude AS SIGNED) FROM ' . $this->entityLong . ' blog'
);
static::assertEquals(
- "SELECT CAST(b0_.latitude AS UNSIGNED) AS sclr_0, CAST(b0_.latitude AS SIGNED) AS sclr_1 FROM {$this->entityShort} b0_",
+ 'SELECT CAST(b0_.latitude AS UNSIGNED) AS sclr_0, CAST(b0_.latitude AS SIGNED) AS sclr_1 FROM ' . $this->entityShort . ' b0_',
$query->getSQL()
);
}
- public function testWithParametersSqlQuery()
+ public function testWithParametersSqlQuery(): void
{
$query = $this->entityManager->createQuery(
- "SELECT CAST(blog.latitude AS DECIMAL(10, 2)) FROM {$this->entityLong} blog"
+ 'SELECT CAST(blog.latitude AS DECIMAL(10, 2)) FROM ' . $this->entityLong . ' blog'
);
static::assertEquals(
- "SELECT CAST(b0_.latitude AS DECIMAL(10, 2)) AS sclr_0 FROM {$this->entityShort} b0_",
+ 'SELECT CAST(b0_.latitude AS DECIMAL(10, 2)) AS sclr_0 FROM ' . $this->entityShort . ' b0_',
$query->getSQL()
);
}
diff --git a/tests/Query/Mysql/CeilTest.php b/tests/Query/Mysql/CeilTest.php
index febed374..40a7865b 100644
--- a/tests/Query/Mysql/CeilTest.php
+++ b/tests/Query/Mysql/CeilTest.php
@@ -6,10 +6,10 @@
class CeilTest extends MysqlTestCase
{
- public function testCeil()
+ public function testCeil(): void
{
$this->assertDqlProducesSql(
- "SELECT CEIL(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT CEIL(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT CEIL(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/CharLengthTest.php b/tests/Query/Mysql/CharLengthTest.php
index aa7b8ebc..186dc25a 100644
--- a/tests/Query/Mysql/CharLengthTest.php
+++ b/tests/Query/Mysql/CharLengthTest.php
@@ -6,10 +6,10 @@
class CharLengthTest extends MysqlTestCase
{
- public function testCharLength()
+ public function testCharLength(): void
{
$this->assertDqlProducesSql(
- "SELECT CHAR_LENGTH(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT CHAR_LENGTH(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT CHAR_LENGTH(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/CollateTest.php b/tests/Query/Mysql/CollateTest.php
index 32e1189a..0a315712 100644
--- a/tests/Query/Mysql/CollateTest.php
+++ b/tests/Query/Mysql/CollateTest.php
@@ -6,7 +6,7 @@
class CollateTest extends MysqlTestCase
{
- public function testCollate()
+ public function testCollate(): void
{
$this->assertDqlProducesSql(
"SELECT COLLATE('A',latin1_german2_ci) from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/ConcatWsTest.php b/tests/Query/Mysql/ConcatWsTest.php
index e69994bc..6ba8ef91 100644
--- a/tests/Query/Mysql/ConcatWsTest.php
+++ b/tests/Query/Mysql/ConcatWsTest.php
@@ -6,7 +6,7 @@
class ConcatWsTest extends MysqlTestCase
{
- public function testConcatWs()
+ public function testConcatWs(): void
{
$this->assertDqlProducesSql(
"SELECT CONCAT_WS(',', 'TEST', 'FOO') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/ConvertTzTest.php b/tests/Query/Mysql/ConvertTzTest.php
index 9164f7e0..0fd8411f 100644
--- a/tests/Query/Mysql/ConvertTzTest.php
+++ b/tests/Query/Mysql/ConvertTzTest.php
@@ -6,7 +6,7 @@
class ConvertTzTest extends MysqlTestCase
{
- public function testDefaultSql()
+ public function testDefaultSql(): void
{
$query = $this->entityManager->createQuery(
"SELECT CONVERT_TZ('2004-01-01 12:00:00','GMT','MET') FROM DoctrineExtensions\Tests\Entities\Blank b"
diff --git a/tests/Query/Mysql/CosTest.php b/tests/Query/Mysql/CosTest.php
index 7ee7e871..d9ce6d45 100644
--- a/tests/Query/Mysql/CosTest.php
+++ b/tests/Query/Mysql/CosTest.php
@@ -6,10 +6,10 @@
class CosTest extends MysqlTestCase
{
- public function testCos()
+ public function testCos(): void
{
$this->assertDqlProducesSql(
- "SELECT COS(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT COS(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT COS(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/CotTest.php b/tests/Query/Mysql/CotTest.php
index 5f710840..5569e9ff 100644
--- a/tests/Query/Mysql/CotTest.php
+++ b/tests/Query/Mysql/CotTest.php
@@ -6,10 +6,10 @@
class CotTest extends MysqlTestCase
{
- public function testCot()
+ public function testCot(): void
{
$this->assertDqlProducesSql(
- "SELECT COT(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT COT(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT COT(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/CountIfTest.php b/tests/Query/Mysql/CountIfTest.php
index 08312deb..a29a2b0a 100644
--- a/tests/Query/Mysql/CountIfTest.php
+++ b/tests/Query/Mysql/CountIfTest.php
@@ -6,18 +6,18 @@
class CountIfTest extends MysqlTestCase
{
- public function testCountIf()
+ public function testCountIf(): void
{
$this->assertDqlProducesSql(
- "SELECT COUNTIF(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT COUNTIF(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT COUNT(CASE 2 WHEN 3 THEN 1 ELSE NULL END) AS sclr_0 FROM Blank b0_'
);
}
- public function testCountIfInverse()
+ public function testCountIfInverse(): void
{
$this->assertDqlProducesSql(
- "SELECT COUNTIF(2, 3 INVERSE) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT COUNTIF(2, 3 INVERSE) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT COUNT(CASE 2 WHEN 3 THEN NULL ELSE 1 END) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/Crc32Test.php b/tests/Query/Mysql/Crc32Test.php
index 36135dca..69607af2 100644
--- a/tests/Query/Mysql/Crc32Test.php
+++ b/tests/Query/Mysql/Crc32Test.php
@@ -6,7 +6,7 @@
class Crc32Test extends MysqlTestCase
{
- public function testCrc32()
+ public function testCrc32(): void
{
$this->assertDqlProducesSql(
"SELECT CRC32('TEST') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/DateAddTest.php b/tests/Query/Mysql/DateAddTest.php
index 9f44be45..41dfe285 100644
--- a/tests/Query/Mysql/DateAddTest.php
+++ b/tests/Query/Mysql/DateAddTest.php
@@ -6,7 +6,7 @@
class DateAddTest extends MysqlTestCase
{
- public function testDateAdd()
+ public function testDateAdd(): void
{
$this->assertDqlProducesSql(
"SELECT DATEADD(2, 5, 'MINUTE') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/DateDiffTest.php b/tests/Query/Mysql/DateDiffTest.php
index 00ef5655..e84b3dfb 100644
--- a/tests/Query/Mysql/DateDiffTest.php
+++ b/tests/Query/Mysql/DateDiffTest.php
@@ -6,7 +6,7 @@
class DateDiffTest extends MysqlTestCase
{
- public function testDateDiff()
+ public function testDateDiff(): void
{
$this->assertDqlProducesSql(
"SELECT DATEDIFF('2017-06-25', '2017-06-15') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -14,7 +14,7 @@ public function testDateDiff()
);
}
- public function testDateDiffWithColumnAlias()
+ public function testDateDiffWithColumnAlias(): void
{
$this->assertDqlProducesSql(
"SELECT DATEADD(p.created, 1, 'DAY') as modified_date FROM DoctrineExtensions\Tests\Entities\Date as p WHERE DATEDIFF(CURRENT_TIME(), modified_date) < 7",
diff --git a/tests/Query/Mysql/DateFormatTest.php b/tests/Query/Mysql/DateFormatTest.php
index af0ca37f..88fff505 100644
--- a/tests/Query/Mysql/DateFormatTest.php
+++ b/tests/Query/Mysql/DateFormatTest.php
@@ -6,7 +6,7 @@
class DateFormatTest extends MysqlTestCase
{
- public function testDateFormat()
+ public function testDateFormat(): void
{
$this->assertDqlProducesSql(
"SELECT DATE_FORMAT(2, 'Y') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/DateSubTest.php b/tests/Query/Mysql/DateSubTest.php
index 5c4aeef7..a7ca8911 100644
--- a/tests/Query/Mysql/DateSubTest.php
+++ b/tests/Query/Mysql/DateSubTest.php
@@ -6,7 +6,7 @@
class DateSubTest extends MysqlTestCase
{
- public function testDateSub()
+ public function testDateSub(): void
{
$this->assertDqlProducesSql(
"SELECT DATESUB(2, 5, 'MINUTE') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/DateTest.php b/tests/Query/Mysql/DateTest.php
index 576a3ccb..f4fecdcc 100644
--- a/tests/Query/Mysql/DateTest.php
+++ b/tests/Query/Mysql/DateTest.php
@@ -5,17 +5,19 @@
use Doctrine\ORM\Version;
use DoctrineExtensions\Tests\Query\MysqlTestCase;
+use function date;
+
class DateTest extends MysqlTestCase
{
- public function testDateDiff()
+ public function testDateDiff(): void
{
- $dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE DATEDIFF(CURRENT_TIME(), p.created) < 7";
+ $dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE DATEDIFF(CURRENT_TIME(), p.created) < 7';
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE DATEDIFF(CURRENT_TIME, d0_.created) < 7';
$this->assertDqlProducesSql($dql, $sql);
}
- public function testDateAdd()
+ public function testDateAdd(): void
{
$dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE DATEADD(CURRENT_TIME(), 4, 'MONTH') < 7";
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE DATE_ADD(CURRENT_TIME, INTERVAL 4 MONTH) < 7';
@@ -23,7 +25,7 @@ public function testDateAdd()
$this->assertDqlProducesSql($dql, $sql);
}
- public function testDateAddWithColumnAlias()
+ public function testDateAddWithColumnAlias(): void
{
if (Version::VERSION < 2.2) {
$this->markTestSkipped('Alias is not supported in Doctrine 2.1 and lower');
@@ -35,7 +37,7 @@ public function testDateAddWithColumnAlias()
$this->assertDqlProducesSql($dql, $sql);
}
- public function testDateAddWithNegative()
+ public function testDateAddWithNegative(): void
{
$dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE DATEADD(CURRENT_TIME(), -4, 'MONTH') < 7";
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE DATE_ADD(CURRENT_TIME, INTERVAL -4 MONTH) < 7';
@@ -43,7 +45,7 @@ public function testDateAddWithNegative()
$this->assertDqlProducesSql($dql, $sql);
}
- public function testDateSub()
+ public function testDateSub(): void
{
$dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE DATESUB(CURRENT_TIME(), 4, 'MONTH') < 7";
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE DATE_SUB(CURRENT_TIME, INTERVAL 4 MONTH) < 7';
@@ -51,7 +53,7 @@ public function testDateSub()
$this->assertDqlProducesSql($dql, $sql);
}
- public function testExtract()
+ public function testExtract(): void
{
$dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE 201702 > EXTRACT(YEAR_MONTH FROM p.created)';
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE 201702 > EXTRACT(YEAR_MONTH FROM d0_.created)';
@@ -59,7 +61,7 @@ public function testExtract()
$this->assertDqlProducesSql($dql, $sql);
}
- public function testFromUnixtime()
+ public function testFromUnixtime(): void
{
$dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE FROM_UNIXTIME(CURRENT_TIME()) = '2000-01-01 00:00:00'";
$sql = "SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE FROM_UNIXTIME(CURRENT_TIME) = '2000-01-01 00:00:00'";
@@ -67,7 +69,7 @@ public function testFromUnixtime()
$this->assertDqlProducesSql($dql, $sql);
}
- public function testPeriodDiff()
+ public function testPeriodDiff(): void
{
if (Version::VERSION < 2.3) {
$this->markTestSkipped('Doctrine 2.2 moans about something or other');
@@ -79,9 +81,9 @@ public function testPeriodDiff()
$this->assertDqlProducesSql($dql, $sql);
}
- public function testStrToDate()
+ public function testStrToDate(): void
{
- $dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE STR_TO_DATE(p.created, :dateFormat) < :currentTime";
+ $dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE STR_TO_DATE(p.created, :dateFormat) < :currentTime';
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE STR_TO_DATE(d0_.created, ?) < ?';
$this->assertDqlProducesSql($dql, $sql, [
@@ -90,9 +92,9 @@ public function testStrToDate()
]);
}
- public function testUnixTimpestamp()
+ public function testUnixTimpestamp(): void
{
- $dql = "SELECT UNIX_TIMESTAMP(p.created) FROM DoctrineExtensions\Tests\Entities\Date p";
+ $dql = 'SELECT UNIX_TIMESTAMP(p.created) FROM DoctrineExtensions\Tests\Entities\Date p';
$sql = 'SELECT UNIX_TIMESTAMP(d0_.created) AS sclr_0 FROM Date d0_';
$this->assertDqlProducesSql($dql, $sql);
diff --git a/tests/Query/Mysql/DayNameTest.php b/tests/Query/Mysql/DayNameTest.php
index e2032409..94159f4b 100644
--- a/tests/Query/Mysql/DayNameTest.php
+++ b/tests/Query/Mysql/DayNameTest.php
@@ -6,10 +6,10 @@
class DayNameTest extends MysqlTestCase
{
- public function testDayName()
+ public function testDayName(): void
{
$this->assertDqlProducesSql(
- "SELECT DAYNAME(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DAYNAME(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT DAYNAME(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/DayOfWeekTest.php b/tests/Query/Mysql/DayOfWeekTest.php
index 69edf307..e8cd7e96 100644
--- a/tests/Query/Mysql/DayOfWeekTest.php
+++ b/tests/Query/Mysql/DayOfWeekTest.php
@@ -6,10 +6,10 @@
class DayOfWeekTest extends MysqlTestCase
{
- public function testDayOfWeek()
+ public function testDayOfWeek(): void
{
$this->assertDqlProducesSql(
- "SELECT DAYOFWEEK(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DAYOFWEEK(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT DAYOFWEEK(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/DayOfYearTest.php b/tests/Query/Mysql/DayOfYearTest.php
index f15d0bf4..c7ece0e2 100644
--- a/tests/Query/Mysql/DayOfYearTest.php
+++ b/tests/Query/Mysql/DayOfYearTest.php
@@ -6,10 +6,10 @@
class DayOfYearTest extends MysqlTestCase
{
- public function testDayOfYear()
+ public function testDayOfYear(): void
{
$this->assertDqlProducesSql(
- "SELECT DAYOFYEAR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DAYOFYEAR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT DAYOFYEAR(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/DayTest.php b/tests/Query/Mysql/DayTest.php
index 4d5c768b..2f9e5c7e 100644
--- a/tests/Query/Mysql/DayTest.php
+++ b/tests/Query/Mysql/DayTest.php
@@ -6,10 +6,10 @@
class DayTest extends MysqlTestCase
{
- public function testDay()
+ public function testDay(): void
{
$this->assertDqlProducesSql(
- "SELECT DAY(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DAY(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT DAY(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/DegressTest.php b/tests/Query/Mysql/DegressTest.php
index ad8c0713..f5e1d0be 100644
--- a/tests/Query/Mysql/DegressTest.php
+++ b/tests/Query/Mysql/DegressTest.php
@@ -6,10 +6,10 @@
class DegressTest extends MysqlTestCase
{
- public function testDegrees()
+ public function testDegrees(): void
{
$this->assertDqlProducesSql(
- "SELECT DEGREES(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DEGREES(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT DEGREES(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/DivTest.php b/tests/Query/Mysql/DivTest.php
index 1eeb3985..7910b153 100644
--- a/tests/Query/Mysql/DivTest.php
+++ b/tests/Query/Mysql/DivTest.php
@@ -6,10 +6,10 @@
class DivTest extends MysqlTestCase
{
- public function testDiv()
+ public function testDiv(): void
{
$this->assertDqlProducesSql(
- "SELECT DIV(2, 5) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DIV(2, 5) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT 2 DIV 5 AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/ExpTest.php b/tests/Query/Mysql/ExpTest.php
index 8139b003..ee233268 100644
--- a/tests/Query/Mysql/ExpTest.php
+++ b/tests/Query/Mysql/ExpTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Mysql;
-class ExpTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+class ExpTest extends MysqlTestCase
{
- public function testExp()
+ public function testExp(): void
{
$this->assertDqlProducesSql(
- "SELECT EXP(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT EXP(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXP(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/FieldTest.php b/tests/Query/Mysql/FieldTest.php
index d31d25b0..6a52f71d 100644
--- a/tests/Query/Mysql/FieldTest.php
+++ b/tests/Query/Mysql/FieldTest.php
@@ -6,10 +6,10 @@
class FieldTest extends MysqlTestCase
{
- public function testField()
+ public function testField(): void
{
$this->assertDqlProducesSql(
- "SELECT FIELD(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT FIELD(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT FIELD(2, 3, 4) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/FindInSetTest.php b/tests/Query/Mysql/FindInSetTest.php
index c0485076..98989577 100644
--- a/tests/Query/Mysql/FindInSetTest.php
+++ b/tests/Query/Mysql/FindInSetTest.php
@@ -6,10 +6,10 @@
class FindInSetTest extends MysqlTestCase
{
- public function testFindInSet()
+ public function testFindInSet(): void
{
$this->assertDqlProducesSql(
- "SELECT FIND_IN_SET(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT FIND_IN_SET(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT FIND_IN_SET(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/FloorTest.php b/tests/Query/Mysql/FloorTest.php
index 66ed06b1..24f569e7 100644
--- a/tests/Query/Mysql/FloorTest.php
+++ b/tests/Query/Mysql/FloorTest.php
@@ -6,10 +6,10 @@
class FloorTest extends MysqlTestCase
{
- public function testFloor()
+ public function testFloor(): void
{
$this->assertDqlProducesSql(
- "SELECT FLOOR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT FLOOR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT FLOOR(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/FormatTest.php b/tests/Query/Mysql/FormatTest.php
index cc7aa41f..06b92de7 100644
--- a/tests/Query/Mysql/FormatTest.php
+++ b/tests/Query/Mysql/FormatTest.php
@@ -6,10 +6,10 @@
class FormatTest extends MysqlTestCase
{
- public function testFormat()
+ public function testFormat(): void
{
$this->assertDqlProducesSql(
- "SELECT FORMAT(1000.00, 2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT FORMAT(1000.00, 2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT FORMAT(1000.00, 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/FromBase64.php b/tests/Query/Mysql/FromBase64.php
index 5edcd359..80bdf7d1 100644
--- a/tests/Query/Mysql/FromBase64.php
+++ b/tests/Query/Mysql/FromBase64.php
@@ -6,10 +6,10 @@
class FromBase64 extends MysqlTestCase
{
- public function testFromBase64()
+ public function testFromBase64(): void
{
$this->assertDqlProducesSql(
- "SELECT FROM_BASE64(title) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT FROM_BASE64(title) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT FROM_BASE64(title) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/FromUnixTimeTest.php b/tests/Query/Mysql/FromUnixTimeTest.php
index cebd5be9..53668955 100644
--- a/tests/Query/Mysql/FromUnixTimeTest.php
+++ b/tests/Query/Mysql/FromUnixTimeTest.php
@@ -6,10 +6,10 @@
class FromUnixTimeTest extends MysqlTestCase
{
- public function testFromUnixTime()
+ public function testFromUnixTime(): void
{
$this->assertDqlProducesSql(
- "SELECT FROM_UNIXTIME(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT FROM_UNIXTIME(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT FROM_UNIXTIME(2) AS sclr_0 FROM Blank b0_'
);
diff --git a/tests/Query/Mysql/GreatestTest.php b/tests/Query/Mysql/GreatestTest.php
index 153dd3ae..59bc6867 100644
--- a/tests/Query/Mysql/GreatestTest.php
+++ b/tests/Query/Mysql/GreatestTest.php
@@ -6,10 +6,10 @@
class GreatestTest extends MysqlTestCase
{
- public function testGreatest()
+ public function testGreatest(): void
{
$this->assertDqlProducesSql(
- "SELECT GREATEST(2, 5, 8) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT GREATEST(2, 5, 8) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT GREATEST(2, 5, 8) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/GroupConcatTest.php b/tests/Query/Mysql/GroupConcatTest.php
index 460880e3..db412bba 100644
--- a/tests/Query/Mysql/GroupConcatTest.php
+++ b/tests/Query/Mysql/GroupConcatTest.php
@@ -6,31 +6,31 @@
class GroupConcatTest extends MysqlTestCase
{
- public function testGroupConcat()
+ public function testGroupConcat(): void
{
$this->assertDqlProducesSql(
- "SELECT GROUP_CONCAT(blank.id) from DoctrineExtensions\Tests\Entities\Blank as blank",
+ 'SELECT GROUP_CONCAT(blank.id) from DoctrineExtensions\Tests\Entities\Blank as blank',
'SELECT GROUP_CONCAT(b0_.id) AS sclr_0 FROM Blank b0_'
);
}
- public function testGroupConcatWithDistinct()
+ public function testGroupConcatWithDistinct(): void
{
$this->assertDqlProducesSql(
- "SELECT GROUP_CONCAT(DISTINCT blank.id) from DoctrineExtensions\Tests\Entities\Blank as blank",
+ 'SELECT GROUP_CONCAT(DISTINCT blank.id) from DoctrineExtensions\Tests\Entities\Blank as blank',
'SELECT GROUP_CONCAT(DISTINCT b0_.id) AS sclr_0 FROM Blank b0_'
);
}
- public function testGroupConcatWithOrderBy()
+ public function testGroupConcatWithOrderBy(): void
{
$this->assertDqlProducesSql(
- "SELECT GROUP_CONCAT(blank.id ORDER BY blank.id) from DoctrineExtensions\Tests\Entities\Blank as blank",
+ 'SELECT GROUP_CONCAT(blank.id ORDER BY blank.id) from DoctrineExtensions\Tests\Entities\Blank as blank',
'SELECT GROUP_CONCAT(b0_.id ORDER BY b0_.id ASC) AS sclr_0 FROM Blank b0_'
);
}
- public function testGroupConcatWithSeparator()
+ public function testGroupConcatWithSeparator(): void
{
$this->assertDqlProducesSql(
"SELECT GROUP_CONCAT(blank.id SEPARATOR ' ') from DoctrineExtensions\Tests\Entities\Blank as blank",
diff --git a/tests/Query/Mysql/HexTest.php b/tests/Query/Mysql/HexTest.php
index 2fcb0268..2b6681a6 100644
--- a/tests/Query/Mysql/HexTest.php
+++ b/tests/Query/Mysql/HexTest.php
@@ -6,10 +6,10 @@
class HexTest extends MysqlTestCase
{
- public function testHex()
+ public function testHex(): void
{
$this->assertDqlProducesSql(
- "SELECT HEX(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT HEX(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT HEX(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/HourTest.php b/tests/Query/Mysql/HourTest.php
index e22e7c42..65676dae 100644
--- a/tests/Query/Mysql/HourTest.php
+++ b/tests/Query/Mysql/HourTest.php
@@ -6,10 +6,10 @@
class HourTest extends MysqlTestCase
{
- public function testHour()
+ public function testHour(): void
{
$this->assertDqlProducesSql(
- "SELECT HOUR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT HOUR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT HOUR(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/IfElseTest.php b/tests/Query/Mysql/IfElseTest.php
index 9cb58524..7fa9807f 100644
--- a/tests/Query/Mysql/IfElseTest.php
+++ b/tests/Query/Mysql/IfElseTest.php
@@ -6,18 +6,18 @@
class IfElseTest extends MysqlTestCase
{
- public function testIfElseWithoutNullValue()
+ public function testIfElseWithoutNullValue(): void
{
$this->assertDqlProducesSql(
- "SELECT IFELSE(2 < 3, 4, 5) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT IFELSE(2 < 3, 4, 5) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT IF(2 < 3, 4, 5) AS sclr_0 FROM Blank b0_'
);
}
- public function testIfElseWithNullValue()
+ public function testIfElseWithNullValue(): void
{
$this->assertDqlProducesSql(
- "SELECT IFELSE(2 < 3, NULL, 5) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT IFELSE(2 < 3, NULL, 5) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT IF(2 < 3, NULL, 5) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/IfNullTest.php b/tests/Query/Mysql/IfNullTest.php
index 0c17e08a..7bfa90b3 100644
--- a/tests/Query/Mysql/IfNullTest.php
+++ b/tests/Query/Mysql/IfNullTest.php
@@ -6,10 +6,10 @@
class IfNullTest extends MysqlTestCase
{
- public function testIfNull()
+ public function testIfNull(): void
{
$this->assertDqlProducesSql(
- "SELECT IFNULL(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT IFNULL(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT IFNULL(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/Inet6AtonTest.php b/tests/Query/Mysql/Inet6AtonTest.php
index 0256876a..c449d93c 100644
--- a/tests/Query/Mysql/Inet6AtonTest.php
+++ b/tests/Query/Mysql/Inet6AtonTest.php
@@ -6,7 +6,7 @@
class Inet6AtonTest extends MysqlTestCase
{
- public function testInet6Aton()
+ public function testInet6Aton(): void
{
$this->assertDqlProducesSql(
"SELECT INET6_ATON('2001:db8::b33f') FROM DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/Inet6NtoaTest.php b/tests/Query/Mysql/Inet6NtoaTest.php
index 8e288160..b2a43e0c 100644
--- a/tests/Query/Mysql/Inet6NtoaTest.php
+++ b/tests/Query/Mysql/Inet6NtoaTest.php
@@ -6,7 +6,7 @@
class Inet6NtoaTest extends MysqlTestCase
{
- public function testInet6Ntoa()
+ public function testInet6Ntoa(): void
{
$this->assertDqlProducesSql(
"SELECT INET6_NTOA(INET6_ATON('2001:db8::b33f')) FROM DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/InetAtonTest.php b/tests/Query/Mysql/InetAtonTest.php
index 43edfa48..e9776db8 100644
--- a/tests/Query/Mysql/InetAtonTest.php
+++ b/tests/Query/Mysql/InetAtonTest.php
@@ -6,7 +6,7 @@
class InetAtonTest extends MysqlTestCase
{
- public function testInetAton()
+ public function testInetAton(): void
{
$this->assertDqlProducesSql(
"SELECT INET_ATON('127.0.0.1') FROM DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/InetNtoaTest.php b/tests/Query/Mysql/InetNtoaTest.php
index d01677d4..b839085b 100644
--- a/tests/Query/Mysql/InetNtoaTest.php
+++ b/tests/Query/Mysql/InetNtoaTest.php
@@ -6,7 +6,7 @@
class InetNtoaTest extends MysqlTestCase
{
- public function testInetNtoa()
+ public function testInetNtoa(): void
{
$this->assertDqlProducesSql(
"SELECT INET_NTOA('3221225985') FROM DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/IsIpv4CompatTest.php b/tests/Query/Mysql/IsIpv4CompatTest.php
index d5cb76c2..edf7b9e2 100644
--- a/tests/Query/Mysql/IsIpv4CompatTest.php
+++ b/tests/Query/Mysql/IsIpv4CompatTest.php
@@ -6,7 +6,7 @@
class IsIpv4CompatTest extends MysqlTestCase
{
- public function testIsIpv4Compat()
+ public function testIsIpv4Compat(): void
{
$this->assertDqlProducesSql(
"SELECT IS_IPV4_COMPAT(INET6_ATON('::192.0.2.1')) FROM DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/IsIpv4MappedTest.php b/tests/Query/Mysql/IsIpv4MappedTest.php
index f878e6dd..8f83eb17 100644
--- a/tests/Query/Mysql/IsIpv4MappedTest.php
+++ b/tests/Query/Mysql/IsIpv4MappedTest.php
@@ -6,7 +6,7 @@
class IsIpv4MappedTest extends MysqlTestCase
{
- public function testIsIpv4Mapped()
+ public function testIsIpv4Mapped(): void
{
$this->assertDqlProducesSql(
"SELECT IS_IPV4_MAPPED(INET6_ATON('::ffff:192.0.2.1')) FROM DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/IsIpv4Test.php b/tests/Query/Mysql/IsIpv4Test.php
index 33939993..c82499e1 100644
--- a/tests/Query/Mysql/IsIpv4Test.php
+++ b/tests/Query/Mysql/IsIpv4Test.php
@@ -6,7 +6,7 @@
class IsIpv4Test extends MysqlTestCase
{
- public function testIsIpv4()
+ public function testIsIpv4(): void
{
$this->assertDqlProducesSql(
"SELECT IS_IPV4('192.0.2.1') FROM DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/IsIpv6Test.php b/tests/Query/Mysql/IsIpv6Test.php
index 97a6e496..0351dc53 100644
--- a/tests/Query/Mysql/IsIpv6Test.php
+++ b/tests/Query/Mysql/IsIpv6Test.php
@@ -6,7 +6,7 @@
class IsIpv6Test extends MysqlTestCase
{
- public function testIsIpv6()
+ public function testIsIpv6(): void
{
$this->assertDqlProducesSql(
"SELECT IS_IPV6('2001:db8::dead:b33f') FROM DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/JsonDepthTest.php b/tests/Query/Mysql/JsonDepthTest.php
index 4842ce06..988d7bb5 100644
--- a/tests/Query/Mysql/JsonDepthTest.php
+++ b/tests/Query/Mysql/JsonDepthTest.php
@@ -17,7 +17,7 @@ public function testJsonDepthWithTargetExplicit(): void
public function testJsonDepthWithTargetParam(): void
{
$this->assertDqlProducesSql(
- "SELECT JSON_DEPTH(:param) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT JSON_DEPTH(:param) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT JSON_DEPTH(?) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/LagTest.php b/tests/Query/Mysql/LagTest.php
index b7d4e020..38c71e35 100644
--- a/tests/Query/Mysql/LagTest.php
+++ b/tests/Query/Mysql/LagTest.php
@@ -6,7 +6,7 @@
class LagTest extends MysqlTestCase
{
- public function testLag()
+ public function testLag(): void
{
$this->assertDqlProducesSql(
'SELECT LAG(COUNT(b.id)) from DoctrineExtensions\Tests\Entities\Blank b',
diff --git a/tests/Query/Mysql/LastDayTest.php b/tests/Query/Mysql/LastDayTest.php
index c070cee3..c038420a 100644
--- a/tests/Query/Mysql/LastDayTest.php
+++ b/tests/Query/Mysql/LastDayTest.php
@@ -6,10 +6,10 @@
class LastDayTest extends MysqlTestCase
{
- public function testLastDay()
+ public function testLastDay(): void
{
$this->assertDqlProducesSql(
- "SELECT LAST_DAY(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT LAST_DAY(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT LAST_DAY(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/LeadTest.php b/tests/Query/Mysql/LeadTest.php
index 020847b9..e61b4f35 100644
--- a/tests/Query/Mysql/LeadTest.php
+++ b/tests/Query/Mysql/LeadTest.php
@@ -6,7 +6,7 @@
class LeadTest extends MysqlTestCase
{
- public function testLag()
+ public function testLag(): void
{
$this->assertDqlProducesSql(
'SELECT LEAD(COUNT(b.id)) from DoctrineExtensions\Tests\Entities\Blank b',
diff --git a/tests/Query/Mysql/LeastTest.php b/tests/Query/Mysql/LeastTest.php
index 0b4cab14..d5d3e008 100644
--- a/tests/Query/Mysql/LeastTest.php
+++ b/tests/Query/Mysql/LeastTest.php
@@ -6,10 +6,10 @@
class LeastTest extends MysqlTestCase
{
- public function testLeast()
+ public function testLeast(): void
{
$this->assertDqlProducesSql(
- "SELECT LEAST(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT LEAST(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT LEAST(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/Log10Test.php b/tests/Query/Mysql/Log10Test.php
index 6a51936c..87d4109a 100644
--- a/tests/Query/Mysql/Log10Test.php
+++ b/tests/Query/Mysql/Log10Test.php
@@ -6,10 +6,10 @@
class Log10Test extends MysqlTestCase
{
- public function testLog10()
+ public function testLog10(): void
{
$this->assertDqlProducesSql(
- "SELECT LOG10(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT LOG10(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT LOG10(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/Log2Test.php b/tests/Query/Mysql/Log2Test.php
index fca8eb0d..903a64b4 100644
--- a/tests/Query/Mysql/Log2Test.php
+++ b/tests/Query/Mysql/Log2Test.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Mysql;
-class Log2Test extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+class Log2Test extends MysqlTestCase
{
- public function testLog2()
+ public function testLog2(): void
{
$this->assertDqlProducesSql(
- "SELECT LOG2(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT LOG2(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT LOG2(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/LogTest.php b/tests/Query/Mysql/LogTest.php
index 180499a4..86c93d54 100644
--- a/tests/Query/Mysql/LogTest.php
+++ b/tests/Query/Mysql/LogTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Mysql;
-class LogTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+class LogTest extends MysqlTestCase
{
- public function testLog()
+ public function testLog(): void
{
$this->assertDqlProducesSql(
- "SELECT LOG(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT LOG(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT LOG(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/LpadTest.php b/tests/Query/Mysql/LpadTest.php
index 3c0cccb1..28fb1639 100644
--- a/tests/Query/Mysql/LpadTest.php
+++ b/tests/Query/Mysql/LpadTest.php
@@ -6,10 +6,10 @@
class LpadTest extends MysqlTestCase
{
- public function testLpad()
+ public function testLpad(): void
{
$this->assertDqlProducesSql(
- "SELECT LPAD(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT LPAD(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT LPAD(2, 3, 4) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/MakeDateTest.php b/tests/Query/Mysql/MakeDateTest.php
index 9e90ad50..775e380c 100644
--- a/tests/Query/Mysql/MakeDateTest.php
+++ b/tests/Query/Mysql/MakeDateTest.php
@@ -6,10 +6,10 @@
class MakeDateTest extends MysqlTestCase
{
- public function testMakeDate()
+ public function testMakeDate(): void
{
$this->assertDqlProducesSql(
- "SELECT MAKEDATE(2019, 5) FROM DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MAKEDATE(2019, 5) FROM DoctrineExtensions\Tests\Entities\Blank b',
'SELECT MAKEDATE(2019, 5) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/MatchAgainstTest.php b/tests/Query/Mysql/MatchAgainstTest.php
index 477c66dd..d35a0f53 100644
--- a/tests/Query/Mysql/MatchAgainstTest.php
+++ b/tests/Query/Mysql/MatchAgainstTest.php
@@ -6,7 +6,7 @@
class MatchAgainstTest extends MysqlTestCase
{
- public function testMatchAgainst()
+ public function testMatchAgainst(): void
{
$this->assertDqlProducesSql(
"SELECT MATCH(blank.id) AGAINST ('3') from DoctrineExtensions\Tests\Entities\Blank AS blank",
@@ -14,7 +14,7 @@ public function testMatchAgainst()
);
}
- public function testMatchAgainstMultipleFields()
+ public function testMatchAgainstMultipleFields(): void
{
$this->assertDqlProducesSql(
"SELECT MATCH(post.longitude, post.latitude) AGAINST ('3') from DoctrineExtensions\Tests\Entities\BlogPost AS post",
@@ -22,7 +22,7 @@ public function testMatchAgainstMultipleFields()
);
}
- public function testMatchAgainstInBooleanMode()
+ public function testMatchAgainstInBooleanMode(): void
{
$this->assertDqlProducesSql(
"SELECT MATCH(blank.id) AGAINST ('+3 -4' BOOLEAN) from DoctrineExtensions\Tests\Entities\Blank AS blank",
@@ -34,7 +34,7 @@ public function testMatchAgainstInBooleanMode()
);
}
- public function testMatchAgainstWithQueryExpansion()
+ public function testMatchAgainstWithQueryExpansion(): void
{
$this->assertDqlProducesSql(
"SELECT MATCH(blank.id) AGAINST ('3' EXPAND) from DoctrineExtensions\Tests\Entities\Blank AS blank",
diff --git a/tests/Query/Mysql/Md5Test.php b/tests/Query/Mysql/Md5Test.php
index 599de0b5..9c370943 100644
--- a/tests/Query/Mysql/Md5Test.php
+++ b/tests/Query/Mysql/Md5Test.php
@@ -6,7 +6,7 @@
class Md5Test extends MysqlTestCase
{
- public function testMd5()
+ public function testMd5(): void
{
$this->assertDqlProducesSql(
"SELECT MD5('2') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/MinuteTest.php b/tests/Query/Mysql/MinuteTest.php
index 8d69d0dc..a668bf72 100644
--- a/tests/Query/Mysql/MinuteTest.php
+++ b/tests/Query/Mysql/MinuteTest.php
@@ -6,10 +6,10 @@
class MinuteTest extends MysqlTestCase
{
- public function testMinute()
+ public function testMinute(): void
{
$this->assertDqlProducesSql(
- "SELECT MINUTE(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MINUTE(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT MINUTE(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/MonthNameTest.php b/tests/Query/Mysql/MonthNameTest.php
index d863ac37..e7796458 100644
--- a/tests/Query/Mysql/MonthNameTest.php
+++ b/tests/Query/Mysql/MonthNameTest.php
@@ -6,10 +6,10 @@
class MonthNameTest extends MysqlTestCase
{
- public function testMonthName()
+ public function testMonthName(): void
{
$this->assertDqlProducesSql(
- "SELECT MONTHNAME(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MONTHNAME(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT MONTHNAME(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/MonthTest.php b/tests/Query/Mysql/MonthTest.php
index 6c553323..c4a8b0ec 100644
--- a/tests/Query/Mysql/MonthTest.php
+++ b/tests/Query/Mysql/MonthTest.php
@@ -6,10 +6,10 @@
class MonthTest extends MysqlTestCase
{
- public function testMonth()
+ public function testMonth(): void
{
$this->assertDqlProducesSql(
- "SELECT MONTH(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MONTH(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT MONTH(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/NowTest.php b/tests/Query/Mysql/NowTest.php
index 218c13c3..cf98c237 100644
--- a/tests/Query/Mysql/NowTest.php
+++ b/tests/Query/Mysql/NowTest.php
@@ -6,10 +6,10 @@
class NowTest extends MysqlTestCase
{
- public function testNow()
+ public function testNow(): void
{
$this->assertDqlProducesSql(
- "SELECT NOW() from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT NOW() from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT NOW() AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/NullIfTest.php b/tests/Query/Mysql/NullIfTest.php
index 407c38c0..334b25ad 100644
--- a/tests/Query/Mysql/NullIfTest.php
+++ b/tests/Query/Mysql/NullIfTest.php
@@ -6,10 +6,10 @@
class NullIfTest extends MysqlTestCase
{
- public function testNullIf()
+ public function testNullIf(): void
{
$this->assertDqlProducesSql(
- "SELECT NULLIF(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT NULLIF(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT NULLIF(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/PiTest.php b/tests/Query/Mysql/PiTest.php
index 605c8d81..d694c8c3 100644
--- a/tests/Query/Mysql/PiTest.php
+++ b/tests/Query/Mysql/PiTest.php
@@ -6,10 +6,10 @@
class PiTest extends MysqlTestCase
{
- public function testPi()
+ public function testPi(): void
{
$this->assertDqlProducesSql(
- "SELECT PI() from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT PI() from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT PI() AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/PowerTest.php b/tests/Query/Mysql/PowerTest.php
index 4003db14..d325dd3f 100644
--- a/tests/Query/Mysql/PowerTest.php
+++ b/tests/Query/Mysql/PowerTest.php
@@ -6,10 +6,10 @@
class PowerTest extends MysqlTestCase
{
- public function testPower()
+ public function testPower(): void
{
$this->assertDqlProducesSql(
- "SELECT POWER(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT POWER(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT POWER(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/QuarterTest.php b/tests/Query/Mysql/QuarterTest.php
index 0af7dda1..fdf3b434 100644
--- a/tests/Query/Mysql/QuarterTest.php
+++ b/tests/Query/Mysql/QuarterTest.php
@@ -6,10 +6,10 @@
class QuarterTest extends MysqlTestCase
{
- public function testQuarter()
+ public function testQuarter(): void
{
$this->assertDqlProducesSql(
- "SELECT QUARTER(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT QUARTER(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT QUARTER(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/RadiansTest.php b/tests/Query/Mysql/RadiansTest.php
index 1690657d..5cc549d8 100644
--- a/tests/Query/Mysql/RadiansTest.php
+++ b/tests/Query/Mysql/RadiansTest.php
@@ -6,10 +6,10 @@
class RadiansTest extends MysqlTestCase
{
- public function testRadians()
+ public function testRadians(): void
{
$this->assertDqlProducesSql(
- "SELECT RADIANS(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT RADIANS(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT RADIANS(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/RandTest.php b/tests/Query/Mysql/RandTest.php
index cf972ad9..4642eaa7 100644
--- a/tests/Query/Mysql/RandTest.php
+++ b/tests/Query/Mysql/RandTest.php
@@ -6,18 +6,18 @@
class RandTest extends MysqlTestCase
{
- public function testRandWithParameter()
+ public function testRandWithParameter(): void
{
$this->assertDqlProducesSql(
- "SELECT RAND(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT RAND(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT RAND(2) AS sclr_0 FROM Blank b0_'
);
}
- public function testRandWithoutParameter()
+ public function testRandWithoutParameter(): void
{
$this->assertDqlProducesSql(
- "SELECT RAND() from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT RAND() from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT RAND() AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/RegexpTest.php b/tests/Query/Mysql/RegexpTest.php
index 93b0f434..abfc1ea2 100644
--- a/tests/Query/Mysql/RegexpTest.php
+++ b/tests/Query/Mysql/RegexpTest.php
@@ -6,7 +6,7 @@
class RegexpTest extends MysqlTestCase
{
- public function testRegexp()
+ public function testRegexp(): void
{
$this->assertDqlProducesSql(
"SELECT REGEXP('2', '3') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/ReplaceTest.php b/tests/Query/Mysql/ReplaceTest.php
index defcc628..2ef14ccb 100644
--- a/tests/Query/Mysql/ReplaceTest.php
+++ b/tests/Query/Mysql/ReplaceTest.php
@@ -6,10 +6,10 @@
class ReplaceTest extends MysqlTestCase
{
- public function testReplace()
+ public function testReplace(): void
{
$this->assertDqlProducesSql(
- "SELECT REPLACE(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT REPLACE(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT REPLACE(2, 3, 4) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/RoundTest.php b/tests/Query/Mysql/RoundTest.php
index 020fe1be..0d66930f 100644
--- a/tests/Query/Mysql/RoundTest.php
+++ b/tests/Query/Mysql/RoundTest.php
@@ -6,18 +6,18 @@
class RoundTest extends MysqlTestCase
{
- public function testRoundOneArgument()
+ public function testRoundOneArgument(): void
{
$this->assertDqlProducesSql(
- "SELECT ROUND(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT ROUND(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT ROUND(2) AS sclr_0 FROM Blank b0_'
);
}
- public function testRoundTwoArguments()
+ public function testRoundTwoArguments(): void
{
$this->assertDqlProducesSql(
- "SELECT ROUND(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT ROUND(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT ROUND(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/RpadTest.php b/tests/Query/Mysql/RpadTest.php
index df814d7b..6ac6764d 100644
--- a/tests/Query/Mysql/RpadTest.php
+++ b/tests/Query/Mysql/RpadTest.php
@@ -6,10 +6,10 @@
class RpadTest extends MysqlTestCase
{
- public function testRpad()
+ public function testRpad(): void
{
$this->assertDqlProducesSql(
- "SELECT RPAD(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT RPAD(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT RPAD(2, 3, 4) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/SecondTest.php b/tests/Query/Mysql/SecondTest.php
index 8772b0d4..4f41d6ae 100644
--- a/tests/Query/Mysql/SecondTest.php
+++ b/tests/Query/Mysql/SecondTest.php
@@ -6,10 +6,10 @@
class SecondTest extends MysqlTestCase
{
- public function testSecond()
+ public function testSecond(): void
{
$this->assertDqlProducesSql(
- "SELECT SECOND(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SECOND(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT SECOND(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/SetTest.php b/tests/Query/Mysql/SetTest.php
index 60bf2f5c..f5b50486 100644
--- a/tests/Query/Mysql/SetTest.php
+++ b/tests/Query/Mysql/SetTest.php
@@ -2,11 +2,13 @@
namespace DoctrineExtensions\Tests\Query\Mysql;
-class SetTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+class SetTest extends MysqlTestCase
{
- public function testFindInSet()
+ public function testFindInSet(): void
{
- $dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Set p WHERE FIND_IN_SET(p.id, p.set) != 0";
+ $dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Set p WHERE FIND_IN_SET(p.id, p.set) != 0';
$this->assertDqlProducesSql(
$dql,
'SELECT s0_.id AS id_0, s0_.set AS set_1 FROM Set s0_ WHERE FIND_IN_SET(s0_.id, s0_.set) <> 0'
diff --git a/tests/Query/Mysql/Sha1Test.php b/tests/Query/Mysql/Sha1Test.php
index 53ee09ff..436cb82c 100644
--- a/tests/Query/Mysql/Sha1Test.php
+++ b/tests/Query/Mysql/Sha1Test.php
@@ -6,7 +6,7 @@
class Sha1Test extends MysqlTestCase
{
- public function testSha1()
+ public function testSha1(): void
{
$this->assertDqlProducesSql(
"SELECT SHA1('2') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/Sha2Test.php b/tests/Query/Mysql/Sha2Test.php
index d7fe291c..f747ee84 100644
--- a/tests/Query/Mysql/Sha2Test.php
+++ b/tests/Query/Mysql/Sha2Test.php
@@ -6,7 +6,7 @@
class Sha2Test extends MysqlTestCase
{
- public function testSha2()
+ public function testSha2(): void
{
$this->assertDqlProducesSql(
"SELECT SHA2('2', 2) from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/SinTest.php b/tests/Query/Mysql/SinTest.php
index 4ab7cf11..6839cb37 100644
--- a/tests/Query/Mysql/SinTest.php
+++ b/tests/Query/Mysql/SinTest.php
@@ -6,10 +6,10 @@
class SinTest extends MysqlTestCase
{
- public function testSin()
+ public function testSin(): void
{
$this->assertDqlProducesSql(
- "SELECT SIN(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SIN(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT SIN(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/SoundexTest.php b/tests/Query/Mysql/SoundexTest.php
index 46044d98..aee62cdb 100644
--- a/tests/Query/Mysql/SoundexTest.php
+++ b/tests/Query/Mysql/SoundexTest.php
@@ -6,7 +6,7 @@
class SoundexTest extends MysqlTestCase
{
- public function testSoundex()
+ public function testSoundex(): void
{
$this->assertDqlProducesSql(
"SELECT SOUNDEX('2') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/StdDevTest.php b/tests/Query/Mysql/StdDevTest.php
index ab0b90b7..d3d7c7e4 100644
--- a/tests/Query/Mysql/StdDevTest.php
+++ b/tests/Query/Mysql/StdDevTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Mysql;
-class StdDevTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+class StdDevTest extends MysqlTestCase
{
- public function testStdDev()
+ public function testStdDev(): void
{
$this->assertDqlProducesSql(
- "SELECT STDDEV(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT STDDEV(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT STDDEV(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/StdTest.php b/tests/Query/Mysql/StdTest.php
index 969f93d9..f1932f6a 100644
--- a/tests/Query/Mysql/StdTest.php
+++ b/tests/Query/Mysql/StdTest.php
@@ -6,10 +6,10 @@
class StdTest extends MysqlTestCase
{
- public function testStd()
+ public function testStd(): void
{
$this->assertDqlProducesSql(
- "SELECT STD(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT STD(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT STD(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/StrToDateTest.php b/tests/Query/Mysql/StrToDateTest.php
index 452c5092..e130d89f 100644
--- a/tests/Query/Mysql/StrToDateTest.php
+++ b/tests/Query/Mysql/StrToDateTest.php
@@ -6,10 +6,10 @@
class StrToDateTest extends MysqlTestCase
{
- public function testStrToDate()
+ public function testStrToDate(): void
{
$this->assertDqlProducesSql(
- "SELECT STR_TO_DATE(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT STR_TO_DATE(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT STR_TO_DATE(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/StringTest.php b/tests/Query/Mysql/StringTest.php
index d4d9aea3..d808a198 100644
--- a/tests/Query/Mysql/StringTest.php
+++ b/tests/Query/Mysql/StringTest.php
@@ -2,9 +2,12 @@
namespace DoctrineExtensions\Tests\Query\Mysql;
-class StringTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+use Doctrine\ORM\Query\QueryException;
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+class StringTest extends MysqlTestCase
{
- public function testAscii()
+ public function testAscii(): void
{
$this->assertDqlProducesSql(
"SELECT ASCII('A') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -15,17 +18,17 @@ public function testAscii()
/**
* Not implemented
*/
- public function testCharLength()
+ public function testCharLength(): void
{
- $this->expectException(\Doctrine\ORM\Query\QueryException::class);
+ $this->expectException(QueryException::class);
$this->assertDqlProducesSql(
- "SELECT CHAR_LENGTH(CHAR(0x65)), CHAR_LENGTH(CHAR(0x65 USING utf8)) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT CHAR_LENGTH(CHAR(0x65)), CHAR_LENGTH(CHAR(0x65 USING utf8)) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT CHAR_LENGTH(CHAR(0x65)), CHAR_LENGTH(CHAR(0x65 USING utf8)) AS sclr_0 FROM Blank b0_'
);
}
- public function testConcatWithSeparator()
+ public function testConcatWithSeparator(): void
{
$this->assertDqlProducesSql(
"SELECT CONCAT_WS(',', 'First name', 'Second name', 'Last Name') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -36,9 +39,9 @@ public function testConcatWithSeparator()
/**
* Not implemented
*/
- public function testConcatWithSeparatorWithNull()
+ public function testConcatWithSeparatorWithNull(): void
{
- $this->expectException(\Doctrine\ORM\Query\QueryException::class);
+ $this->expectException(QueryException::class);
$this->assertDqlProducesSql(
"SELECT CONCAT_WS(',', 'First name', NULL, 'Last Name') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -46,7 +49,7 @@ public function testConcatWithSeparatorWithNull()
);
}
- public function testField()
+ public function testField(): void
{
$this->assertDqlProducesSql(
"SELECT FIELD('ej', 'Hej', 'ej', 'Heja', 'hej', 'foo') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -54,7 +57,7 @@ public function testField()
);
}
- public function testReplace()
+ public function testReplace(): void
{
$this->assertDqlProducesSql(
"SELECT REPLACE('www.mysql.com', 'w', 'Ww') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -62,7 +65,7 @@ public function testReplace()
);
}
- public function testSoundex()
+ public function testSoundex(): void
{
$this->assertDqlProducesSql(
"SELECT SOUNDEX('Hello') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -73,7 +76,7 @@ public function testSoundex()
/**
* Test cases for MYSQL SUBSTRING function.
*/
- public function testSubstring()
+ public function testSubstring(): void
{
$this->assertDqlProducesSql(
"SELECT SUBSTRING('www.mysql.com', 1, 3) from DoctrineExtensions\Tests\Entities\Blank b",
@@ -91,17 +94,17 @@ public function testSubstring()
);
$this->assertDqlProducesSql(
- "SELECT SUBSTRING(b.id, 5, 5) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SUBSTRING(b.id, 5, 5) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT SUBSTR(b0_.id, 5, 5) AS sclr_0 FROM Blank b0_'
);
$this->assertDqlProducesSql(
- "SELECT SUBSTRING(b.id, 5) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SUBSTRING(b.id, 5) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT SUBSTR(b0_.id, 5, LENGTH(b0_.id)) AS sclr_0 FROM Blank b0_'
);
$this->assertDqlProducesSql(
- "SELECT SUBSTRING(b.id, -5, 2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SUBSTRING(b.id, -5, 2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT SUBSTR(b0_.id, -5, 2) AS sclr_0 FROM Blank b0_'
);
}
@@ -109,7 +112,7 @@ public function testSubstring()
/**
* Test cases for MYSQL SUBSTRING_INDEX function.
*/
- public function testSubstringIndex()
+ public function testSubstringIndex(): void
{
$this->assertDqlProducesSql(
"SELECT SUBSTRING_INDEX('www.mysql.com', '.', 2) from DoctrineExtensions\Tests\Entities\Blank b",
@@ -133,7 +136,7 @@ public function testSubstringIndex()
);
}
- public function testLeast()
+ public function testLeast(): void
{
$this->assertDqlProducesSql(
'SELECT LEAST(10,1,-4,0.4,0.003) AS lest FROM DoctrineExtensions\Tests\Entities\Blank b',
@@ -151,10 +154,10 @@ public function testLeast()
);
}
- public function testGreatest()
+ public function testGreatest(): void
{
$this->assertDqlProducesSql(
- "SELECT GREATEST(10,1,4,0.4,0.003) AS great FROM DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT GREATEST(10,1,4,0.4,0.003) AS great FROM DoctrineExtensions\Tests\Entities\Blank b',
'SELECT GREATEST(10, 1, 4, 0.4, 0.003) AS sclr_0 FROM Blank b0_'
);
@@ -163,12 +166,12 @@ public function testGreatest()
"SELECT GREATEST('M', 'N', 'o', 'c', 'C') AS sclr_0 FROM Blank b0_"
);
$this->assertDqlProducesSql(
- "SELECT GREATEST(b.id, 15) AS great FROM DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT GREATEST(b.id, 15) AS great FROM DoctrineExtensions\Tests\Entities\Blank b',
'SELECT GREATEST(b0_.id, 15) AS sclr_0 FROM Blank b0_'
);
}
- public function testLpad()
+ public function testLpad(): void
{
$this->assertDqlProducesSql(
"SELECT LPAD('Hellow', 10, '**') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -176,7 +179,7 @@ public function testLpad()
);
}
- public function testRpad()
+ public function testRpad(): void
{
$this->assertDqlProducesSql(
"SELECT RPAD('Hellow', 10, '**') from DoctrineExtensions\Tests\Entities\Blank b",
@@ -184,7 +187,7 @@ public function testRpad()
);
}
- public function testInstr()
+ public function testInstr(): void
{
$this->assertDqlProducesSql(
"SELECT INSTR('www.mysql.com', 'mysql') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/SubstringIndexTest.php b/tests/Query/Mysql/SubstringIndexTest.php
index 222957fa..ee6e601d 100644
--- a/tests/Query/Mysql/SubstringIndexTest.php
+++ b/tests/Query/Mysql/SubstringIndexTest.php
@@ -6,10 +6,10 @@
class SubstringIndexTest extends MysqlTestCase
{
- public function testSubstringIndex()
+ public function testSubstringIndex(): void
{
$this->assertDqlProducesSql(
- "SELECT SUBSTRING_INDEX(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SUBSTRING_INDEX(2, 3, 4) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT SUBSTRING_INDEX(2, 3, 4) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/TanTest.php b/tests/Query/Mysql/TanTest.php
index c7571867..a34b35a1 100644
--- a/tests/Query/Mysql/TanTest.php
+++ b/tests/Query/Mysql/TanTest.php
@@ -6,10 +6,10 @@
class TanTest extends MysqlTestCase
{
- public function testTan()
+ public function testTan(): void
{
$this->assertDqlProducesSql(
- "SELECT TAN(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT TAN(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT TAN(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/TimeDiffTest.php b/tests/Query/Mysql/TimeDiffTest.php
index c6857463..c9cb7ec9 100644
--- a/tests/Query/Mysql/TimeDiffTest.php
+++ b/tests/Query/Mysql/TimeDiffTest.php
@@ -6,10 +6,10 @@
class TimeDiffTest extends MysqlTestCase
{
- public function testTimeDiff()
+ public function testTimeDiff(): void
{
$this->assertDqlProducesSql(
- "SELECT TIMEDIFF(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT TIMEDIFF(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT TIMEDIFF(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/TimeTest.php b/tests/Query/Mysql/TimeTest.php
index 6873edfa..458b5f44 100644
--- a/tests/Query/Mysql/TimeTest.php
+++ b/tests/Query/Mysql/TimeTest.php
@@ -6,10 +6,10 @@
class TimeTest extends MysqlTestCase
{
- public function testTime()
+ public function testTime(): void
{
$this->assertDqlProducesSql(
- "SELECT TIME(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT TIME(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT TIME(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/TimeToSecTest.php b/tests/Query/Mysql/TimeToSecTest.php
index 7955ef71..65ae775d 100644
--- a/tests/Query/Mysql/TimeToSecTest.php
+++ b/tests/Query/Mysql/TimeToSecTest.php
@@ -6,10 +6,10 @@
class TimeToSecTest extends MysqlTestCase
{
- public function testTimeToSec()
+ public function testTimeToSec(): void
{
$this->assertDqlProducesSql(
- "SELECT TIMETOSEC(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT TIMETOSEC(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT TIME_TO_SEC(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/TimestampAddTest.php b/tests/Query/Mysql/TimestampAddTest.php
index 4a04b43c..1b6f8b28 100644
--- a/tests/Query/Mysql/TimestampAddTest.php
+++ b/tests/Query/Mysql/TimestampAddTest.php
@@ -6,7 +6,7 @@
class TimestampAddTest extends MysqlTestCase
{
- public function testTimestampAdd()
+ public function testTimestampAdd(): void
{
$this->assertDqlProducesSql(
"SELECT TIMESTAMPADD(MINUTE, 1, '2003-01-02') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/TimestampDiffTest.php b/tests/Query/Mysql/TimestampDiffTest.php
index 32fe66f4..db55bd8f 100644
--- a/tests/Query/Mysql/TimestampDiffTest.php
+++ b/tests/Query/Mysql/TimestampDiffTest.php
@@ -6,7 +6,7 @@
class TimestampDiffTest extends MysqlTestCase
{
- public function testTimestampDiff()
+ public function testTimestampDiff(): void
{
$this->assertDqlProducesSql(
"SELECT TIMESTAMPDIFF(MONTH, '2017-06-25', '2017-06-15') from DoctrineExtensions\Tests\Entities\Blank b",
diff --git a/tests/Query/Mysql/TrigTest.php b/tests/Query/Mysql/TrigTest.php
index 7c1e6afc..2256e44e 100644
--- a/tests/Query/Mysql/TrigTest.php
+++ b/tests/Query/Mysql/TrigTest.php
@@ -2,7 +2,13 @@
namespace DoctrineExtensions\Tests\Query\Mysql;
-class TrigTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+use Doctrine\ORM\Query;
+use Doctrine\ORM\Version;
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+use function deg2rad;
+
+class TrigTest extends MysqlTestCase
{
private $entity;
@@ -13,33 +19,33 @@ public function setUp(): void
$this->entity = 'DoctrineExtensions\Tests\Entities\BlogPost';
}
- public function testSin()
+ public function testSin(): void
{
- $this->_assertFirstQuery('SIN');
- $this->_assertSecondQuery('SIN');
+ $this->assertFirstQuery('SIN');
+ $this->assertSecondQuery('SIN');
- $dql = "SELECT SIN(RADIANS(p.latitude)) FROM {$this->entity} p";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT SIN(RADIANS(p.latitude)) FROM ' . $this->entity . ' p';
+ $q = $this->entityManager->createQuery($dql);
$sql = 'SELECT SIN(RADIANS(b0_.latitude)) AS sclr_0 FROM BlogPost b0_';
$this->assertEquals($sql, $q->getSql());
- $dql = "SELECT SIN(p.latitude * p.longitude) FROM {$this->entity} p";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT SIN(p.latitude * p.longitude) FROM ' . $this->entity . ' p';
+ $q = $this->entityManager->createQuery($dql);
$sql = 'SELECT SIN(b0_.latitude * b0_.longitude) AS sclr_0 FROM BlogPost b0_';
$this->assertEquals($sql, $q->getSql());
- $dql = "SELECT SIN(RADIANS(p.latitude) * RADIANS(p.longitude)) FROM {$this->entity} p";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT SIN(RADIANS(p.latitude) * RADIANS(p.longitude)) FROM ' . $this->entity . ' p';
+ $q = $this->entityManager->createQuery($dql);
$sql = 'SELECT SIN(RADIANS(b0_.latitude) * RADIANS(b0_.longitude)) AS sclr_0 FROM BlogPost b0_';
$this->assertEquals($sql, $q->getSql());
- if (\Doctrine\ORM\Version::compare('2.4.0') <= 0) {
- $dql = "SELECT p FROM {$this->entity} p WHERE p.longitude = SIN(RADIANS(p.latitude)) * RADIANS(p.longitude)";
+ if (Version::compare('2.4.0') <= 0) {
+ $dql = 'SELECT p FROM ' . $this->entity . ' p WHERE p.longitude = SIN(RADIANS(p.latitude)) * RADIANS(p.longitude)';
} else {
- $dql = "SELECT p FROM {$this->entity} p WHERE p.longitude = (SIN(RADIANS(p.latitude)) * RADIANS(p.longitude))";
+ $dql = 'SELECT p FROM ' . $this->entity . ' p WHERE p.longitude = (SIN(RADIANS(p.latitude)) * RADIANS(p.longitude))';
}
$q = $this->entityManager->createQuery($dql);
@@ -47,16 +53,16 @@ public function testSin()
$sql = 'SELECT b0_.id AS id_0, b0_.created AS created_1, b0_.longitude AS longitude_2, b0_.latitude AS latitude_3 FROM BlogPost b0_ WHERE b0_.longitude = SIN(RADIANS(b0_.latitude)) * RADIANS(b0_.longitude)';
$this->assertEquals($sql, $q->getSql());
- $dql = "SELECT p FROM {$this->entity} p WHERE SIN(RADIANS(p.latitude)) * SIN(RADIANS(p.longitude)) = 1";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT p FROM ' . $this->entity . ' p WHERE SIN(RADIANS(p.latitude)) * SIN(RADIANS(p.longitude)) = 1';
+ $q = $this->entityManager->createQuery($dql);
$sql = 'SELECT b0_.id AS id_0, b0_.created AS created_1, b0_.longitude AS longitude_2, b0_.latitude AS latitude_3 FROM BlogPost b0_ WHERE SIN(RADIANS(b0_.latitude)) * SIN(RADIANS(b0_.longitude)) = 1';
$this->assertEquals($sql, $q->getSql());
- if (\Doctrine\ORM\Version::compare('2.4.0') <= 0) {
- $dql = "SELECT SIN(RADIANS(p.latitude)) * SIN(RADIANS(p.longitude)) FROM {$this->entity} p ";
+ if (Version::compare('2.4.0') <= 0) {
+ $dql = 'SELECT SIN(RADIANS(p.latitude)) * SIN(RADIANS(p.longitude)) FROM ' . $this->entity . ' p ';
} else {
- $dql = "SELECT (SIN(RADIANS(p.latitude)) * SIN(RADIANS(p.longitude))) FROM {$this->entity} p ";
+ $dql = 'SELECT (SIN(RADIANS(p.latitude)) * SIN(RADIANS(p.longitude))) FROM ' . $this->entity . ' p ';
}
$q = $this->entityManager->createQuery($dql);
@@ -65,21 +71,21 @@ public function testSin()
$this->assertEquals($sql, $q->getSql());
}
- public function testAsin()
+ public function testAsin(): void
{
- $this->_assertFirstQuery('ASIN');
- $this->_assertSecondQuery('ASIN');
+ $this->assertFirstQuery('ASIN');
+ $this->assertSecondQuery('ASIN');
}
- public function testAcos()
+ public function testAcos(): void
{
- $this->_assertFirstQuery('ACOS');
- $this->_assertSecondQuery('ACOS');
+ $this->assertFirstQuery('ACOS');
+ $this->assertSecondQuery('ACOS');
- if (\Doctrine\ORM\Version::compare('2.4.0') <= 0) {
- $dql = "SELECT ACOS(SIN(RADIANS(p.latitude)) + SIN(RADIANS(p.longitude))) * 1 FROM {$this->entity} p";
+ if (Version::compare('2.4.0') <= 0) {
+ $dql = 'SELECT ACOS(SIN(RADIANS(p.latitude)) + SIN(RADIANS(p.longitude))) * 1 FROM ' . $this->entity . ' p';
} else {
- $dql = "SELECT (ACOS(SIN(RADIANS(p.latitude)) + SIN(RADIANS(p.longitude))) * 1) FROM {$this->entity} p";
+ $dql = 'SELECT (ACOS(SIN(RADIANS(p.latitude)) + SIN(RADIANS(p.longitude))) * 1) FROM ' . $this->entity . ' p';
}
$q = $this->entityManager->createQuery($dql);
@@ -88,63 +94,63 @@ public function testAcos()
$this->assertEquals($sql, $q->getSql());
}
- public function testCos()
+ public function testCos(): void
{
- $this->_assertFirstQuery('COS');
- $this->_assertSecondQuery('COS');
+ $this->assertFirstQuery('COS');
+ $this->assertSecondQuery('COS');
}
- public function testCot()
+ public function testCot(): void
{
- $this->_assertFirstQuery('COT');
- $this->_assertSecondQuery('COT');
+ $this->assertFirstQuery('COT');
+ $this->assertSecondQuery('COT');
}
- public function testDegrees()
+ public function testDegrees(): void
{
- $this->_assertFirstQuery('DEGREES');
- $this->_assertSecondQuery('DEGREES');
+ $this->assertFirstQuery('DEGREES');
+ $this->assertSecondQuery('DEGREES');
}
- public function testRadians()
+ public function testRadians(): void
{
- $this->_assertFirstQuery('RADIANS');
- $this->_assertSecondQuery('RADIANS');
+ $this->assertFirstQuery('RADIANS');
+ $this->assertSecondQuery('RADIANS');
}
- public function testTan()
+ public function testTan(): void
{
- $this->_assertFirstQuery('TAN');
- $this->_assertSecondQuery('TAN');
+ $this->assertFirstQuery('TAN');
+ $this->assertSecondQuery('TAN');
}
- public function testAtan()
+ public function testAtan(): void
{
// test with 1 argument
- $this->_assertFirstQuery('ATAN');
- $this->_assertSecondQuery('ATAN');
+ $this->assertFirstQuery('ATAN');
+ $this->assertSecondQuery('ATAN');
// test with 2 arguments
- $dql = "SELECT ATAN(p.latitude, p.longitude) FROM {$this->entity} p ";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT ATAN(p.latitude, p.longitude) FROM ' . $this->entity . ' p ';
+ $q = $this->entityManager->createQuery($dql);
$sql = 'SELECT ATAN(b0_.latitude, b0_.longitude) AS sclr_0 FROM BlogPost b0_';
$this->assertEquals($sql, $q->getSql());
}
- public function testAtan2()
+ public function testAtan2(): void
{
- $dql = "SELECT ATAN2(p.latitude, p.longitude) FROM {$this->entity} p";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT ATAN2(p.latitude, p.longitude) FROM ' . $this->entity . ' p';
+ $q = $this->entityManager->createQuery($dql);
$sql = 'SELECT ATAN2(b0_.latitude, b0_.longitude) AS sclr_0 FROM BlogPost b0_';
$this->assertEquals($sql, $q->getSql());
}
- public function testCosineLaw()
+ public function testCosineLaw(): void
{
- $lat = 0.0;
- $lng = 0.0;
+ $lat = 0.0;
+ $lng = 0.0;
$radiusOfEarth = 6371;
$cosineLaw = 'ACOS(SIN(' . deg2rad($lat) . ') * SIN(RADIANS(p.latitude)) '
@@ -152,10 +158,10 @@ public function testCosineLaw()
. '* COS(RADIANS(p.longitude) - ' . deg2rad($lng) . ')'
. ') * ' . $radiusOfEarth;
- if (\Doctrine\ORM\Version::compare('2.4.0') <= 0) {
- $dql = 'SELECT ' . $cosineLaw . " FROM {$this->entity} p";
+ if (Version::compare('2.4.0') <= 0) {
+ $dql = 'SELECT ' . $cosineLaw . ' FROM ' . $this->entity . ' p';
} else {
- $dql = 'SELECT (' . $cosineLaw . ") FROM {$this->entity} p";
+ $dql = 'SELECT (' . $cosineLaw . ') FROM ' . $this->entity . ' p';
}
$q = $this->entityManager->createQuery($dql);
@@ -164,42 +170,42 @@ public function testCosineLaw()
$this->assertEquals($sql, $q->getSql());
}
- protected function _assertFirstQuery($func)
+ protected function assertFirstQuery($func): void
{
- $q = $this->_getFirstDqlQuery($func);
- $sql = $this->_getFirstSqlQuery($func);
+ $q = $this->getFirstDqlQuery($func);
+ $sql = $this->getFirstSqlQuery($func);
$this->assertEquals($sql, $q->getSql());
}
- protected function _assertSecondQuery($func)
+ protected function assertSecondQuery($func): void
{
- $q = $this->_getSecondDqlQuery($func);
- $sql = $this->_getSecondSqlQuery($func);
+ $q = $this->getSecondDqlQuery($func);
+ $sql = $this->getSecondSqlQuery($func);
$this->assertEquals($sql, $q->getSql());
}
- protected function _getFirstDqlQuery($func)
+ protected function getFirstDqlQuery($func): Query
{
- $dql = "SELECT p FROM {$this->entity} p WHERE " . $func . '(p.latitude) = 1';
+ $dql = 'SELECT p FROM ' . $this->entity . ' p WHERE ' . $func . '(p.latitude) = 1';
return $this->entityManager->createQuery($dql);
}
- protected function _getFirstSqlQuery($func)
+ protected function getFirstSqlQuery($func): string
{
return 'SELECT b0_.id AS id_0, b0_.created AS created_1, '
. 'b0_.longitude AS longitude_2, b0_.latitude AS latitude_3 '
. 'FROM BlogPost b0_ WHERE ' . $func . '(b0_.latitude) = 1';
}
- protected function _getSecondDqlQuery($func)
+ protected function getSecondDqlQuery($func): Query
{
- $dql = 'SELECT ' . $func . "(p.latitude) FROM {$this->entity} p";
+ $dql = 'SELECT ' . $func . '(p.latitude) FROM ' . $this->entity . ' p';
return $this->entityManager->createQuery($dql);
}
- protected function _getSecondSqlQuery($func)
+ protected function getSecondSqlQuery($func): string
{
return 'SELECT ' . $func . '(b0_.latitude) AS sclr_0 FROM BlogPost b0_';
}
diff --git a/tests/Query/Mysql/TruncateTest.php b/tests/Query/Mysql/TruncateTest.php
index fedb7a91..4ead215a 100644
--- a/tests/Query/Mysql/TruncateTest.php
+++ b/tests/Query/Mysql/TruncateTest.php
@@ -8,10 +8,10 @@
class TruncateTest extends MysqlTestCase
{
- public function testFormat()
+ public function testFormat(): void
{
$this->assertDqlProducesSql(
- "SELECT TRUNCATE(1000.00, 2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT TRUNCATE(1000.00, 2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT TRUNCATE(1000.00, 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/UnhexTest.php b/tests/Query/Mysql/UnhexTest.php
index 7f0d6cee..93dcbd8b 100644
--- a/tests/Query/Mysql/UnhexTest.php
+++ b/tests/Query/Mysql/UnhexTest.php
@@ -6,10 +6,10 @@
class UnhexTest extends MysqlTestCase
{
- public function testUnhex()
+ public function testUnhex(): void
{
$this->assertDqlProducesSql(
- "SELECT UNHEX(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT UNHEX(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT UNHEX(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/UnixTimestampTest.php b/tests/Query/Mysql/UnixTimestampTest.php
index 1da953e1..8da08383 100644
--- a/tests/Query/Mysql/UnixTimestampTest.php
+++ b/tests/Query/Mysql/UnixTimestampTest.php
@@ -6,18 +6,18 @@
class UnixTimestampTest extends MysqlTestCase
{
- public function testUnixTimeStampNoArguments()
+ public function testUnixTimeStampNoArguments(): void
{
$this->assertDqlProducesSql(
- "SELECT UNIX_TIMESTAMP() from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT UNIX_TIMESTAMP() from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT UNIX_TIMESTAMP() AS sclr_0 FROM Blank b0_'
);
}
- public function testUnixTimeStampOneArgument()
+ public function testUnixTimeStampOneArgument(): void
{
$this->assertDqlProducesSql(
- "SELECT UNIX_TIMESTAMP(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT UNIX_TIMESTAMP(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT UNIX_TIMESTAMP(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/UtcTimestampTest.php b/tests/Query/Mysql/UtcTimestampTest.php
index 4462f2b1..bf06a162 100644
--- a/tests/Query/Mysql/UtcTimestampTest.php
+++ b/tests/Query/Mysql/UtcTimestampTest.php
@@ -2,11 +2,13 @@
namespace DoctrineExtensions\Tests\Query\Mysql;
-class UtcTimestampTest extends \DoctrineExtensions\Tests\Query\MysqlTestCase
+use DoctrineExtensions\Tests\Query\MysqlTestCase;
+
+class UtcTimestampTest extends MysqlTestCase
{
- public function testUtcTimestamp()
+ public function testUtcTimestamp(): void
{
- $dql = "SELECT d FROM DoctrineExtensions\Tests\Entities\Date d WHERE d.created > utc_timestamp()";
+ $dql = 'SELECT d FROM DoctrineExtensions\Tests\Entities\Date d WHERE d.created > utc_timestamp()';
$this->assertDqlProducesSql(
$dql,
'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE d0_.created > UTC_TIMESTAMP()'
diff --git a/tests/Query/Mysql/UuidShortTest.php b/tests/Query/Mysql/UuidShortTest.php
index cd4f5a28..3b76bba5 100644
--- a/tests/Query/Mysql/UuidShortTest.php
+++ b/tests/Query/Mysql/UuidShortTest.php
@@ -6,10 +6,10 @@
class UuidShortTest extends MysqlTestCase
{
- public function testUuidShort()
+ public function testUuidShort(): void
{
$this->assertDqlProducesSql(
- "SELECT UUID_SHORT() from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT UUID_SHORT() from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT UUID_SHORT() AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/VarianceTest.php b/tests/Query/Mysql/VarianceTest.php
index 65dacf29..7924f039 100644
--- a/tests/Query/Mysql/VarianceTest.php
+++ b/tests/Query/Mysql/VarianceTest.php
@@ -6,10 +6,10 @@
class VarianceTest extends MysqlTestCase
{
- public function testVariance()
+ public function testVariance(): void
{
$this->assertDqlProducesSql(
- "SELECT VARIANCE(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT VARIANCE(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT VARIANCE(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/WeekDayTest.php b/tests/Query/Mysql/WeekDayTest.php
index 2391646d..bc909ad7 100644
--- a/tests/Query/Mysql/WeekDayTest.php
+++ b/tests/Query/Mysql/WeekDayTest.php
@@ -6,10 +6,10 @@
class WeekDayTest extends MysqlTestCase
{
- public function testWeekDay()
+ public function testWeekDay(): void
{
$this->assertDqlProducesSql(
- "SELECT WEEKDAY(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT WEEKDAY(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT WEEKDAY(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/WeekOfYearTest.php b/tests/Query/Mysql/WeekOfYearTest.php
index e8bc325c..5965c418 100644
--- a/tests/Query/Mysql/WeekOfYearTest.php
+++ b/tests/Query/Mysql/WeekOfYearTest.php
@@ -6,10 +6,10 @@
class WeekOfYearTest extends MysqlTestCase
{
- public function testWeekOfYear()
+ public function testWeekOfYear(): void
{
$this->assertDqlProducesSql(
- "SELECT WEEKOFYEAR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT WEEKOFYEAR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT WEEKOFYEAR(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/WeekTest.php b/tests/Query/Mysql/WeekTest.php
index 483737b9..b95622fe 100644
--- a/tests/Query/Mysql/WeekTest.php
+++ b/tests/Query/Mysql/WeekTest.php
@@ -6,10 +6,10 @@
class WeekTest extends MysqlTestCase
{
- public function testWeek()
+ public function testWeek(): void
{
$this->assertDqlProducesSql(
- "SELECT WEEK(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT WEEK(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT WEEK(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/YearTest.php b/tests/Query/Mysql/YearTest.php
index fb805ba1..faa43b4c 100644
--- a/tests/Query/Mysql/YearTest.php
+++ b/tests/Query/Mysql/YearTest.php
@@ -6,10 +6,10 @@
class YearTest extends MysqlTestCase
{
- public function testYear()
+ public function testYear(): void
{
$this->assertDqlProducesSql(
- "SELECT YEAR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT YEAR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT YEAR(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Mysql/YearWeekTest.php b/tests/Query/Mysql/YearWeekTest.php
index 05f40528..571d2cc1 100644
--- a/tests/Query/Mysql/YearWeekTest.php
+++ b/tests/Query/Mysql/YearWeekTest.php
@@ -6,10 +6,10 @@
class YearWeekTest extends MysqlTestCase
{
- public function testYearWeek()
+ public function testYearWeek(): void
{
$this->assertDqlProducesSql(
- "SELECT YEARWEEK(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT YEARWEEK(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT YEARWEEK(2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/MysqlTestCase.php b/tests/Query/MysqlTestCase.php
index 76286c14..96bf7275 100644
--- a/tests/Query/MysqlTestCase.php
+++ b/tests/Query/MysqlTestCase.php
@@ -7,6 +7,7 @@ class MysqlTestCase extends DbTestCase
public function setUp(): void
{
parent::setUp();
+
ConfigLoader::load($this->configuration, ConfigLoader::MYSQL);
}
}
diff --git a/tests/Query/MysqlWalkerTest.php b/tests/Query/MysqlWalkerTest.php
index 7fd9e2e9..ae424838 100644
--- a/tests/Query/MysqlWalkerTest.php
+++ b/tests/Query/MysqlWalkerTest.php
@@ -6,10 +6,10 @@
class MysqlWalkerTest extends MysqlTestCase
{
- public function testSelectSQLCalcFoundRows()
+ public function testSelectSQLCalcFoundRows(): void
{
- $dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p';
+ $q = $this->entityManager->createQuery($dql);
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'DoctrineExtensions\Query\MysqlWalker');
$q->setHint('mysqlWalker.sqlCalcFoundRows', true);
$sql = 'SELECT SQL_CALC_FOUND_ROWS d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_';
@@ -17,10 +17,10 @@ public function testSelectSQLCalcFoundRows()
$this->assertEquals($sql, $q->getSql());
}
- public function testSelectSQLNoCache()
+ public function testSelectSQLNoCache(): void
{
- $dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p';
+ $q = $this->entityManager->createQuery($dql);
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'DoctrineExtensions\Query\MysqlWalker');
$q->setHint('mysqlWalker.sqlNoCache', true);
$sql = 'SELECT SQL_NO_CACHE d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_';
@@ -28,10 +28,10 @@ public function testSelectSQLNoCache()
$this->assertEquals($sql, $q->getSql());
}
- public function testGroupByWithRollup()
+ public function testGroupByWithRollup(): void
{
- $dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p GROUP BY p.id";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p GROUP BY p.id';
+ $q = $this->entityManager->createQuery($dql);
$q->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, 'DoctrineExtensions\Query\MysqlWalker');
$q->setHint('mysqlWalker.withRollup', true);
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ GROUP BY d0_.id WITH ROLLUP';
diff --git a/tests/Query/Oracle/CeilTest.php b/tests/Query/Oracle/CeilTest.php
index 6f7e3e43..c9661158 100644
--- a/tests/Query/Oracle/CeilTest.php
+++ b/tests/Query/Oracle/CeilTest.php
@@ -6,12 +6,10 @@
use DoctrineExtensions\Tests\Entities\Product;
use DoctrineExtensions\Tests\Query\OracleTestCase;
-/**
- * @author Jefferson Vantuir
- */
+/** @author Jefferson Vantuir */
class CeilTest extends OracleTestCase
{
- public function testFullQuery()
+ public function testFullQuery(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder->select('CEIL(p.weight)')
diff --git a/tests/Query/Oracle/DayTest.php b/tests/Query/Oracle/DayTest.php
index 58f5f357..01594954 100644
--- a/tests/Query/Oracle/DayTest.php
+++ b/tests/Query/Oracle/DayTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Oracle;
-class DayTest extends \DoctrineExtensions\Tests\Query\OracleTestCase
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+class DayTest extends OracleTestCase
{
- public function testDay()
+ public function testDay(): void
{
$this->assertDqlProducesSql(
- "SELECT DAY(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DAY(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(DAY FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Oracle/FloorTest.php b/tests/Query/Oracle/FloorTest.php
index 7b7d46cb..c45abb8b 100644
--- a/tests/Query/Oracle/FloorTest.php
+++ b/tests/Query/Oracle/FloorTest.php
@@ -6,12 +6,10 @@
use DoctrineExtensions\Tests\Entities\Product;
use DoctrineExtensions\Tests\Query\OracleTestCase;
-/**
- * @author Jefferson Vantuir
- */
+/** @author Jefferson Vantuir */
class FloorTest extends OracleTestCase
{
- public function testFullQuery()
+ public function testFullQuery(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder->select('FLOOR(p.weight)')
diff --git a/tests/Query/Oracle/HourTest.php b/tests/Query/Oracle/HourTest.php
index d4d32f70..87e0fe22 100644
--- a/tests/Query/Oracle/HourTest.php
+++ b/tests/Query/Oracle/HourTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Oracle;
-class HourTest extends \DoctrineExtensions\Tests\Query\OracleTestCase
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+class HourTest extends OracleTestCase
{
- public function testHour()
+ public function testHour(): void
{
$this->assertDqlProducesSql(
- "SELECT HOUR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT HOUR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(HOUR FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Oracle/ListaggTest.php b/tests/Query/Oracle/ListaggTest.php
index 94014b39..3592388b 100644
--- a/tests/Query/Oracle/ListaggTest.php
+++ b/tests/Query/Oracle/ListaggTest.php
@@ -4,15 +4,13 @@
use DoctrineExtensions\Tests\Query\OracleTestCase;
-/**
- * @author Alexey Kalinin
- */
+/** @author Alexey Kalinin */
class ListaggTest extends OracleTestCase
{
- public function testFullQuery()
+ public function testFullQuery(): void
{
$dql = "SELECT LISTAGG(p.id, ',') WITHIN GROUP (ORDER BY p.created) OVER (PARTITION BY p.longitude, p.latitude) FROM DoctrineExtensions\Tests\Entities\BlogPost p";
- $q = $this->entityManager->createQuery($dql);
+ $q = $this->entityManager->createQuery($dql);
$sql = "SELECT LISTAGG(b0_.id, ',') WITHIN GROUP ( ORDER BY b0_.created ASC) PARTITION BY (b0_.longitude,b0_.latitude) AS sclr_0 FROM BlogPost b0_";
$this->assertEquals($sql, $q->getSql());
diff --git a/tests/Query/Oracle/MinuteTest.php b/tests/Query/Oracle/MinuteTest.php
index b5f1ddfa..0cf871c3 100644
--- a/tests/Query/Oracle/MinuteTest.php
+++ b/tests/Query/Oracle/MinuteTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Oracle;
-class MinuteTest extends \DoctrineExtensions\Tests\Query\OracleTestCase
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+class MinuteTest extends OracleTestCase
{
- public function testMinute()
+ public function testMinute(): void
{
$this->assertDqlProducesSql(
- "SELECT MINUTE(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MINUTE(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(MINUTE FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Oracle/MonthTest.php b/tests/Query/Oracle/MonthTest.php
index d17ddae9..5c4bbfef 100644
--- a/tests/Query/Oracle/MonthTest.php
+++ b/tests/Query/Oracle/MonthTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Oracle;
-class MonthTest extends \DoctrineExtensions\Tests\Query\OracleTestCase
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+class MonthTest extends OracleTestCase
{
- public function testMonth()
+ public function testMonth(): void
{
$this->assertDqlProducesSql(
- "SELECT MONTH(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MONTH(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(MONTH FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Oracle/SecondTest.php b/tests/Query/Oracle/SecondTest.php
index 629115cc..388a337e 100644
--- a/tests/Query/Oracle/SecondTest.php
+++ b/tests/Query/Oracle/SecondTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Oracle;
-class SecondTest extends \DoctrineExtensions\Tests\Query\OracleTestCase
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+class SecondTest extends OracleTestCase
{
- public function testSecond()
+ public function testSecond(): void
{
$this->assertDqlProducesSql(
- "SELECT SECOND(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SECOND(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT FLOOR(EXTRACT(SECOND FROM 2)) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Oracle/ToCharTest.php b/tests/Query/Oracle/ToCharTest.php
index fef6cc40..bd84bc0a 100644
--- a/tests/Query/Oracle/ToCharTest.php
+++ b/tests/Query/Oracle/ToCharTest.php
@@ -6,12 +6,10 @@
use DoctrineExtensions\Tests\Entities\Date;
use DoctrineExtensions\Tests\Query\OracleTestCase;
-/**
- * @author Jefferson Vantuir
- */
+/** @author Jefferson Vantuir */
class ToCharTest extends OracleTestCase
{
- public function testFullQuery()
+ public function testFullQuery(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder->select('TO_CHAR(d.created, \'DD-MON-YYYY HH24:MI:SSxFF\', \'german\')')
diff --git a/tests/Query/Oracle/TruncTest.php b/tests/Query/Oracle/TruncTest.php
index 02edefcb..a4da200d 100755
--- a/tests/Query/Oracle/TruncTest.php
+++ b/tests/Query/Oracle/TruncTest.php
@@ -4,24 +4,22 @@
use DoctrineExtensions\Tests\Query\OracleTestCase;
-/**
- * @author Alexey Kalinin
- */
+/** @author Alexey Kalinin */
class TruncTest extends OracleTestCase
{
- public function testFullQuery()
+ public function testFullQuery(): void
{
$dql = 'SELECT TRUNC(d.created, \'YYYY\') FROM DoctrineExtensions\\Tests\\Entities\\Date d';
- $q = $this->entityManager->createQuery($dql);
+ $q = $this->entityManager->createQuery($dql);
$sql = 'SELECT TRUNC(d0_.created, \'YYYY\') AS sclr_0 FROM Date d0_';
$this->assertEquals($sql, $q->getSql());
}
- public function testShortQuery()
+ public function testShortQuery(): void
{
$dql = 'SELECT TRUNC(d.created) FROM DoctrineExtensions\\Tests\\Entities\\Date d';
- $q = $this->entityManager->createQuery($dql);
+ $q = $this->entityManager->createQuery($dql);
$sql = 'SELECT TRUNC(d0_.created) AS sclr_0 FROM Date d0_';
$this->assertEquals($sql, $q->getSql());
diff --git a/tests/Query/Oracle/YearTest.php b/tests/Query/Oracle/YearTest.php
index 33d694f1..3f13ef81 100644
--- a/tests/Query/Oracle/YearTest.php
+++ b/tests/Query/Oracle/YearTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Oracle;
-class YearTest extends \DoctrineExtensions\Tests\Query\OracleTestCase
+use DoctrineExtensions\Tests\Query\OracleTestCase;
+
+class YearTest extends OracleTestCase
{
- public function testYear()
+ public function testYear(): void
{
$this->assertDqlProducesSql(
- "SELECT YEAR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT YEAR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(YEAR FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/OracleTestCase.php b/tests/Query/OracleTestCase.php
index e8714a40..acabd3bf 100644
--- a/tests/Query/OracleTestCase.php
+++ b/tests/Query/OracleTestCase.php
@@ -7,6 +7,7 @@ class OracleTestCase extends DbTestCase
public function setUp(): void
{
parent::setUp();
+
ConfigLoader::load($this->configuration, ConfigLoader::ORACLE);
}
}
diff --git a/tests/Query/Postgresql/AtTimeZoneTest.php b/tests/Query/Postgresql/AtTimeZoneTest.php
index 05fb89eb..cf0685b6 100644
--- a/tests/Query/Postgresql/AtTimeZoneTest.php
+++ b/tests/Query/Postgresql/AtTimeZoneTest.php
@@ -2,12 +2,16 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class AtTimeZoneTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+use function date;
+
+class AtTimeZoneTest extends PostgresqlTestCase
{
- public function testAtTimeZone()
+ public function testAtTimeZone(): void
{
- $dql = "SELECT d FROM DoctrineExtensions\Tests\Entities\Date d WHERE AT_TIME_ZONE(d.created, :timeZone) < :currentTime";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT d FROM DoctrineExtensions\Tests\Entities\Date d WHERE AT_TIME_ZONE(d.created, :timeZone) < :currentTime';
+ $q = $this->entityManager->createQuery($dql);
$q->setParameter('timeZone', 'UTC');
$q->setParameter('currentTime', date('Y-m-d H:i:s'));
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE d0_.created AT TIME ZONE ? < ?';
diff --git a/tests/Query/Postgresql/CountFilterTest.php b/tests/Query/Postgresql/CountFilterTest.php
index 70b8e36b..6e9f18e9 100644
--- a/tests/Query/Postgresql/CountFilterTest.php
+++ b/tests/Query/Postgresql/CountFilterTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class CountFilterTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class CountFilterTest extends PostgresqlTestCase
{
- public function testCountFilter()
+ public function testCountFilter(): void
{
- $dql = "SELECT COUNT_FILTER(b, WHERE b.id = :id) FROM DoctrineExtensions\Tests\Entities\Blank b";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT COUNT_FILTER(b, WHERE b.id = :id) FROM DoctrineExtensions\Tests\Entities\Blank b';
+ $q = $this->entityManager->createQuery($dql);
$q->setParameter('id', 1);
$sql = 'SELECT COUNT(b0_.id) FILTER( WHERE b0_.id = ?) AS sclr_0 FROM Blank b0_';
$this->assertEquals($sql, $q->getSql());
diff --git a/tests/Query/Postgresql/DatePartTest.php b/tests/Query/Postgresql/DatePartTest.php
index 6d177485..e17dc60a 100644
--- a/tests/Query/Postgresql/DatePartTest.php
+++ b/tests/Query/Postgresql/DatePartTest.php
@@ -7,7 +7,7 @@
class DatePartTest extends PostgresqlTestCase
{
- public function testDatePart()
+ public function testDatePart(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder
diff --git a/tests/Query/Postgresql/DateTest.php b/tests/Query/Postgresql/DateTest.php
index e1978d48..36911deb 100644
--- a/tests/Query/Postgresql/DateTest.php
+++ b/tests/Query/Postgresql/DateTest.php
@@ -2,12 +2,16 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class DateTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+use function date;
+
+class DateTest extends PostgresqlTestCase
{
- public function testStrToDate()
+ public function testStrToDate(): void
{
- $dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE STR_TO_DATE(p.created, :dateFormat) < :currentTime";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE STR_TO_DATE(p.created, :dateFormat) < :currentTime';
+ $q = $this->entityManager->createQuery($dql);
$q->setParameter('dateFormat', '%Y-%m-%d %h:%i %p');
$q->setParameter('currentTime', date('Y-m-d H:i:s'));
$sql = 'SELECT d0_.id AS id_0, d0_.created AS created_1 FROM Date d0_ WHERE TO_DATE(d0_.created, ?) < ?';
@@ -15,9 +19,9 @@ public function testStrToDate()
$this->assertEquals($sql, $q->getSql());
}
- public function testDateFunction()
+ public function testDateFunction(): void
{
- $dql = "SELECT DATE(p.created) FROM DoctrineExtensions\Tests\Entities\Date p";
+ $dql = 'SELECT DATE(p.created) FROM DoctrineExtensions\Tests\Entities\Date p';
$sql = 'SELECT DATE(d0_.created) AS sclr_0 FROM Date d0_';
$this->assertDqlProducesSql($dql, $sql);
diff --git a/tests/Query/Postgresql/DateTruncTest.php b/tests/Query/Postgresql/DateTruncTest.php
index 5bf8ae1f..34aeb26a 100644
--- a/tests/Query/Postgresql/DateTruncTest.php
+++ b/tests/Query/Postgresql/DateTruncTest.php
@@ -7,7 +7,7 @@
class DateTruncTest extends PostgresqlTestCase
{
- public function testDateTrunc()
+ public function testDateTrunc(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder
diff --git a/tests/Query/Postgresql/DayTest.php b/tests/Query/Postgresql/DayTest.php
index a91cc358..87ce8549 100644
--- a/tests/Query/Postgresql/DayTest.php
+++ b/tests/Query/Postgresql/DayTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class DayTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class DayTest extends PostgresqlTestCase
{
- public function testDay()
+ public function testDay(): void
{
$this->assertDqlProducesSql(
- "SELECT DAY(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DAY(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(DAY FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Postgresql/GreatestTest.php b/tests/Query/Postgresql/GreatestTest.php
index 037d254f..9262d1bf 100644
--- a/tests/Query/Postgresql/GreatestTest.php
+++ b/tests/Query/Postgresql/GreatestTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class GreatestTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class GreatestTest extends PostgresqlTestCase
{
- public function testGreatest()
+ public function testGreatest(): void
{
$this->assertDqlProducesSql(
- "SELECT GREATEST(2, 5, 8) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT GREATEST(2, 5, 8) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT GREATEST(2, 5, 8) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Postgresql/HourTest.php b/tests/Query/Postgresql/HourTest.php
index 9cc24e67..b6af50de 100644
--- a/tests/Query/Postgresql/HourTest.php
+++ b/tests/Query/Postgresql/HourTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class HourTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class HourTest extends PostgresqlTestCase
{
- public function testHour()
+ public function testHour(): void
{
$this->assertDqlProducesSql(
- "SELECT HOUR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT HOUR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(HOUR FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Postgresql/LeastTest.php b/tests/Query/Postgresql/LeastTest.php
index 8ff38c2f..060f2a98 100644
--- a/tests/Query/Postgresql/LeastTest.php
+++ b/tests/Query/Postgresql/LeastTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class LeastTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class LeastTest extends PostgresqlTestCase
{
- public function testLeast()
+ public function testLeast(): void
{
$this->assertDqlProducesSql(
- "SELECT LEAST(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT LEAST(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT LEAST(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Postgresql/MinuteTest.php b/tests/Query/Postgresql/MinuteTest.php
index 1ca755f4..3b3a4edf 100644
--- a/tests/Query/Postgresql/MinuteTest.php
+++ b/tests/Query/Postgresql/MinuteTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class MinuteTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class MinuteTest extends PostgresqlTestCase
{
- public function testMinute()
+ public function testMinute(): void
{
$this->assertDqlProducesSql(
- "SELECT MINUTE(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MINUTE(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(MINUTE FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Postgresql/MonthTest.php b/tests/Query/Postgresql/MonthTest.php
index 07634b9d..f507ec8e 100644
--- a/tests/Query/Postgresql/MonthTest.php
+++ b/tests/Query/Postgresql/MonthTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class MonthTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class MonthTest extends PostgresqlTestCase
{
- public function testMonth()
+ public function testMonth(): void
{
$this->assertDqlProducesSql(
- "SELECT MONTH(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MONTH(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(MONTH FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Postgresql/RegexpReplaceTest.php b/tests/Query/Postgresql/RegexpReplaceTest.php
index 6cb477c8..0c02a7a8 100644
--- a/tests/Query/Postgresql/RegexpReplaceTest.php
+++ b/tests/Query/Postgresql/RegexpReplaceTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class RegexpReplaceTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class RegexpReplaceTest extends PostgresqlTestCase
{
- public function testRegexpReplace()
+ public function testRegexpReplace(): void
{
$dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Set p WHERE REGEXP_REPLACE(p.set, '\d', 'X') LIKE 'testXXX'";
- $q = $this->entityManager->createQuery($dql);
+ $q = $this->entityManager->createQuery($dql);
$this->assertEquals(
"SELECT s0_.id AS id_0, s0_.set AS set_1 FROM Set s0_ WHERE REGEXP_REPLACE(s0_.set, '\d', 'X') LIKE 'testXXX'",
diff --git a/tests/Query/Postgresql/SecondTest.php b/tests/Query/Postgresql/SecondTest.php
index 5932f321..2be68844 100644
--- a/tests/Query/Postgresql/SecondTest.php
+++ b/tests/Query/Postgresql/SecondTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class SecondTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class SecondTest extends PostgresqlTestCase
{
- public function testSecond()
+ public function testSecond(): void
{
$this->assertDqlProducesSql(
- "SELECT SECOND(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SECOND(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT FLOOR(EXTRACT(SECOND FROM 2)) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Postgresql/StringAggTest.php b/tests/Query/Postgresql/StringAggTest.php
index 29d80d94..38062491 100644
--- a/tests/Query/Postgresql/StringAggTest.php
+++ b/tests/Query/Postgresql/StringAggTest.php
@@ -7,7 +7,7 @@
class StringAggTest extends PostgresqlTestCase
{
- public function testStringAgg()
+ public function testStringAgg(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder
@@ -20,7 +20,7 @@ public function testStringAgg()
$this->assertEquals($expected, $queryBuilder->getQuery()->getSQL());
}
- public function testStringAggWithDistinct()
+ public function testStringAggWithDistinct(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder
@@ -33,7 +33,7 @@ public function testStringAggWithDistinct()
$this->assertEquals($expected, $queryBuilder->getQuery()->getSQL());
}
- public function testStringAggWithOrderByClause()
+ public function testStringAggWithOrderByClause(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder
@@ -46,7 +46,7 @@ public function testStringAggWithOrderByClause()
$this->assertEquals($expected, $queryBuilder->getQuery()->getSQL());
}
- public function testStringAggWithOrderByClauseAndPredefinedDirectory()
+ public function testStringAggWithOrderByClauseAndPredefinedDirectory(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder
@@ -59,7 +59,7 @@ public function testStringAggWithOrderByClauseAndPredefinedDirectory()
$this->assertEquals($expected, $queryBuilder->getQuery()->getSQL());
}
- public function testStringAggFullDeclaration()
+ public function testStringAggFullDeclaration(): void
{
$queryBuilder = new QueryBuilder($this->entityManager);
$queryBuilder
diff --git a/tests/Query/Postgresql/StringTest.php b/tests/Query/Postgresql/StringTest.php
index ac5ad03e..5ea9e59e 100644
--- a/tests/Query/Postgresql/StringTest.php
+++ b/tests/Query/Postgresql/StringTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class StringTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class StringTest extends PostgresqlTestCase
{
- public function testFormatDate()
+ public function testFormatDate(): void
{
- $dql = "SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE DATE_FORMAT(p.created, :dateFormat) < :currentTime";
- $q = $this->entityManager->createQuery($dql);
+ $dql = 'SELECT p FROM DoctrineExtensions\Tests\Entities\Date p WHERE DATE_FORMAT(p.created, :dateFormat) < :currentTime';
+ $q = $this->entityManager->createQuery($dql);
$q->setParameter('dateFormat', '%Y-%m-%d %h:%i %p');
$q->setParameter('currentTime', 'YYYY-MM-DD');
diff --git a/tests/Query/Postgresql/YearTest.php b/tests/Query/Postgresql/YearTest.php
index 76a5a2a2..37621438 100644
--- a/tests/Query/Postgresql/YearTest.php
+++ b/tests/Query/Postgresql/YearTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Postgresql;
-class YearTest extends \DoctrineExtensions\Tests\Query\PostgresqlTestCase
+use DoctrineExtensions\Tests\Query\PostgresqlTestCase;
+
+class YearTest extends PostgresqlTestCase
{
- public function testYear()
+ public function testYear(): void
{
$this->assertDqlProducesSql(
- "SELECT YEAR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT YEAR(2) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT EXTRACT(YEAR FROM 2) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/PostgresqlTestCase.php b/tests/Query/PostgresqlTestCase.php
index c2c2985c..5a0aed1a 100644
--- a/tests/Query/PostgresqlTestCase.php
+++ b/tests/Query/PostgresqlTestCase.php
@@ -7,6 +7,7 @@ class PostgresqlTestCase extends DbTestCase
public function setUp(): void
{
parent::setUp();
+
ConfigLoader::load($this->configuration, ConfigLoader::POSTGRES);
}
}
diff --git a/tests/Query/Sqlite/ConcatWsTest.php b/tests/Query/Sqlite/ConcatWsTest.php
index bbab2b39..40dcf96c 100644
--- a/tests/Query/Sqlite/ConcatWsTest.php
+++ b/tests/Query/Sqlite/ConcatWsTest.php
@@ -6,12 +6,12 @@
class ConcatWsTest extends SqliteTestCase
{
- public function testConcatWs()
+ public function testConcatWs(): void
{
$dql = "SELECT CONCAT_WS(',', p.id, p.name) FROM DoctrineExtensions\\Tests\\Entities\\Product p";
$this->assertEquals(
- "SELECT (IFNULL(p0_.id, '') || ',' || IFNULL(p0_.name, '')) AS {$this->columnAlias} FROM Product p0_",
+ 'SELECT (IFNULL(p0_.id, \'\') || \',\' || IFNULL(p0_.name, \'\')) AS ' . $this->columnAlias . ' FROM Product p0_',
$this->entityManager->createQuery($dql)->getSql()
);
}
diff --git a/tests/Query/Sqlite/DateFormatTest.php b/tests/Query/Sqlite/DateFormatTest.php
index 956a1c67..73e4779c 100644
--- a/tests/Query/Sqlite/DateFormatTest.php
+++ b/tests/Query/Sqlite/DateFormatTest.php
@@ -6,13 +6,13 @@
class DateFormatTest extends SqliteTestCase
{
- public function testCommonFormats()
+ public function testCommonFormats(): void
{
// Both result in '2015-12-30 14:23:40'
$dql = "SELECT DATE_FORMAT(b.created, '%Y-%m-%d %H:%i:%S') FROM DoctrineExtensions\\Tests\\Entities\\BlogPost b";
$this->assertEquals(
- "SELECT STRFTIME('%Y-%m-%d %H:%M:%S', b0_.created) AS {$this->columnAlias} FROM BlogPost b0_",
+ 'SELECT STRFTIME(\'%Y-%m-%d %H:%M:%S\', b0_.created) AS ' . $this->columnAlias . ' FROM BlogPost b0_',
$this->entityManager->createQuery($dql)->getSql()
);
}
@@ -22,7 +22,7 @@ public function testCommonFormats()
* they get converted to the closest sqlite substitutions.
* In this test a few examples are listed:
*/
- public function testUnsupportedFormats()
+ public function testUnsupportedFormats(): void
{
// Sqlite does not support AM / PM
// mysql: '10:15:22 PM'
@@ -30,7 +30,7 @@ public function testUnsupportedFormats()
$dql = "SELECT DATE_FORMAT(b.created, '%r') FROM DoctrineExtensions\\Tests\\Entities\\BlogPost b";
$this->assertEquals(
- "SELECT STRFTIME('%H:%M:%S', b0_.created) AS {$this->columnAlias} FROM BlogPost b0_",
+ 'SELECT STRFTIME(\'%H:%M:%S\', b0_.created) AS ' . $this->columnAlias . ' FROM BlogPost b0_',
$this->entityManager->createQuery($dql)->getSql()
);
@@ -40,7 +40,7 @@ public function testUnsupportedFormats()
$dql = "SELECT DATE_FORMAT(b.created, '%x-%v') FROM DoctrineExtensions\\Tests\\Entities\\BlogPost b";
$this->assertEquals(
- "SELECT STRFTIME('%Y-%W', b0_.created) AS {$this->columnAlias} FROM BlogPost b0_",
+ 'SELECT STRFTIME(\'%Y-%W\', b0_.created) AS ' . $this->columnAlias . ' FROM BlogPost b0_',
$this->entityManager->createQuery($dql)->getSql()
);
@@ -51,7 +51,7 @@ public function testUnsupportedFormats()
$dql = "SELECT DATE_FORMAT(b.created, '%W, %M %D, %Y') FROM DoctrineExtensions\\Tests\\Entities\\BlogPost b";
$this->assertEquals(
- "SELECT STRFTIME('%w, %m %d, %Y', b0_.created) AS {$this->columnAlias} FROM BlogPost b0_",
+ 'SELECT STRFTIME(\'%w, %m %d, %Y\', b0_.created) AS ' . $this->columnAlias . ' FROM BlogPost b0_',
$this->entityManager->createQuery($dql)->getSql()
);
}
diff --git a/tests/Query/Sqlite/DayTest.php b/tests/Query/Sqlite/DayTest.php
index 8453a642..7532b841 100644
--- a/tests/Query/Sqlite/DayTest.php
+++ b/tests/Query/Sqlite/DayTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Sqlite;
-class DayTest extends \DoctrineExtensions\Tests\Query\SqliteTestCase
+use DoctrineExtensions\Tests\Query\SqliteTestCase;
+
+class DayTest extends SqliteTestCase
{
- public function testDay()
+ public function testDay(): void
{
$this->assertDqlProducesSql(
- "SELECT DAY(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT DAY(2) from DoctrineExtensions\Tests\Entities\Blank b',
"SELECT CAST(STRFTIME('%d', 2) AS NUMBER) AS sclr_0 FROM Blank b0_"
);
}
diff --git a/tests/Query/Sqlite/GreatestTest.php b/tests/Query/Sqlite/GreatestTest.php
index 49a8a473..82d81335 100644
--- a/tests/Query/Sqlite/GreatestTest.php
+++ b/tests/Query/Sqlite/GreatestTest.php
@@ -6,10 +6,10 @@
class GreatestTest extends SqliteTestCase
{
- public function testGreatest()
+ public function testGreatest(): void
{
$this->assertDqlProducesSql(
- "SELECT Greatest(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT Greatest(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT MAX(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Sqlite/HourTest.php b/tests/Query/Sqlite/HourTest.php
index f57c47b3..8c94fe65 100644
--- a/tests/Query/Sqlite/HourTest.php
+++ b/tests/Query/Sqlite/HourTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Sqlite;
-class HourTest extends \DoctrineExtensions\Tests\Query\SqliteTestCase
+use DoctrineExtensions\Tests\Query\SqliteTestCase;
+
+class HourTest extends SqliteTestCase
{
- public function testHour()
+ public function testHour(): void
{
$this->assertDqlProducesSql(
- "SELECT HOUR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT HOUR(2) from DoctrineExtensions\Tests\Entities\Blank b',
"SELECT CAST(STRFTIME('%H', 2) AS NUMBER) AS sclr_0 FROM Blank b0_"
);
}
diff --git a/tests/Query/Sqlite/IfElseTest.php b/tests/Query/Sqlite/IfElseTest.php
index 3e8a4622..67318ab5 100644
--- a/tests/Query/Sqlite/IfElseTest.php
+++ b/tests/Query/Sqlite/IfElseTest.php
@@ -6,12 +6,12 @@
class IfElseTest extends SqliteTestCase
{
- public function testIfElse()
+ public function testIfElse(): void
{
$dql = 'SELECT ifelse(1 > 0, 1, 0) FROM DoctrineExtensions\\Tests\\Entities\\BlogPost b';
$this->assertEquals(
- "SELECT CASE WHEN 1 > 0 THEN 1 ELSE 0 END AS {$this->columnAlias} FROM BlogPost b0_",
+ 'SELECT CASE WHEN 1 > 0 THEN 1 ELSE 0 END AS ' . $this->columnAlias . ' FROM BlogPost b0_',
$this->entityManager->createQuery($dql)->getSql()
);
}
diff --git a/tests/Query/Sqlite/JulianDayTest.php b/tests/Query/Sqlite/JulianDayTest.php
index 9fd6ff29..e1812dee 100644
--- a/tests/Query/Sqlite/JulianDayTest.php
+++ b/tests/Query/Sqlite/JulianDayTest.php
@@ -6,10 +6,10 @@
class JulianDayTest extends SqliteTestCase
{
- public function testWithOneArgument()
+ public function testWithOneArgument(): void
{
$this->assertDqlProducesSql(
- "SELECT JULIANDAY(:date) FROM DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT JULIANDAY(:date) FROM DoctrineExtensions\Tests\Entities\Blank b',
"SELECT CAST(STRFTIME('%J', ?) AS NUMBER) AS sclr_0 FROM Blank b0_"
);
}
diff --git a/tests/Query/Sqlite/LeastTest.php b/tests/Query/Sqlite/LeastTest.php
index f8392c15..a1b2b70e 100644
--- a/tests/Query/Sqlite/LeastTest.php
+++ b/tests/Query/Sqlite/LeastTest.php
@@ -6,10 +6,10 @@
class LeastTest extends SqliteTestCase
{
- public function testLeast()
+ public function testLeast(): void
{
$this->assertDqlProducesSql(
- "SELECT LEAST(2, 3) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT LEAST(2, 3) from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT MIN(2, 3) AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Sqlite/MinuteTest.php b/tests/Query/Sqlite/MinuteTest.php
index 898fec0c..f02c4c17 100644
--- a/tests/Query/Sqlite/MinuteTest.php
+++ b/tests/Query/Sqlite/MinuteTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Sqlite;
-class MinuteTest extends \DoctrineExtensions\Tests\Query\SqliteTestCase
+use DoctrineExtensions\Tests\Query\SqliteTestCase;
+
+class MinuteTest extends SqliteTestCase
{
- public function testMinute()
+ public function testMinute(): void
{
$this->assertDqlProducesSql(
- "SELECT MINUTE(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MINUTE(2) from DoctrineExtensions\Tests\Entities\Blank b',
"SELECT CAST(STRFTIME('%M', 2) AS NUMBER) AS sclr_0 FROM Blank b0_"
);
}
diff --git a/tests/Query/Sqlite/MonthTest.php b/tests/Query/Sqlite/MonthTest.php
index 89277a2a..848dc680 100644
--- a/tests/Query/Sqlite/MonthTest.php
+++ b/tests/Query/Sqlite/MonthTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Sqlite;
-class MonthTest extends \DoctrineExtensions\Tests\Query\SqliteTestCase
+use DoctrineExtensions\Tests\Query\SqliteTestCase;
+
+class MonthTest extends SqliteTestCase
{
- public function testMonth()
+ public function testMonth(): void
{
$this->assertDqlProducesSql(
- "SELECT MONTH(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT MONTH(2) from DoctrineExtensions\Tests\Entities\Blank b',
"SELECT CAST(STRFTIME('%m', 2) AS NUMBER) AS sclr_0 FROM Blank b0_"
);
}
diff --git a/tests/Query/Sqlite/NumericFunctionsTest.php b/tests/Query/Sqlite/NumericFunctionsTest.php
index 440a74d9..78e63dd8 100644
--- a/tests/Query/Sqlite/NumericFunctionsTest.php
+++ b/tests/Query/Sqlite/NumericFunctionsTest.php
@@ -11,14 +11,14 @@
*/
class NumericFunctionsTest extends SqliteTestCase
{
- public function testRound()
+ public function testRound(): void
{
$dql = 'SELECT ROUND(1.2345, 2) as outcome FROM DoctrineExtensions\Tests\Entities\Blank p';
- $q = $this->entityManager->createQuery($dql);
- $this->assertEquals("SELECT ROUND(1.2345, 2) AS {$this->columnAlias} FROM Blank b0_", $q->getSql());
+ $q = $this->entityManager->createQuery($dql);
+ $this->assertEquals('SELECT ROUND(1.2345, 2) AS ' . $this->columnAlias . ' FROM Blank b0_', $q->getSql());
$dql = 'SELECT ROUND(1.2345) as outcome FROM DoctrineExtensions\Tests\Entities\Blank p';
- $q = $this->entityManager->createQuery($dql);
- $this->assertEquals("SELECT ROUND(1.2345) AS {$this->columnAlias} FROM Blank b0_", $q->getSql());
+ $q = $this->entityManager->createQuery($dql);
+ $this->assertEquals('SELECT ROUND(1.2345) AS ' . $this->columnAlias . ' FROM Blank b0_', $q->getSql());
}
}
diff --git a/tests/Query/Sqlite/RandomTest.php b/tests/Query/Sqlite/RandomTest.php
index d5c44533..5844325e 100644
--- a/tests/Query/Sqlite/RandomTest.php
+++ b/tests/Query/Sqlite/RandomTest.php
@@ -6,10 +6,10 @@
class RandomTest extends SqliteTestCase
{
- public function testRandom()
+ public function testRandom(): void
{
$this->assertDqlProducesSql(
- "SELECT RANDOM() from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT RANDOM() from DoctrineExtensions\Tests\Entities\Blank b',
'SELECT RANDOM() AS sclr_0 FROM Blank b0_'
);
}
diff --git a/tests/Query/Sqlite/SecondTest.php b/tests/Query/Sqlite/SecondTest.php
index 8562df64..a74b1243 100644
--- a/tests/Query/Sqlite/SecondTest.php
+++ b/tests/Query/Sqlite/SecondTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Sqlite;
-class SecondTest extends \DoctrineExtensions\Tests\Query\SqliteTestCase
+use DoctrineExtensions\Tests\Query\SqliteTestCase;
+
+class SecondTest extends SqliteTestCase
{
- public function testSecond()
+ public function testSecond(): void
{
$this->assertDqlProducesSql(
- "SELECT SECOND(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT SECOND(2) from DoctrineExtensions\Tests\Entities\Blank b',
"SELECT CAST(STRFTIME('%S', 2) AS NUMBER) AS sclr_0 FROM Blank b0_"
);
}
diff --git a/tests/Query/Sqlite/StrfTimeTest.php b/tests/Query/Sqlite/StrfTimeTest.php
index d0bb147d..c41aa52d 100644
--- a/tests/Query/Sqlite/StrfTimeTest.php
+++ b/tests/Query/Sqlite/StrfTimeTest.php
@@ -4,9 +4,12 @@
use DoctrineExtensions\Tests\Query\SqliteTestCase;
+use function sprintf;
+
class StrfTimeTest extends SqliteTestCase
{
- public function getFunctionFormatters()
+ /** @return array> */
+ public function getFunctionFormatters(): array
{
return [
['Year', '%Y'],
@@ -20,10 +23,8 @@ public function getFunctionFormatters()
];
}
- /**
- * @dataProvider getFunctionFormatters
- */
- public function testStrfTimes($function, $formatter)
+ /** @dataProvider getFunctionFormatters */
+ public function testStrfTimes($function, $formatter): void
{
$this->assertDqlProducesSql(
sprintf('SELECT %s(p.created) as Year FROM DoctrineExtensions\Tests\Entities\Date p', $function),
@@ -31,11 +32,11 @@ public function testStrfTimes($function, $formatter)
);
}
- public function testStrfTime()
+ public function testStrfTime(): void
{
$this->assertDqlProducesSql(
'SELECT StrfTime(\'%s\', p.created) as Time FROM DoctrineExtensions\Tests\Entities\Date p',
- "SELECT strftime('%s', d0_.created) AS {$this->columnAlias} FROM Date d0_"
+ 'SELECT strftime(\'%s\', d0_.created) AS ' . $this->columnAlias . ' FROM Date d0_'
);
}
}
diff --git a/tests/Query/Sqlite/StringFunctionsTest.php b/tests/Query/Sqlite/StringFunctionsTest.php
index fbbb6882..d8017c70 100644
--- a/tests/Query/Sqlite/StringFunctionsTest.php
+++ b/tests/Query/Sqlite/StringFunctionsTest.php
@@ -6,30 +6,31 @@
/**
* This class is responsible for testing the Sqlite string functions
+ *
* @author winkbrace
*/
class StringFunctionsTest extends SqliteTestCase
{
- public function testIfNull()
+ public function testIfNull(): void
{
$dql = 'SELECT IFNULL(p.id, 0) as outcome FROM DoctrineExtensions\Tests\Entities\Blank p';
- $q = $this->entityManager->createQuery($dql);
- $this->assertEquals("SELECT IFNULL(b0_.id, 0) AS {$this->columnAlias} FROM Blank b0_", $q->getSql());
+ $q = $this->entityManager->createQuery($dql);
+ $this->assertEquals('SELECT IFNULL(b0_.id, 0) AS ' . $this->columnAlias . ' FROM Blank b0_', $q->getSql());
}
- public function testReplace()
+ public function testReplace(): void
{
$dql = "SELECT REPLACE(p.id, '1', '2') as outcome FROM DoctrineExtensions\\Tests\\Entities\\Blank p";
- $q = $this->entityManager->createQuery($dql);
- $this->assertEquals("SELECT REPLACE(b0_.id, '1', '2') AS {$this->columnAlias} FROM Blank b0_", $q->getSql());
+ $q = $this->entityManager->createQuery($dql);
+ $this->assertEquals('SELECT REPLACE(b0_.id, \'1\', \'2\') AS ' . $this->columnAlias . ' FROM Blank b0_', $q->getSql());
}
- public function testConcatWs()
+ public function testConcatWs(): void
{
$dql = "SELECT CONCAT_WS('-', 'foo', 'bar', 'baz') as out FROM DoctrineExtensions\\Tests\\Entities\\Blank p";
$expected = "SELECT (IFNULL('foo', '') || '-' || IFNULL('bar', '') || '-' || IFNULL('baz', ''))"
- . " AS {$this->columnAlias} FROM Blank b0_";
+ . ' AS ' . $this->columnAlias . ' FROM Blank b0_';
$this->assertEquals($expected, $this->entityManager->createQuery($dql)->getSql());
}
diff --git a/tests/Query/Sqlite/WeekDayTest.php b/tests/Query/Sqlite/WeekDayTest.php
index c15da7af..d152feae 100644
--- a/tests/Query/Sqlite/WeekDayTest.php
+++ b/tests/Query/Sqlite/WeekDayTest.php
@@ -6,11 +6,11 @@
class WeekDayTest extends SqliteTestCase
{
- public function testFormatWeekDay()
+ public function testFormatWeekDay(): void
{
$dql = 'SELECT WEEKDAY(b.created) FROM DoctrineExtensions\\Tests\\Entities\\BlogPost b';
$this->assertEquals(
- "SELECT CAST(STRFTIME('%w', b0_.created) AS NUMBER) AS {$this->columnAlias} FROM BlogPost b0_",
+ 'SELECT CAST(STRFTIME(\'%w\', b0_.created) AS NUMBER) AS ' . $this->columnAlias . ' FROM BlogPost b0_',
$this->entityManager->createQuery($dql)->getSql()
);
}
diff --git a/tests/Query/Sqlite/WeekTest.php b/tests/Query/Sqlite/WeekTest.php
index e383618b..62caf3e0 100644
--- a/tests/Query/Sqlite/WeekTest.php
+++ b/tests/Query/Sqlite/WeekTest.php
@@ -6,20 +6,20 @@
class WeekTest extends SqliteTestCase
{
- public function testFormatWeek()
+ public function testFormatWeek(): void
{
$dql = 'SELECT WEEK(b.created) FROM DoctrineExtensions\\Tests\\Entities\\BlogPost b';
$this->assertEquals(
- "SELECT CAST(STRFTIME('%W', b0_.created) AS NUMBER) AS {$this->columnAlias} FROM BlogPost b0_",
+ 'SELECT CAST(STRFTIME(\'%W\', b0_.created) AS NUMBER) AS ' . $this->columnAlias . ' FROM BlogPost b0_',
$this->entityManager->createQuery($dql)->getSql()
);
}
- public function testFormatWeekWithSecondArgument()
+ public function testFormatWeekWithSecondArgument(): void
{
$dql = 'SELECT WEEK(b.created, 1) FROM DoctrineExtensions\\Tests\\Entities\\BlogPost b';
$this->assertEquals(
- "SELECT CAST(STRFTIME('%W', b0_.created) AS NUMBER) AS {$this->columnAlias} FROM BlogPost b0_",
+ 'SELECT CAST(STRFTIME(\'%W\', b0_.created) AS NUMBER) AS ' . $this->columnAlias . ' FROM BlogPost b0_',
$this->entityManager->createQuery($dql)->getSql()
);
}
diff --git a/tests/Query/Sqlite/YearTest.php b/tests/Query/Sqlite/YearTest.php
index f8a95d36..a2a6d2be 100644
--- a/tests/Query/Sqlite/YearTest.php
+++ b/tests/Query/Sqlite/YearTest.php
@@ -2,12 +2,14 @@
namespace DoctrineExtensions\Tests\Query\Sqlite;
-class YearTest extends \DoctrineExtensions\Tests\Query\SqliteTestCase
+use DoctrineExtensions\Tests\Query\SqliteTestCase;
+
+class YearTest extends SqliteTestCase
{
- public function testYear()
+ public function testYear(): void
{
$this->assertDqlProducesSql(
- "SELECT YEAR(2) from DoctrineExtensions\Tests\Entities\Blank b",
+ 'SELECT YEAR(2) from DoctrineExtensions\Tests\Entities\Blank b',
"SELECT CAST(STRFTIME('%Y', 2) AS NUMBER) AS sclr_0 FROM Blank b0_"
);
}
diff --git a/tests/Query/SqliteTestCase.php b/tests/Query/SqliteTestCase.php
index 30ae6309..287b5538 100644
--- a/tests/Query/SqliteTestCase.php
+++ b/tests/Query/SqliteTestCase.php
@@ -2,16 +2,17 @@
namespace DoctrineExtensions\Tests\Query;
+use function method_exists;
+
class SqliteTestCase extends DbTestCase
{
- /**
- * @var string name of Date
- */
+ /** @var string name of Date */
protected $columnAlias;
public function setUp(): void
{
parent::setUp();
+
ConfigLoader::load($this->configuration, ConfigLoader::SQLITE);
$emConfiguration = $this->entityManager->getConfiguration();
diff --git a/tests/Types/CarbonDateTest.php b/tests/Types/CarbonDateTest.php
index a1d32bd4..996fa8b8 100755
--- a/tests/Types/CarbonDateTest.php
+++ b/tests/Types/CarbonDateTest.php
@@ -4,11 +4,17 @@
use Carbon\Carbon;
use Carbon\CarbonImmutable;
+use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Configuration;
+use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Tools\SchemaTool;
use DoctrineExtensions\Tests\Entities\CarbonDate as Entity;
use PHPUnit\Framework\TestCase;
+use function assert;
+
/**
* Test type that maps an SQL DATETIME/TIMESTAMP to a Carbon/Carbon object.
*
@@ -32,15 +38,15 @@ public static function setUpBeforeClass(): void
public function setUp(): void
{
- $config = new \Doctrine\ORM\Configuration();
- $config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ArrayCache());
- $config->setQueryCacheImpl(new \Doctrine\Common\Cache\ArrayCache());
+ $config = new Configuration();
+ $config->setMetadataCacheImpl(new ArrayCache());
+ $config->setQueryCacheImpl(new ArrayCache());
$config->setProxyDir(__DIR__ . '/Proxies');
$config->setProxyNamespace('DoctrineExtensions\Tests\PHPUnit\Proxies');
$config->setAutoGenerateProxyClasses(true);
$config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(__DIR__ . '/../../Entities'));
- $this->em = \Doctrine\ORM\EntityManager::create(
+ $this->em = EntityManager::create(
[
'driver' => 'pdo_sqlite',
'memory' => true,
@@ -54,21 +60,21 @@ public function setUp(): void
$this->em->getClassMetadata('DoctrineExtensions\Tests\Entities\CarbonDate'),
]);
- $entity = new Entity();
- $entity->id = 1;
- $entity->date = Carbon::createFromDate(2015, 1, 1);
- $entity->datetime = Carbon::create(2015, 1, 1, 0, 0, 0);
- $entity->datetime_tz = Carbon::create(2012, 1, 1, 0, 0, 0, 'US/Pacific');
- $entity->time = Carbon::createFromTime(12, 0, 0, 'Europe/London');
- $entity->date_immutable = CarbonImmutable::createFromDate(2015, 1, 1);
- $entity->datetime_immutable = CarbonImmutable::create(2015, 1, 1, 0, 0, 0);
- $entity->datetime_tz_immutable = CarbonImmutable::create(2012, 1, 1, 0, 0, 0, 'US/Pacific');
- $entity->time_immutable = CarbonImmutable::createFromTime(12, 0, 0, 'Europe/London');
+ $entity = new Entity();
+ $entity->id = 1;
+ $entity->date = Carbon::createFromDate(2015, 1, 1);
+ $entity->datetime = Carbon::create(2015, 1, 1, 0, 0, 0);
+ $entity->datetimeTz = Carbon::create(2012, 1, 1, 0, 0, 0, 'US/Pacific');
+ $entity->time = Carbon::createFromTime(12, 0, 0, 'Europe/London');
+ $entity->dateImmutable = CarbonImmutable::createFromDate(2015, 1, 1);
+ $entity->datetimeImmutable = CarbonImmutable::create(2015, 1, 1, 0, 0, 0);
+ $entity->datetimeTzImmutable = CarbonImmutable::create(2012, 1, 1, 0, 0, 0, 'US/Pacific');
+ $entity->timeImmutable = CarbonImmutable::createFromTime(12, 0, 0, 'Europe/London');
$this->em->persist($entity);
$this->em->flush();
}
- public function testDateGetter()
+ public function testDateGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
@@ -79,17 +85,17 @@ public function testDateGetter()
);
}
- public function testDateSetter()
+ public function testDateSetter(): void
{
- $entity = new Entity();
- $entity->id = 2;
+ $entity = new Entity();
+ $entity->id = 2;
$entity->date = Carbon::createFromDate(2015, 1, 1);
$this->em->persist($entity);
$this->assertNull($this->em->flush());
}
- public function testDateTimeGetter()
+ public function testDateTimeGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
@@ -97,35 +103,35 @@ public function testDateTimeGetter()
$this->assertEquals(Carbon::create(2015, 1, 1, 0, 0, 0), $entity->datetime);
}
- public function testDateTimeSetter()
+ public function testDateTimeSetter(): void
{
- $entity = new Entity();
- $entity->id = 2;
+ $entity = new Entity();
+ $entity->id = 2;
$entity->datetime = Carbon::create(2015, 1, 1, 0, 0, 0);
$this->em->persist($entity);
$this->assertNull($this->em->flush());
}
- public function testDateTimeTzGetter()
+ public function testDateTimeTzGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
- $this->assertInstanceOf('Carbon\Carbon', $entity->datetime_tz);
- $this->assertEquals(Carbon::create(2012, 1, 1, 0, 0, 0, 'US/Pacific'), $entity->datetime_tz);
+ $this->assertInstanceOf('Carbon\Carbon', $entity->datetimeTz);
+ $this->assertEquals(Carbon::create(2012, 1, 1, 0, 0, 0, 'US/Pacific'), $entity->datetimeTz);
}
- public function testDateTimeTzSetter()
+ public function testDateTimeTzSetter(): void
{
- $entity = new Entity();
- $entity->id = 2;
- $entity->datetime_tz = Carbon::create(2012, 1, 1, 0, 0, 0, 'US/Pacific');
+ $entity = new Entity();
+ $entity->id = 2;
+ $entity->datetimeTz = Carbon::create(2012, 1, 1, 0, 0, 0, 'US/Pacific');
$this->em->persist($entity);
$this->assertNull($this->em->flush());
}
- public function testTimeGetter()
+ public function testTimeGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
@@ -133,103 +139,102 @@ public function testTimeGetter()
$this->assertEquals(Carbon::createFromTime(12, 0, 0, 'Europe/London'), $entity->time);
}
- public function testTimeSetter()
+ public function testTimeSetter(): void
{
- $entity = new Entity();
- $entity->id = 2;
+ $entity = new Entity();
+ $entity->id = 2;
$entity->time = Carbon::createFromTime(12, 0, 0, 'Europe/London');
$this->em->persist($entity);
$this->assertNull($this->em->flush());
}
- public function testImmutableDateGetter()
+ public function testImmutableDateGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
- $this->assertInstanceOf('Carbon\CarbonImmutable', $entity->date_immutable);
+ $this->assertInstanceOf('Carbon\CarbonImmutable', $entity->dateImmutable);
$this->assertEquals(
CarbonImmutable::createFromDate(2015, 1, 1, $entity->date->timezone)->format('Y-m-d'),
$entity->date->format('Y-m-d')
);
}
- public function testImmutableDateSetter()
+ public function testImmutableDateSetter(): void
{
- $entity = new Entity();
- $entity->id = 2;
+ $entity = new Entity();
+ $entity->id = 2;
$entity->date = CarbonImmutable::createFromDate(2015, 1, 1);
$this->em->persist($entity);
$this->assertNull($this->em->flush());
}
- public function testImmutableDateTimeGetter()
+ public function testImmutableDateTimeGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
- $this->assertInstanceOf('Carbon\CarbonImmutable', $entity->datetime_immutable);
+ $this->assertInstanceOf('Carbon\CarbonImmutable', $entity->datetimeImmutable);
$this->assertEquals(CarbonImmutable::create(2015, 1, 1, 0, 0, 0), $entity->datetime);
}
- public function testImmutableDateTimeSetter()
+ public function testImmutableDateTimeSetter(): void
{
- $entity = new Entity();
- $entity->id = 2;
+ $entity = new Entity();
+ $entity->id = 2;
$entity->datetime = CarbonImmutable::create(2015, 1, 1, 0, 0, 0);
$this->em->persist($entity);
$this->assertNull($this->em->flush());
}
- public function testImmutableDateTimeTzGetter()
+ public function testImmutableDateTimeTzGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
- $this->assertInstanceOf('Carbon\CarbonImmutable', $entity->datetime_tz_immutable);
- $this->assertEquals(CarbonImmutable::create(2012, 1, 1, 0, 0, 0, 'US/Pacific'), $entity->datetime_tz);
+ $this->assertInstanceOf('Carbon\CarbonImmutable', $entity->datetimeTzImmutable);
+ $this->assertEquals(CarbonImmutable::create(2012, 1, 1, 0, 0, 0, 'US/Pacific'), $entity->datetimeTz);
}
- public function testImmutableDateTimeTzSetter()
+ public function testImmutableDateTimeTzSetter(): void
{
- $entity = new Entity();
- $entity->id = 2;
- $entity->datetime_tz = CarbonImmutable::create(2012, 1, 1, 0, 0, 0, 'US/Pacific');
+ $entity = new Entity();
+ $entity->id = 2;
+ $entity->datetimeTz = CarbonImmutable::create(2012, 1, 1, 0, 0, 0, 'US/Pacific');
$this->em->persist($entity);
$this->assertNull($this->em->flush());
}
- public function testImmutableTimeGetter()
+ public function testImmutableTimeGetter(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\CarbonDate', 1);
- $this->assertInstanceOf('Carbon\CarbonImmutable', $entity->time_immutable);
+ $this->assertInstanceOf('Carbon\CarbonImmutable', $entity->timeImmutable);
$this->assertEquals(CarbonImmutable::createFromTime(12, 0, 0, 'Europe/London'), $entity->time);
}
- public function testImmutableTimeSetter()
+ public function testImmutableTimeSetter(): void
{
- $entity = new Entity();
- $entity->id = 2;
+ $entity = new Entity();
+ $entity->id = 2;
$entity->time = CarbonImmutable::createFromTime(12, 0, 0, 'Europe/London');
$this->em->persist($entity);
$this->assertNull($this->em->flush());
}
- /**
- * @dataProvider typeProvider
- */
- public function testTypesThatMapToAlreadyMappedDatabaseTypesRequireCommentHint($type)
+ /** @dataProvider typeProvider */
+ public function testTypesThatMapToAlreadyMappedDatabaseTypesRequireCommentHint($type): void
{
- /** @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform */
$platform = $this->getMockForAbstractClass('Doctrine\DBAL\Platforms\AbstractPlatform');
+ assert($platform instanceof AbstractPlatform);
$this->assertTrue(Type::getType($type)->requiresSQLCommentHint($platform));
}
- public function typeProvider()
+ /** @return array> */
+ public function typeProvider(): array
{
return [
['CarbonDate'],
diff --git a/tests/Types/ZendDateTest.php b/tests/Types/ZendDateTest.php
index 5e133b1a..b5107fc7 100755
--- a/tests/Types/ZendDateTest.php
+++ b/tests/Types/ZendDateTest.php
@@ -2,8 +2,17 @@
namespace DoctrineExtensions\Tests\Types;
+use Doctrine\Common\Cache\ArrayCache;
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\ORM\Configuration;
+use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Tools\SchemaTool;
+use DoctrineExtensions\Tests\Entities\ZendDate;
use PHPUnit\Framework\TestCase;
+use Zend_Date;
+
+use function assert;
/**
* Test type that maps an SQL DATETIME/TIMESTAMP to a Zend_Date object.
@@ -16,7 +25,7 @@ class ZendDateTest extends TestCase
public static function setUpBeforeClass(): void
{
- \Doctrine\DBAL\Types\Type::addType(
+ Type::addType(
'ZendDate',
'DoctrineExtensions\Types\ZendDateType'
);
@@ -24,15 +33,15 @@ public static function setUpBeforeClass(): void
public function setUp(): void
{
- $config = new \Doctrine\ORM\Configuration();
- $config->setMetadataCacheImpl(new \Doctrine\Common\Cache\ArrayCache());
- $config->setQueryCacheImpl(new \Doctrine\Common\Cache\ArrayCache());
+ $config = new Configuration();
+ $config->setMetadataCacheImpl(new ArrayCache());
+ $config->setQueryCacheImpl(new ArrayCache());
$config->setProxyDir(__DIR__ . '/Proxies');
$config->setProxyNamespace('DoctrineExtensions\Tests\PHPUnit\Proxies');
$config->setAutoGenerateProxyClasses(true);
$config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(__DIR__ . '/../../Entities'));
- $this->em = \Doctrine\ORM\EntityManager::create(
+ $this->em = EntityManager::create(
[
'driver' => 'pdo_sqlite',
'memory' => true,
@@ -46,33 +55,45 @@ public function setUp(): void
$this->em->getClassMetadata('DoctrineExtensions\Tests\Entities\ZendDate'),
]);
- $this->em->persist(new \DoctrineExtensions\Tests\Entities\ZendDate(1, new \Zend_Date([
- 'year' => 2012, 'month' => 11, 'day' => 10,
- 'hour' => 9, 'minute' => 8, 'second' => 7,
+ $this->em->persist(new ZendDate(1, new Zend_Date([
+ 'year' => 2012,
+ 'month' => 11,
+ 'day' => 10,
+ 'hour' => 9,
+ 'minute' => 8,
+ 'second' => 7,
])));
$this->em->flush();
}
- public function testGetZendDate()
+ public function testGetZendDate(): void
{
$entity = $this->em->find('DoctrineExtensions\Tests\Entities\ZendDate', 1);
$this->assertInstanceOf('Zend_Date', $entity->date);
- $this->assertTrue($entity->date->equals(new \Zend_Date([
- 'year' => 2012, 'month' => 11, 'day' => 10,
- 'hour' => 9, 'minute' => 8, 'second' => 7,
+ $this->assertTrue($entity->date->equals(new Zend_Date([
+ 'year' => 2012,
+ 'month' => 11,
+ 'day' => 10,
+ 'hour' => 9,
+ 'minute' => 8,
+ 'second' => 7,
])));
}
- public function testSetZendDate()
+ public function testSetZendDate(): void
{
- $zendDate = new \Zend_Date([
- 'year' => 2012, 'month' => 11, 'day' => 10,
- 'hour' => 9, 'minute' => 8, 'second' => 7,
+ $zendDate = new Zend_Date([
+ 'year' => 2012,
+ 'month' => 11,
+ 'day' => 10,
+ 'hour' => 9,
+ 'minute' => 8,
+ 'second' => 7,
]);
- $entity = new \DoctrineExtensions\Tests\Entities\ZendDate(2, $zendDate);
+ $entity = new ZendDate(2, $zendDate);
$this->em->persist($entity);
$this->em->flush();
@@ -82,11 +103,11 @@ public function testSetZendDate()
$this->assertTrue($entity->date->equals($zendDate));
}
- public function testTypesThatMapToAlreadyMappedDatabaseTypesRequireCommentHint()
+ public function testTypesThatMapToAlreadyMappedDatabaseTypesRequireCommentHint(): void
{
- /** @var \Doctrine\DBAL\Platforms\AbstractPlatform $platform */
$platform = $this->getMockForAbstractClass('Doctrine\DBAL\Platforms\AbstractPlatform');
+ assert($platform instanceof AbstractPlatform);
- $this->assertTrue(\Doctrine\DBAL\Types\Type::getType('ZendDate')->requiresSQLCommentHint($platform));
+ $this->assertTrue(Type::getType('ZendDate')->requiresSQLCommentHint($platform));
}
}