From 5c857c27ff1eb5aae78d1019eefbd41219bc57aa Mon Sep 17 00:00:00 2001 From: thePanz Date: Fri, 11 Oct 2024 21:55:41 +0200 Subject: [PATCH] Add(typehint): Add typehint to methods and void return to Doctrine_Query_Abstract::clear() --- lib/Doctrine/Query.php | 5 +---- lib/Doctrine/Query/Abstract.php | 4 +--- lib/Doctrine/RawSql.php | 6 +++--- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php index a4d0b40f8..bf80f1d1e 100644 --- a/lib/Doctrine/Query.php +++ b/lib/Doctrine/Query.php @@ -187,10 +187,7 @@ public static function create($conn = null, $class = null) return new $class($conn); } - /** - * Clears all the sql parts. - */ - protected function clear() + protected function clear(): void { $this->_preQueried = false; $this->_pendingJoinConditions = array(); diff --git a/lib/Doctrine/Query/Abstract.php b/lib/Doctrine/Query/Abstract.php index 247886f1c..ae78b1f68 100644 --- a/lib/Doctrine/Query/Abstract.php +++ b/lib/Doctrine/Query/Abstract.php @@ -1917,10 +1917,8 @@ public function offset($offset) /** * Resets all the sql parts. - * - * @return void */ - protected function clear() + protected function clear(): void { $this->_sqlParts = array( 'select' => array(), diff --git a/lib/Doctrine/RawSql.php b/lib/Doctrine/RawSql.php index 73220e2e9..99d0b6d18 100644 --- a/lib/Doctrine/RawSql.php +++ b/lib/Doctrine/RawSql.php @@ -57,7 +57,7 @@ function __construct(Doctrine_Connection $connection = null, Doctrine_Hydrator_A $this->useQueryCache(false); } - protected function clear() + protected function clear(): void { $this->_preQueried = false; $this->_pendingJoinConditions = array(); @@ -108,9 +108,9 @@ protected function _addDqlQueryPart($queryPartName, $queryPart, $append = false) /** * Add select parts to fields. * - * @param $queryPart sting The name of the querypart + * @param $queryPart string The name of the querypart */ - private function _parseSelectFields($queryPart) + private function _parseSelectFields(string $queryPart): void { preg_match_all('/{([^}{]*)}/U', $queryPart, $m); $this->fields = $m[1];