Merge branch 'next-2.x' into 'main'

Next 2.x

See merge request !131

phpstan-baseline.neon

@@ -35,11 +35,6 @@ parameters:
 			count: 1
 			path: ajax/frontend/basket/controls/basket.php
 
-		-
-			message: "#^Parameter \\#1 \\$User of method QUI\\\\ERP\\\\Order\\\\Factory\\:\\:createBasket\\(\\) expects null, QUI\\\\Interfaces\\\\Users\\\\User given\\.$#"
-			count: 1
-			path: ajax/frontend/basket/getBasket.php
-
 		-
 			message: "#^Using nullsafe method call on non\\-nullable type QUI\\\\ERP\\\\Products\\\\Product\\\\ProductList\\. Use \\-\\> instead\\.$#"
 			count: 1
@@ -545,11 +540,6 @@ parameters:
 			count: 1
 			path: src/QUI/ERP/Order/OrderProcess.php
 
-		-
-			message: "#^Parameter \\#1 \\$User of method QUI\\\\ERP\\\\Order\\\\Factory\\:\\:createBasket\\(\\) expects null, QUI\\\\Interfaces\\\\Users\\\\User given\\.$#"
-			count: 1
-			path: src/QUI/ERP/Order/OrderProcess.php
-
 		-
 			message: "#^Parameter \\#2 \\$User of class QUI\\\\ERP\\\\Order\\\\Basket\\\\BasketOrder constructor expects QUI\\\\Users\\\\User\\|null, QUI\\\\Interfaces\\\\Users\\\\User given\\.$#"
 			count: 1

src/QUI/ERP/Order/Factory.php

@@ -7,6 +7,10 @@
 namespace QUI\ERP\Order;
 
 use QUI;
+use QUI\Database\Exception;
+use QUI\ERP\Order\Basket\Basket;
+use QUI\ExceptionStack;
+use QUI\Interfaces\Users\User;
 
 use function date;
 
@@ -223,12 +227,13 @@ public function createOrderInProcessDataBaseEntry(QUI\Interfaces\Users\User $Per
     /**
      * Create a new Basket for the user
      *
-     * @param null $User
-     * @return QUI\ERP\Order\Basket\Basket
+     * @param User|null $User
+     * @return Basket
      *
-     * @throws QUI\Database\Exception|QUI\ExceptionStack
+     * @throws Exception
+     * @throws ExceptionStack
      */
-    public function createBasket($User = null): Basket\Basket
+    public function createBasket(?QUI\Interfaces\Users\User $User = null): Basket
     {
         if ($User === null) {
             $User = QUI::getUserBySession();
@@ -241,7 +246,7 @@ public function createBasket($User = null): Basket\Basket
 
         $lastId = QUI::getDataBase()->getPDO()->lastInsertId();
 
-        return new Basket\Basket($lastId, $User);
+        return new Basket($lastId, $User);
     }
 
     /**

types/shoppingCart.php

@@ -46,7 +46,7 @@
         'Login' => $Login,
         'Basket' => $Basket
     ]);
-} catch (QUI\DataBase\Exception $Exception) {
+} catch (QUI\Database\Exception $Exception) {
     $ExceptionReplacement = new QUI\Exception(['quiqqer/core', 'exception.error']);
 
     QUI\System\Log::writeException($Exception);