From 9dae1acc58f0bc52e2f2fc547658f3674f9a8ac5 Mon Sep 17 00:00:00 2001
From: Dominik Pfaffenbauer <dominik@pfaffenbauer.at>
Date: Thu, 28 Mar 2019 14:59:14 +0100
Subject: [PATCH 1/2] [StorageList] StorageList are not a Pimcore Object, make
 them simpler and remove that integration. #870

---
 .../Resources/views/Wishlist/summary.html.twig              | 6 +++---
 src/CoreShop/Component/StorageList/Model/StorageList.php    | 5 +----
 .../Component/StorageList/Model/StorageListInterface.php    | 4 +---
 .../Component/StorageList/Model/StorageListItem.php         | 4 +---
 .../StorageList/Model/StorageListItemInterface.php          | 4 +---
 5 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/CoreShop/Bundle/FrontendBundle/Resources/views/Wishlist/summary.html.twig b/src/CoreShop/Bundle/FrontendBundle/Resources/views/Wishlist/summary.html.twig
index d290954fba..0be77c3603 100644
--- a/src/CoreShop/Bundle/FrontendBundle/Resources/views/Wishlist/summary.html.twig
+++ b/src/CoreShop/Bundle/FrontendBundle/Resources/views/Wishlist/summary.html.twig
@@ -28,7 +28,7 @@
             {% for item in wishlist.getItems %}
                 {% set product = item.getProduct %}
                 {% set productUrl = coreshop_path(product, 'coreshop_product_detail') %}
-                <tr class="shopping-wishlist-item shopping-wishlist-item-{{ item.getId }}">
+                <tr class="shopping-wishlist-item">
                     <td class="text-center">
                         {% if item.getProduct and item.getProduct.getImage() %}
                             <a class="" href="{{ productUrl }}">
@@ -45,7 +45,7 @@
                         {{ currency.getPrice(product) }}
                     </td>
                     <td class="text-center">
-                        <a href="{{ coreshop_path('coreshop_wishlist_remove', {product: product.getId}) }}" title="{{ 'coreshop.ui.remove'|trans }}" class="btn btn-danger tool-tip" data-id="{{ product.getId }}">
+                        <a href="{{ coreshop_path('coreshop_wishlist_remove', {product: product.id}) }}" title="{{ 'coreshop.ui.remove'|trans }}" class="btn btn-danger tool-tip" data-id="{{ product.getId }}">
                             <i class="fa fa-times-circle"></i>
                         </a>
                     </td>
@@ -58,4 +58,4 @@
         <p>{{ 'coreshop.ui.wishlist_empty'|trans }}</p>
     {% endif %}
     <br/>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/CoreShop/Component/StorageList/Model/StorageList.php b/src/CoreShop/Component/StorageList/Model/StorageList.php
index fd8aecf2f3..aa61e3e200 100644
--- a/src/CoreShop/Component/StorageList/Model/StorageList.php
+++ b/src/CoreShop/Component/StorageList/Model/StorageList.php
@@ -12,10 +12,9 @@
 
 namespace CoreShop\Component\StorageList\Model;
 
-use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;
 use Webmozart\Assert\Assert;
 
-class StorageList extends AbstractPimcoreModel implements StorageListInterface
+class StorageList implements StorageListInterface
 {
     /**
      * @var array
@@ -24,8 +23,6 @@ class StorageList extends AbstractPimcoreModel implements StorageListInterface
 
     public function __construct()
     {
-        parent::__construct();
-
         $this->items = [];
     }
 
diff --git a/src/CoreShop/Component/StorageList/Model/StorageListInterface.php b/src/CoreShop/Component/StorageList/Model/StorageListInterface.php
index e8ae591cf9..77caab8374 100644
--- a/src/CoreShop/Component/StorageList/Model/StorageListInterface.php
+++ b/src/CoreShop/Component/StorageList/Model/StorageListInterface.php
@@ -12,9 +12,7 @@
 
 namespace CoreShop\Component\StorageList\Model;
 
-use CoreShop\Component\Resource\Model\ResourceInterface;
-
-interface StorageListInterface extends ResourceInterface
+interface StorageListInterface
 {
     /**
      * @param StorageListProductInterface $product
diff --git a/src/CoreShop/Component/StorageList/Model/StorageListItem.php b/src/CoreShop/Component/StorageList/Model/StorageListItem.php
index ee32b8c444..2c22fa85f3 100644
--- a/src/CoreShop/Component/StorageList/Model/StorageListItem.php
+++ b/src/CoreShop/Component/StorageList/Model/StorageListItem.php
@@ -12,9 +12,7 @@
 
 namespace CoreShop\Component\StorageList\Model;
 
-use CoreShop\Component\Resource\Pimcore\Model\AbstractPimcoreModel;
-
-class StorageListItem extends AbstractPimcoreModel implements StorageListItemInterface
+class StorageListItem implements StorageListItemInterface
 {
     /**
      * @var int
diff --git a/src/CoreShop/Component/StorageList/Model/StorageListItemInterface.php b/src/CoreShop/Component/StorageList/Model/StorageListItemInterface.php
index 0fa7aabd19..7089241b91 100644
--- a/src/CoreShop/Component/StorageList/Model/StorageListItemInterface.php
+++ b/src/CoreShop/Component/StorageList/Model/StorageListItemInterface.php
@@ -12,9 +12,7 @@
 
 namespace CoreShop\Component\StorageList\Model;
 
-use CoreShop\Component\Resource\Model\ResourceInterface;
-
-interface StorageListItemInterface extends ResourceInterface
+interface StorageListItemInterface
 {
     /**
      * @return StorageListProductInterface

From cfc40a7a8d4b2364126c9fc88d892349a4770d0f Mon Sep 17 00:00:00 2001
From: Dominik Pfaffenbauer <dominik@pfaffenbauer.at>
Date: Thu, 28 Mar 2019 16:02:56 +0100
Subject: [PATCH 2/2] [StorageList] re-add ID to storage-list-item but use
 product-id for it

---
 .../Component/StorageList/Model/StorageListItem.php       | 8 ++++++++
 .../StorageList/Model/StorageListItemInterface.php        | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/CoreShop/Component/StorageList/Model/StorageListItem.php b/src/CoreShop/Component/StorageList/Model/StorageListItem.php
index 2c22fa85f3..c5eebf767d 100644
--- a/src/CoreShop/Component/StorageList/Model/StorageListItem.php
+++ b/src/CoreShop/Component/StorageList/Model/StorageListItem.php
@@ -24,6 +24,14 @@ class StorageListItem implements StorageListItemInterface
      */
     protected $product;
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return $this->product ? $this->product->getId() : 0;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/src/CoreShop/Component/StorageList/Model/StorageListItemInterface.php b/src/CoreShop/Component/StorageList/Model/StorageListItemInterface.php
index 7089241b91..0d9b3cf7f6 100644
--- a/src/CoreShop/Component/StorageList/Model/StorageListItemInterface.php
+++ b/src/CoreShop/Component/StorageList/Model/StorageListItemInterface.php
@@ -14,6 +14,11 @@
 
 interface StorageListItemInterface
 {
+    /**
+     * @return int
+     */
+    public function getId();
+
     /**
      * @return StorageListProductInterface
      */