SW-25707 - Remove deprecations for 5.7

shopware5 · Sep 24, 2020 · b2709e5 · b2709e5
1 parent 14e2d28
commit b2709e5
Show file tree

Hide file tree

Showing 22 changed files with 113 additions and 847 deletions.
diff --git a/UPGRADE-5.7.md b/UPGRADE-5.7.md
@@ -80,6 +80,7 @@ This changelog references changes done in Shopware 5.7 patch versions.
 * Changed `\Shopware\Bundle\ESIndexingBundle\Product\ProductProvider` to set `hasStock` based on instock like DBAL implementation
 * Changed `\Shopware_Controllers_Backend_ProductStream::loadPreviewAction` to return formatted prices
 * Changed `sw:plugin:activate` exit code from 1 to 0, when it's already installed.
+* Changed `\Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\CategoryGateway::get` it accepts now only integers as id
 
 ### Removals
 
@@ -109,6 +110,28 @@ This changelog references changes done in Shopware 5.7 patch versions.
     * `\Shopware\Plugin\Debug\Components\TemplateCollector`
     * `\Shopware\Plugin\Debug\Components\TemplateVarCollector`
     * `\Shopware\Plugin\Debug\Components\Utils`
+    * `\Shopware\Components\Api\Resource\ApiProgressHelper`
+    * `\Shopware\Bundle\StoreFrontBundle\Struct\LocationContext`
+    * `\Shopware\Components\OpenSSLEncryption`
+    * `\Shopware\Bundle\SearchBundleES\DependencyInjection\Factory\ProductNumberSearchFactory`
+* Removed method `\Shopware\Bundle\EsBackendBundle\EsBackendIndexer::buildAlias` use `\Shopware\Bundle\EsBackendBundle\IndexFactoryInterface::createIndexConfiguration` instead
+* Removed method `\Shopware\Bundle\SearchBundleES\DependencyInjection\Factory\ProductNumberSearchFactory::registerHandlerCollection`, use DI Tag `shopware_search_es.search_handler` instead
+* Removed method `\Shopware\Components\Model\ModelRepository::queryAll`, use `\Shopware\Components\Model\ModelRepository::findAll` instead
+* Removed method `\Shopware\Components\Model\ModelRepository::queryAll`, use `\Shopware\Components\Model\ModelRepository::findAll` instead
+* Removed method `\Shopware\Components\Model\ModelRepository::queryBy`, use `\Shopware\Components\Model\ModelRepository::findBy` instead
+* Removed following interfaces:
+    * `\Shopware\Bundle\ESIndexingBundle\Product\ProductProviderInterface`
+    * `\Shopware\Bundle\ESIndexingBundle\Property\PropertyProviderInterface`
+    * `\Shopware\Bundle\ESIndexingBundle\EsSearchInterface`
+    * `\Shopware\Bundle\StoreFrontBundle\Struct\LocationContextInterface`
+* Removed from class `\Shopware\Components\HttpCache\CacheWarmer` following methods:
+    * `callUrls`
+    * `getSEOURLByViewPortCount`
+    * `getAllSEOUrlCount`
+    * `getAllSEOUrls`
+    * `getSEOUrlByViewPort`
+    * `prepareUrl`
+    * `getShopDataById`
 * Removed referenced value from magic getter in session
 * Removed the assignment of all request parameters to the view in `Shopware_Controllers_Widgets_Listing::productsAction`
 * Removed duplicate ExtJs classes and added alias to new class:
@@ -138,6 +161,7 @@ This changelog references changes done in Shopware 5.7 patch versions.
     * `symfony/polyfill-php70`
     * `symfony/polyfill-php71`
     * `symfony/polyfill-php72`
+* Removed field `size` from `Shopware\Models\Article\Download`. Use media_service to get the correct file size
 * Removed plugin `Debug`
 
 ### Deprecations

diff --git a/engine/Shopware/Bundle/ESIndexingBundle/EsSearch.php b/engine/Shopware/Bundle/ESIndexingBundle/EsSearch.php
@@ -29,7 +29,7 @@
 use ONGR\ElasticsearchDSL\Search;
 use ONGR\ElasticsearchDSL\Serializer\OrderedSerializer;
 
-class EsSearch extends Search implements EsSearchInterface
+class EsSearch extends Search
 {
     /**
      * @var OrderedSerializer

diff --git a/engine/Shopware/Bundle/ESIndexingBundle/EsSearchInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/EsSearchInterface.php
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProvider.php
@@ -46,7 +46,7 @@
 use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 
-class ProductProvider implements ProviderInterface, ProductProviderInterface
+class ProductProvider implements ProviderInterface
 {
     /**
      * @var ContextServiceInterface

diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProviderInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/Product/ProductProviderInterface.php
diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProvider.php b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProvider.php
@@ -25,6 +25,7 @@
 namespace Shopware\Bundle\ESIndexingBundle\Property;
 
 use Doctrine\DBAL\Connection;
+use Shopware\Bundle\ESIndexingBundle\ProviderInterface;
 use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\FieldHelper;
 use Shopware\Bundle\StoreFrontBundle\Gateway\DBAL\Hydrator\PropertyHydrator;
 use Shopware\Bundle\StoreFrontBundle\Service\ContextServiceInterface;
@@ -33,7 +34,7 @@
 use Shopware\Bundle\StoreFrontBundle\Struct\Shop;
 use Shopware\Bundle\StoreFrontBundle\Struct\ShopContextInterface;
 
-class PropertyProvider implements PropertyProviderInterface
+class PropertyProvider implements ProviderInterface
 {
     /**
      * @var Connection

diff --git a/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProviderInterface.php b/engine/Shopware/Bundle/ESIndexingBundle/Property/PropertyProviderInterface.php
diff --git a/engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php b/engine/Shopware/Bundle/EsBackendBundle/EsBackendIndexer.php
@@ -80,20 +80,6 @@ public function index(ProgressHelperInterface $helper)
         }
     }
 
-    /**
-     * @deprecated since 5.6, will be removed with 5.7. Use IndexFactory service instead
-     *
-     * @param string $domainName
-     *
-     * @return string
-     */
-    public static function buildAlias($domainName)
-    {
-        trigger_error(sprintf('%s:%s is deprecated since 5.6 and will be removed with 5.7, use IndexNameBuilderInterface instead', __CLASS__, __FUNCTION__), E_USER_DEPRECATED);
-
-        return Shopware()->Container()->get(IndexFactoryInterface::class)->createIndexConfiguration($domainName)->getAlias();
-    }
-
     /**
      * @param string $index
      */

diff --git a/...Shopware/Bundle/SearchBundleES/DependencyInjection/Factory/ProductNumberSearchFactory.php b/...Shopware/Bundle/SearchBundleES/DependencyInjection/Factory/ProductNumberSearchFactory.php
diff --git a/engine/Shopware/Bundle/SearchBundleES/DependencyInjection/services.xml b/engine/Shopware/Bundle/SearchBundleES/DependencyInjection/services.xml
@@ -7,21 +7,17 @@
     <services>
         <defaults public="true" />
 
-        <service id="shopware_search_es.handler_collection" class="Doctrine\Common\Collections\ArrayCollection">
-            <factory service="shopware_search_es.product_number_search_factory" method="registerHandlerCollection" />
-            <argument type="service" id="service_container" />
-        </service>
-
         <service id="shopware_search_es.struct_hydrator" class="Shopware\Bundle\SearchBundleES\StructHydrator" />
 
-        <service id="shopware_search_es.product_number_search_factory" class="Shopware\Bundle\SearchBundleES\DependencyInjection\Factory\ProductNumberSearchFactory">
+        <service id="Shopware\Bundle\SearchBundleES\HandlerRegistry">
             <argument type="tagged" tag="shopware_search_es.search_handler" />
+            <argument type="service" id="events"/>
         </service>
 
         <service id="shopware_search_es.product_number_search" class="Shopware\Bundle\SearchBundleES\ProductNumberSearch">
-            <factory service="shopware_search_es.product_number_search_factory" method="factory" />
-            <argument type="service" id="service_container" />
-            <argument type="service" id="service_container" />
+            <argument type="service" id="shopware_elastic_search.client"/>
+            <argument type="service" id="shopware_elastic_search.index_factory"/>
+            <argument type="service" id="Shopware\Bundle\SearchBundleES\HandlerRegistry"/>
         </service>
 
         <service id="shopware_search_es.search_term_query_builder" class="Shopware\Bundle\SearchBundleES\SearchTermQueryBuilder">