From 966f9a84c26db0888bb86530264c18f8b062429e Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Mon, 19 Jun 2017 09:00:00 +0100 Subject: [PATCH] phpDoc and type hint changes. --- lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php | 9 ++++----- lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php | 9 ++++----- lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php | 9 ++++----- lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php | 9 ++++----- lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php | 9 ++++----- .../Tests/ORM/Functional/CustomFunctionsTest.php | 4 ++-- 6 files changed, 22 insertions(+), 27 deletions(-) diff --git a/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php index 7d9703d0d..d217eb4b7 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "AVG" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class AvgFunction extends FunctionNode @@ -35,12 +34,12 @@ class AvgFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class AvgFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php index e5b7220ed..34a9a723c 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "COUNT" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class CountFunction extends FunctionNode @@ -35,12 +34,12 @@ class CountFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class CountFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php index c01cc2d86..d430cc428 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "MAX" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class MaxFunction extends FunctionNode @@ -35,12 +34,12 @@ class MaxFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class MaxFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php index 1985be2d8..345f99a94 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "MIN" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class MinFunction extends FunctionNode @@ -35,12 +34,12 @@ class MinFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class MinFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php index f8cd48db0..d77e284c0 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "SUM" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class SumFunction extends FunctionNode @@ -35,12 +34,12 @@ class SumFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class SumFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php index aa56e1f93..79668b8f2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php @@ -94,12 +94,12 @@ class CustomCount extends FunctionNode */ private $aggregateExpression; - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); }