Fixing tests; minor adjustments

.gitignore

@@ -4,4 +4,5 @@
 /tests/phpunit.xml
 /vendor
 .php-cs-fixer.cache
-clover.xml
+clover.xml
+.idea

composer.json

@@ -15,8 +15,9 @@
         "doctrine/orm": "^3.3"
     },
     "require-dev": {
+        "carbonphp/carbon-doctrine-types": "^3.2",
         "friendsofphp/php-cs-fixer": "^3.64",
-        "nesbot/carbon": "^2.72",
+        "nesbot/carbon": "^3.8",
         "phpstan/phpstan": "^1.12",
         "phpunit/phpunit": "^10.5",
         "symfony/cache": "^6.4 || ^7.0",

phpunit.xml.dist

@@ -14,7 +14,6 @@
     <source>
         <include>
             <directory>./src/Query</directory>
-            <directory>./src/Types</directory>
         </include>
     </source>
 </phpunit>

src/Query/Mysql/Atan2.php

@@ -15,13 +15,8 @@ class Atan2 extends FunctionNode
 
     public function getSql(SqlWalker $sqlWalker): string
     {
-        $firstArgument = $sqlWalker->walkSimpleArithmeticExpression(
-            $this->firstExpression
-        );
-
-        $secondArgument = $sqlWalker->walkSimpleArithmeticExpression(
-            $this->secondExpression
-        );
+        $firstArgument = $sqlWalker->walkSimpleArithmeticExpression($this->firstExpression);
+        $secondArgument = $sqlWalker->walkSimpleArithmeticExpression($this->secondExpression);
 
         return 'ATAN2(' . $firstArgument . ', ' . $secondArgument . ')';
     }

src/Query/SortableNullsWalker.php

@@ -3,7 +3,6 @@
 namespace DoctrineExtensions\Query;
 
 use Doctrine\ORM\Query;
-use Doctrine\ORM\Query\AST\OrderByItem;
 
 /**
  * The SortableNullsWalker is a TreeWalker that walks over a DQL AST and constructs
@@ -18,12 +17,12 @@
  *     ->addOrderBy('p.id', 'DESC'); // relation to person
  *
  * $query = $qb->getQuery();
- * $query->setHint(Doctrine\ORM\Query::HINT_CUSTOM_OUTPUT_WALKER, 'Webges\DoctrineExtensions\Query\SortableNullsWalker');
- * $query->setHint("sortableNulls.fields", array(
+ * $query->setHint(Doctrine\ORM\Query::HINT_CUSTOM_OUTPUT_WALKER, SortableNullsWalker::class);
+ * $query->setHint("sortableNulls.fields", [
  *     "p.firstname" => Webges\DoctrineExtensions\Query\SortableNullsWalker::NULLS_FIRST,
  *     "p.lastname"  => Webges\DoctrineExtensions\Query\SortableNullsWalker::NULLS_LAST,
  *     "p.id" => Webges\DoctrineExtensions\Query\SortableNullsWalker::NULLS_LAST
- * ));
+ * ]);
  *
  * @see http://www.doctrine-project.org/jira/browse/DDC-490
  */
@@ -34,9 +33,10 @@ class SortableNullsWalker extends Query\SqlWalker
     public const NULLS_LAST = 'NULLS LAST';
 
     /**
-     * @param OrderByItem $orderByItem
+     * @param Query\AST\OrderByItem $orderByItem
+     * @throws Query\QueryException
      */
-    public function walkOrderByItem($orderByItem): array|string
+    public function walkOrderByItem($orderByItem): string
     {
         $sql = parent::walkOrderByItem($orderByItem);
         $hint = $this->getQuery()->getHint('sortableNulls.fields');