Merge branch '1.7'

* 1.7: [Maintenance] Conflict failed spec version Use query builder in migration Add missing images in entry.js
danakil · Jul 10, 2020 · ca41735 · ca41735
2 parents b118e66 + f803d9d
commit ca41735
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/app/migrations/Version20171003103916.php b/app/migrations/Version20171003103916.php
@@ -37,7 +37,18 @@ public function up(Schema $schema): void
         $defaultLocale = $this->container->getParameter('locale');
         $productAttributeRepository = $this->container->get('sylius.repository.product_attribute');
 
-        $productAttributes = $productAttributeRepository->findBy(['type' => SelectAttributeType::TYPE]);
+        $productAttributes = $productAttributeRepository
+            ->createQueryBuilder('o')
+                ->select([
+                    'o.id',
+                    'o.configuration',
+                ])
+                ->where('o.type = :type')
+                ->setParameter('type', SelectAttributeType::TYPE)
+                ->getQuery()
+            ->getResult()
+        ;
+
         /** @var ProductAttributeInterface $productAttribute */
         foreach ($productAttributes as $productAttribute) {
             $configuration = $productAttribute->getConfiguration();

diff --git a/src/Sylius/Bundle/ShopBundle/Resources/private/entry.js b/src/Sylius/Bundle/ShopBundle/Resources/private/entry.js
@@ -14,3 +14,6 @@ import './scss/style.scss';
 
 import 'sylius/ui-resources/img/logo.png';
 import 'sylius/ui-resources/img/avatar.png';
+
+import './img/homepage-banner.jpg';
+import './img/sylius-plus-banner.png';