Merge pull request #5211 in SW/shopware from ntr/5.3/merge-52-into-53-201707 to 5.3

* commit '53042e1c83d2dc0310361a108121b19931c112e3': (34 commits)
  SW-18907 - Don't restrict shopping world image height in row mode
  SW-19195 - Update upgrade md
  SW-19195 - Make individual voucher codes searchable Fixes shopware/shopware#1133
  SW-19144 - Fixed issue with PHP notice when no id for an option is defined Fixes: shopware/shopware#1162
  SW-18142 - Fixed replaced name for JPG files in media model Fixes: shopware/shopware#1040
  SW-19191 - Add smarty block around the table in confirm.tpl fixes shopware/shopware#1154
  SW-19141 - Added new block to confirm_item.tpl
  SW-19141 - confirm_item.tpl now reuses cart_item.tpl details
  Revert "SW-19169 - Renamed Shopware.model.AttributeConfig to Shopware.apps.Base.model.AttributeConfig"
  SW-17566 - Add colon after shipping type on document * Unify payment and shipping style on document Fixes: shopware/shopware#860
  SW-18242 - add parameters to exceptions in media resource
  SW-18242 - Remove media file only if it was uploaded fixes shopware/shopware#1047
  SW-19150 - Only show link if inquiry link was generated
  SW-19150 - Fix inquiry form link on detail page fixes shopware/shopware#1170
  SW-18241 - clean up code
  SW-18241 - Remove echo from readfile operation on opening PDFs from the backend fixes shopware/shopware#1048
  SW-18937 - Added support for ftps in rest-api
  SW-19169 - Renamed Shopware.model.AttributeConfig to Shopware.apps.Base.model.AttributeConfig
  SW-19173 - Add new event Shopware_Plugins_HttpCache_ContextCookieValue in context cookie creation fixes shopware/shopware#1146
  SW-19143 - Fixed pop state without state values Fixes: shopware/shopware#1161
  ...

Author: janbuecker

UPGRADE-5.2.md

@@ -2,13 +2,31 @@
 
 This changelog references changes done in Shopware 5.2 patch versions.
 
+# 5.2.27
+
+[View all changes from v5.2.26...v5.2.27](https://github.com/shopware/shopware/compare/v5.2.26...v5.2.27)
+
+* Added config check to disable the `Tell a friend` page if it is disabled via config.
+* Fixed id collision in `themes/Backend/ExtJs/backend/base/component/Shopware.ModuleManager.js`
+* Added guetzli media optimizer
+* Added new event `Shopware_Plugins_HttpCache_ContextCookieValue` to modify HttpCache Context-Cookie.
+* Added support for uploading media with ftps in Rest-API
+* Added `{$smarty.block.parent}` to `themes/Frontend/Bare/frontend/checkout/confirm_item.tpl`.
+* Added new block `frontend_checkout_cart_item_details_essential_features` to `themes/Frontend/Bare/frontend/checkout/confirm_item.tpl`.
+* Added new block `frontend_checkout_confirm_product_table_content` around table in `themes/Frontend/Bare/frontend/checkout/confirm.tpl`.
+* Individual voucher codes are now searchable in voucher overview
+
+# 5.2.26
+
+[View all changes from v5.2.25...v5.2.26](https://github.com/shopware/shopware/compare/v5.2.25...v5.2.26)
+
 ## 5.2.25
 
 [View all changes from v5.2.24...v5.2.25](https://github.com/shopware/shopware/compare/v5.2.24...v5.2.25)
 
-
 * Added notify event `Shopware_Modules_Basket_AddArticle_Added` in `engine/Shopware/Core/sBasket.php`
 * The event `Shopware_Modules_Export_ExportResult_Filter_Fixed` was added and now filters the processed export result. Previously with `Shopware_Modules_Export_ExportResult_Filter`, an instance of `Zend_Db_Statement_Pdo` was supplied, which could not be used to filter the actual result.
+* Removed duplicate block and added more precise ones in `themes/Frontend/Bare/frontend/checkout/ajax_cart.tpl`
 
 # 5.2.24
 
@@ -21,7 +39,6 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 [View all changes from v5.2.22...v5.2.23](https://github.com/shopware/shopware/compare/v5.2.22...v5.2.23)
 
-
 * Added conditional statement in `themes/Frontend/Responsive/frontend/_public/src/js/jquery.product-slider.js` to prevent the jquery plugin from sending ajax requests indefinitely
 * Added `limit` parameter to `createQuery` and `createOptionQuery` in `engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyQueryFactory`
 * Added default `limit` of 100 in `engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyIndexer::populate`
@@ -31,7 +48,6 @@ This changelog references changes done in Shopware 5.2 patch versions.
 
 [View all changes from v5.2.21...v5.2.22](https://github.com/shopware/shopware/compare/v5.2.21...v5.2.22)
 
-
 * Fixed the picture implementation of the `box-emotion.tpl` to load the correct image sizes
 * Added new event `plugin/swAutoSubmit/onChangeSelection` in `themes/Frontend/Responsive/frontend/_public/src/js/jquery.auto-submit.js`
 * Added ExtJS override `engine/Library/ExtJs/overrides/Ext.view.Table.js` to fix display of row selection in grid panel when updating the row after row editing

engine/Shopware/Bundle/MediaBundle/Optimizer/GuetzliOptimizer.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * Shopware 5
+ * Copyright (c) shopware AG
+ *
+ * According to our dual licensing model, this program can be used either
+ * under the terms of the GNU Affero General Public License, version 3,
+ * or under a proprietary license.
+ *
+ * The texts of the GNU Affero General Public License with an additional
+ * permission and of our proprietary license can be found at and
+ * in the LICENSE file you have received along with this program.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * "Shopware" is a registered trademark of shopware AG.
+ * The licensing of the program under the AGPLv3 does not imply a
+ * trademark license. Therefore any rights, title and interest in
+ * our trademarks remain entirely with us.
+ */
+
+namespace Shopware\Bundle\MediaBundle\Optimizer;
+
+class GuetzliOptimizer extends BinaryOptimizer
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getCommand()
+    {
+        return 'guetzli';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSupportedMimeTypes()
+    {
+        return ['image/jpeg', 'image/jpg'];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCommandArguments($filepath)
+    {
+        return [$filepath];
+    }
+}

engine/Shopware/Bundle/MediaBundle/services.xml

@@ -83,6 +83,10 @@
             <tag name="shopware_media.optimizer" priority="80" />
         </service>
 
+        <service id="shopware_media.optimizer.guetzli" class="Shopware\Bundle\MediaBundle\Optimizer\GuetzliOptimizer">
+            <tag name="shopware_media.optimizer" priority="50" />
+        </service>
+
         <!-- Media Adapters -->
         <service id="shopware_media.adapter.local" class="Shopware\Bundle\MediaBundle\Adapters\LocalAdapterFactory">
             <tag name="shopware_media.adapter" />

engine/Shopware/Bundle/StoreFrontBundle/Gateway/DBAL/Hydrator/MediaHydrator.php

@@ -25,7 +25,7 @@
 namespace Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator;
 
 use Doctrine\DBAL\Connection;
-use Shopware\Bundle\MediaBundle\MediaService;
+use Shopware\Bundle\MediaBundle\MediaServiceInterface;
 use Shopware\Bundle\StoreFrontBundle\Struct;
 use Shopware\Components\Thumbnail\Manager;
 
@@ -47,7 +47,7 @@ class MediaHydrator extends Hydrator
     private $thumbnailManager;
 
     /**
-     * @var MediaService
+     * @var MediaServiceInterface
      */
     private $mediaService;
 
@@ -59,10 +59,10 @@ class MediaHydrator extends Hydrator
     /**
      * @param AttributeHydrator                      $attributeHydrator
      * @param \Shopware\Components\Thumbnail\Manager $thumbnailManager
-     * @param MediaService                           $mediaService
+     * @param MediaServiceInterface                  $mediaService
      * @param Connection                             $database
      */
-    public function __construct(AttributeHydrator $attributeHydrator, Manager $thumbnailManager, MediaService $mediaService, Connection $database)
+    public function __construct(AttributeHydrator $attributeHydrator, Manager $thumbnailManager, MediaServiceInterface $mediaService, Connection $database)
     {
         $this->attributeHydrator = $attributeHydrator;
         $this->thumbnailManager = $thumbnailManager;

engine/Shopware/Components/Api/Resource/Article.php

@@ -1843,7 +1843,7 @@ protected function createImageMappings(Image $image, ArticleModel $article, arra
             foreach ($mappingData as $option) {
                 $conditions = [];
 
-                if ($option['id']) {
+                if (isset($option['id']) && $option['id']) {
                     $conditions['id'] = $option['id'];
                 }
 

engine/Shopware/Components/Api/Resource/Media.php

@@ -43,11 +43,11 @@ class Media extends Resource
     const FILENAME_LENGTH = 200;
 
     /**
-     * @return \Shopware\Models\Category\Repository
+     * @return \Shopware\Models\Media\Repository
      */
     public function getRepository()
     {
-        return $this->getManager()->getRepository('Shopware\Models\Media\Media');
+        return $this->getManager()->getRepository(MediaModel::class);
     }
 
     /**
@@ -56,7 +56,7 @@ public function getRepository()
      * @throws \Shopware\Components\Api\Exception\ParameterMissingException
      * @throws \Shopware\Components\Api\Exception\NotFoundException
      *
-     * @return array|\Shopware\Models\Media\Media
+     * @return array|MediaModel
      */
     public function getOne($id)
     {
@@ -69,7 +69,7 @@ public function getOne($id)
         $filters = [['property' => 'media.id', 'expression' => '=', 'value' => $id]];
         $query = $this->getRepository()->getMediaListQuery($filters, [], 1);
 
-        /** @var $media \Shopware\Models\Media\Media */
+        /** @var $media MediaModel */
         $media = $query->getOneOrNullResult($this->getResultMode());
 
         if (!$media) {
@@ -119,15 +119,15 @@ public function getList($offset = 0, $limit = 25, array $criteria = [], array $o
      * @throws \Shopware\Components\Api\Exception\ValidationException
      * @throws \Exception
      *
-     * @return \Shopware\Models\Media\Media
+     * @return MediaModel
      */
     public function create(array $params)
     {
         $this->checkPrivilege('create');
 
         $params = $this->prepareMediaData($params);
 
-        $media = new \Shopware\Models\Media\Media();
+        $media = new MediaModel();
         $media->fromArray($params);
 
         $path = $this->prepareFilePath($media->getPath(), $media->getFileName());
@@ -160,17 +160,17 @@ public function create(array $params)
      * @throws \Shopware\Components\Api\Exception\ParameterMissingException
      * @throws \Shopware\Components\Api\Exception\CustomValidationException
      *
-     * @return \Shopware\Models\Media\Media
+     * @return MediaModel
      */
     public function update($id, array $params)
     {
         $this->checkPrivilege('update');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException();
+            throw new ApiException\ParameterMissingException('id');
         }
 
-        /** @var $media \Shopware\Models\Media\Media */
+        /** @var $media MediaModel */
         $media = $this->getRepository()->find($id);
 
         if (!$media) {
@@ -199,17 +199,17 @@ public function update($id, array $params)
      * @throws \Shopware\Components\Api\Exception\ParameterMissingException
      * @throws \Shopware\Components\Api\Exception\NotFoundException
      *
-     * @return \Shopware\Models\Media\Media
+     * @return MediaModel
      */
     public function delete($id)
     {
         $this->checkPrivilege('delete');
 
         if (empty($id)) {
-            throw new ApiException\ParameterMissingException();
+            throw new ApiException\ParameterMissingException('id');
         }
 
-        /** @var $media \Shopware\Models\Media\Media */
+        /** @var $media MediaModel */
         $media = $this->getRepository()->find($id);
 
         if (!$media) {
@@ -252,7 +252,7 @@ public function internalCreateMediaByFileLink($link, $albumId = -1)
         $media->setUserId(0);
 
         /** @var $album Album */
-        $album = $this->getManager()->find('Shopware\Models\Media\Album', $albumId);
+        $album = $this->getManager()->find(Album::class, $albumId);
         if (!$album) {
             throw new ApiException\CustomValidationException(
                 sprintf('Album by id %s not found', $albumId)
@@ -320,6 +320,7 @@ public function load($url, $baseFilename = null)
         $urlArray['path'] = explode('/', $urlArray['path']);
         switch ($urlArray['scheme']) {
             case 'ftp':
+            case 'ftps':
             case 'http':
             case 'https':
             case 'file':
@@ -425,8 +426,8 @@ protected function uploadBase64File($url, $destinationPath, $baseFilename)
     }
 
     /**
-     * @param array                        $params
-     * @param \Shopware\Models\Media\Media $media
+     * @param array      $params
+     * @param MediaModel $media
      *
      * @throws \Shopware\Components\Api\Exception\CustomValidationException
      * @throws \Shopware\Components\Api\Exception\ParameterMissingException
@@ -438,15 +439,15 @@ private function prepareMediaData($params, $media = null)
     {
         // in create mode, album is a required param
         if (!$media && (!isset($params['album']) || empty($params['album']))) {
-            throw new ApiException\ParameterMissingException();
+            throw new ApiException\ParameterMissingException('album');
         }
 
         if (!$media && (!isset($params['file']) || empty($params['file']))) {
-            throw new ApiException\ParameterMissingException();
+            throw new ApiException\ParameterMissingException('file');
         }
 
         if (!$media && (!isset($params['description']) || empty($params['description']))) {
-            throw new ApiException\ParameterMissingException();
+            throw new ApiException\ParameterMissingException('description');
         }
 
         if (!$media && (!isset($params['userId']) || empty($params['userId']))) {
@@ -459,14 +460,14 @@ private function prepareMediaData($params, $media = null)
 
         // Check / set album
         if (isset($params['album'])) {
-            $album = Shopware()->Models()->find('\Shopware\Models\Media\Album', $params['album']);
+            $album = Shopware()->Models()->find(Album::class, $params['album']);
             if (!$album) {
                 throw new ApiException\CustomValidationException(sprintf('Album by id %s not found', $params['album']));
             }
             $params['album'] = $album;
         }
 
-        if (isset($params['file']) && !($params['file'] instanceof \Symfony\Component\HttpFoundation\File\File)) {
+        if (isset($params['file']) && !($params['file'] instanceof File)) {
             if (!isset($params['name'])) {
                 $params['name'] = pathinfo($params['file'], PATHINFO_FILENAME);
             }
@@ -481,7 +482,7 @@ private function prepareMediaData($params, $media = null)
             } else {
                 $path = $params['file'];
             }
-            $params['file'] = new \Symfony\Component\HttpFoundation\File\File($path);
+            $params['file'] = new File($path);
         }
 
         return $params;

engine/Shopware/Components/Plugin/XmlCronjobReader.php

@@ -79,9 +79,9 @@ private function parseEntry(\DOMElement $entry)
 
         $cronjobEntry['name'] = $this->getFirstChild($entry, 'name');
         $cronjobEntry['action'] = $this->getFirstChild($entry, 'action');
-        $cronjobEntry['active'] = $this->toBool($this->getFirstChild($entry, 'active'));
+        $cronjobEntry['active'] = XmlUtils::phpize($this->getFirstChild($entry, 'active'));
         $cronjobEntry['interval'] = $this->getFirstChild($entry, 'interval');
-        $cronjobEntry['disable_on_error'] = $this->toBool($this->getFirstChild($entry, 'disableOnError'));
+        $cronjobEntry['disable_on_error'] = XmlUtils::phpize($this->getFirstChild($entry, 'disableOnError'));
 
         return $cronjobEntry;
     }
@@ -120,14 +120,4 @@ private function getChildren(\DOMNode $node, $name)
 
         return $children;
     }
-
-    /**
-     * @param string $string
-     *
-     * @return bool
-     */
-    private function toBool($string)
-    {
-        return $string == 'true' ? true : false;
-    }
 }

engine/Shopware/Components/Theme/Compiler.php

@@ -26,6 +26,7 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\AbstractQuery;
+use Shopware\Components\Theme\Compressor\CompressorInterface;
 use Shopware\Components\Theme\Compressor\Js;
 use Shopware\Models\Shop;
 
@@ -97,7 +98,7 @@ class Compiler
      * @param PathResolver                $pathResolver
      * @param Inheritance                 $inheritance
      * @param Service                     $service
-     * @param Js                          $jsCompressor
+     * @param CompressorInterface         $jsCompressor
      * @param \Enlight_Event_EventManager $eventManager
      * @param TimestampPersistor          $timestampPersistor
      */
@@ -107,7 +108,7 @@ public function __construct(
         PathResolver $pathResolver,
         Inheritance $inheritance,
         Service $service,
-        Js $jsCompressor,
+        CompressorInterface $jsCompressor,
         \Enlight_Event_EventManager $eventManager,
         TimestampPersistor $timestampPersistor
     ) {