Merge branch 'develop' into prod

.gitea/workflows/ci.yaml

@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['8.2', '8.4']
+        php-version: ['8.2', '8.5']
         #        db-type: ['mysql']
         db-type: ['sqlite', 'mysql', 'pgsql']
         prefer-lowest: ['']

src/Controller/CartItemsController.php

@@ -87,10 +87,7 @@ class CartItemsController extends AppController {
 	public function edit($id = null) {
 		$this->request->allowMethod(['post', 'put', 'patch']);
 
-		$cartItem = $this->CartItems->find()
+		$cartItem = $this->CartItems->get($id, contain: ['Carts']);
-			->where(['CartItems.id' => $id])
-			->contain(['Carts'])
-			->firstOrFail();
 
 		$this->ShoppingCart->checkIfIsOwnCart($cartItem->cart);
 
@@ -135,11 +132,7 @@ class CartItemsController extends AppController {
 		$this->request->allowMethod(['post', 'delete']);
 		$identity = $this->getRequest()->getAttribute('identity');
 
-//        $cart = $this->viewBuilder()->getVar('cart');
+		$cartItem = $this->CartItems->get($id, contain: ['Carts']);
-		$cartItem = $this->CartItems->find()
-			->where(['CartItems.id' => $id])
-			->contain(['Carts'])
-			->firstOrFail();
 
 		$this->ShoppingCart->checkIfIsOwnCart($cartItem->cart);
 

src/Model/Enum/CartTypeId.php

@@ -18,9 +18,9 @@ enum CartTypeId: int implements EnumLabelInterface
      */
 	public function label(): string {
 		return match ($this) {
-			static::Cart => 'Cart',
+			CartTypeId::Cart => 'Cart',
-			static::Wishlist => 'Wishlist',
+			CartTypeId::Wishlist => 'Wishlist',
-			static::CustomList => 'List'
+			CartTypeId::CustomList => 'List'
 		};
 	}
 }