Fixing ORM helpers and base classes.

Author: krulis-martin

app/model/entity/base/VersionableEntity.php

@@ -6,7 +6,6 @@
 
 trait VersionableEntity
 {
-
     /**
      * @ORM\Column(type="integer")
      */

app/model/helpers/CustomCoalesceFunction.php

@@ -3,6 +3,7 @@
 namespace DoctrineExtensions\Query\Functions;
 
 use Doctrine\ORM\Query\Lexer;
+use Doctrine\ORM\Query\TokenType;
 use Doctrine\ORM\Query\AST\Functions\FunctionNode;
 
 /**
@@ -38,21 +39,21 @@ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker)
      */
     public function parse(\Doctrine\ORM\Query\Parser $parser)
     {
-        $parser->match(Lexer::T_IDENTIFIER);
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
 
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
         $this->subselectExpressions[] = $parser->Subselect();
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
 
-        while ($parser->getLexer()->isNextToken(Lexer::T_COMMA)) {
-            $parser->match(Lexer::T_COMMA);
+        while ($parser->getLexer()->isNextToken(TokenType::T_COMMA)) {
+            $parser->match(TokenType::T_COMMA);
 
-            $parser->match(Lexer::T_OPEN_PARENTHESIS);
+            $parser->match(TokenType::T_OPEN_PARENTHESIS);
             $this->subselectExpressions[] = $parser->Subselect();
-            $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+            $parser->match(TokenType::T_CLOSE_PARENTHESIS);
         }
 
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 }

app/model/helpers/DqlTypeFunction.php

@@ -7,13 +7,14 @@
 use Doctrine\ORM\Query\Parser;
 use Doctrine\ORM\Query\QueryException;
 use Doctrine\ORM\Query\SqlWalker;
+use Doctrine\ORM\Query\TokenType;
 
 /**
  * Provides a way to access an entity's discriminator field in DQL
  * queries.
  *
  * Assuming the same "Person" entity from Doctrine's documentation on
- * Inheritence Mapping, which has a discriminator field named "discr":
+ * Inheritance Mapping, which has a discriminator field named "discr":
  *
  * Using the TYPE() function, DQL will interpret this:
  *
@@ -66,11 +67,11 @@ public function getSql(SqlWalker $sqlWalker)
      */
     public function parse(Parser $parser)
     {
-        $parser->match(Lexer::T_IDENTIFIER);
-        $parser->match(Lexer::T_OPEN_PARENTHESIS);
+        $parser->match(TokenType::T_IDENTIFIER);
+        $parser->match(TokenType::T_OPEN_PARENTHESIS);
 
         $this->dqlAlias = $parser->IdentificationVariable();
 
-        $parser->match(Lexer::T_CLOSE_PARENTHESIS);
+        $parser->match(TokenType::T_CLOSE_PARENTHESIS);
     }
 }

app/model/helpers/OrderByCollationInjectionMysqlWalker.php

@@ -13,8 +13,8 @@ class OrderByCollationInjectionMysqlWalker extends SqlWalker
     /**
      * Name of the hint, which holds the actual collation.
      */
-    const HINT_COLLATION = 'orderByCollationInjectionMysqlWalker.collation';
-    const HINT_COLLATION_FORBIDDEN_COLUMNS = 'orderByCollationInjectionMysqlWalker.forbiddenCols';
+    public const HINT_COLLATION = 'orderByCollationInjectionMysqlWalker.collation';
+    public const HINT_COLLATION_FORBIDDEN_COLUMNS = 'orderByCollationInjectionMysqlWalker.forbiddenCols';
 
     private function isForbidden($orderByItemTokens)
     {

app/model/helpers/PaginationDBHelper.php

@@ -47,7 +47,7 @@ class PaginationDbHelper
 
     /**
      * Internal function that appends andWhere clause to query builder handling
-     * fultext search of one search token.
+     * full text search of one search token.
      */
     private function addSearchCondition(QueryBuilder $qb, string $searchToken, string $alias)
     {
@@ -81,10 +81,10 @@ private function addSearchCondition(QueryBuilder $qb, string $searchToken, strin
     }
 
     /**
-     * Createa and initialize the helper.
+     * Create and initialize the helper.
      * @param array $orderByColumns Known order by names (sent from UI), each holding a list
      *                              of corresponding order by DB columns.
-     * @param array $searchCols List of columns which are tested by fultext search filter.
+     * @param array $searchCols List of columns which are tested by full text search filter.
      * @param string|null $localizedTextsClass Name of an entity class which is used for localization texts.
      *                                         If null, no localization is expected.
      */
@@ -116,7 +116,7 @@ public function applySearchFilter(QueryBuilder $qb, string $search, ?string $ali
     }
 
     /**
-     * Apply the helper on a query bulider (add common clauses) using pagination metadata.
+     * Apply the helper on a query builder (add common clauses) using pagination metadata.
      * @param QueryBuilder $qb Query builder being augmented.
      * @param Pagination $pagination Pagination object which holds the filter and order by parameters.
      * @param string|null $alias Alias of the main table use in the query builder. If null, alias is auto-detected.
@@ -152,7 +152,7 @@ public function apply(QueryBuilder $qb, Pagination $pagination, ?string $alias =
     }
 
     /**
-     * Apply collation patches on the query yileded from the builder and fetch the results.
+     * Apply collation patches on the query yielded from the builder and fetch the results.
      * @param QueryBuilder $qb Query builder holding the final query.
      * @param Pagination $pagination Pagination object which holds the filter and order by parameters.
      * @return array