Merge pull request #654 from coreshop/release/2.0.0-rc.1

[Release] 2.0.0-rc.1
coreshop · Oct 31, 2018 · e578ad0 · e578ad0
2 parents 8481c90 + 7543ca0
commit e578ad0
Show file tree

Hide file tree

Showing 134 changed files with 118 additions and 1,601 deletions.
diff --git a/src/CoreShop/Behat/Context/Cli/InstallerContext.php b/src/CoreShop/Behat/Context/Cli/InstallerContext.php
@@ -17,7 +17,6 @@
 use CoreShop\Bundle\CoreBundle\Command\InstallDemoCommand;
 use CoreShop\Bundle\CoreBundle\Command\InstallFixturesCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Webmozart\Assert\Assert;
@@ -39,11 +38,6 @@ final class InstallerContext implements Context
      */
     private $tester;
 
-    /**
-     * @var QuestionHelper
-     */
-    private $questionHelper;
-
     /**
      * @var InstallCommand
      */
@@ -113,30 +107,13 @@ public function commandSuccess()
         Assert::same($this->tester->getStatusCode(), 0);
     }
 
-    /**
-     * @param string $input
-     *
-     * @return resource
-     */
-    private function getInputStream($input)
-    {
-        $stream = fopen('php://memory', 'rb+', false);
-        fwrite($stream, $input);
-        rewind($stream);
-
-        return $stream;
-    }
-
     /**
      * @param string $name
      */
     private function iExecuteCommandAndConfirm($name)
     {
-        $this->questionHelper = $this->command->getHelper('question');
-        $inputString = 'y' . PHP_EOL;
-        $this->questionHelper->setInputStream($this->getInputStream($inputString));
-
         try {
+            $this->tester->setInputs(['y']);
             $this->tester->execute(['command' => $name]);
         } catch (\Exception $e) {
         }

diff --git a/src/CoreShop/Behat/Context/Domain/CartContext.php b/src/CoreShop/Behat/Context/Domain/CartContext.php
@@ -196,8 +196,8 @@ public function cartShouldUseCarrier(CarrierInterface $carrier)
             $this->cartContext->getCart()->getCarrier()->getId(),
             sprintf(
                 'Cart is expected to use carrier %s, but found %s',
-                $carrier->getIdentifier(),
-                $this->cartContext->getCart()->getCarrier()->getName()
+                $carrier->getTitle('en'),
+                $this->cartContext->getCart()->getCarrier()->getTitle('en')
             )
         );
     }

diff --git a/src/CoreShop/Behat/Context/Setup/ShippingContext.php b/src/CoreShop/Behat/Context/Setup/ShippingContext.php
@@ -497,6 +497,7 @@ private function createCarrier($name)
          */
         $carrier = $this->carrierFactory->createNew();
         $carrier->setIdentifier($name);
+        $carrier->setTitle($name, 'en');
 
         if ($this->sharedStorage->has('store')) {
             $carrier->addStore($this->sharedStorage->get('store'));

diff --git a/src/CoreShop/Bundle/AddressBundle/composer.json b/src/CoreShop/Bundle/AddressBundle/composer.json
@@ -30,7 +30,7 @@
       "CoreShop\\Bundle\\AddressBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/ConfigurationBundle/composer.json b/src/CoreShop/Bundle/ConfigurationBundle/composer.json
@@ -30,7 +30,7 @@
       "CoreShop\\Bundle\\ConfigurationBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php
@@ -17,7 +17,7 @@ final class Version
     const MAJOR_VERSION = '2';
     const MINOR_VERSION = '0';
     const RELEASE_VERSION = '0';
-    const EXTRA_VERSION = 'beta.4';
+    const EXTRA_VERSION = 'rc.1';
 
     /**
      * @return string

diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStorePriceRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStorePriceRepository.php
@@ -33,22 +33,6 @@ public function findForProduct(ProductInterface $product)
             ->getResult();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function findForProductAndStore(ProductInterface $product, StoreInterface $store)
-    {
-        return $this->createQueryBuilder('o')
-            ->andWhere('o.product = :product')
-            ->andWhere('o.store = :store')
-            ->setParameter('product', $product->getId())
-            ->setParameter('store', $store)
-            ->getQuery()
-            ->useResultCache(true)
-            ->useQueryCache(true)
-            ->getResult();
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20180206111535.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20180206111535.php
@@ -26,7 +26,13 @@ public function up(Schema $schema)
             }
 
             $config = $filterCondition->getConfiguration();
-            $config['field'] = $filterCondition->getField();
+
+            if (method_exists($filterCondition, 'getField')) {
+                $config['field'] = $filterCondition->getField();
+            }
+            else {
+                throw new \Exception('Can\'t run Filter Condition Migration casue the installed CoreShop Version is already to far ahead. Please use beta.4 at last and then further update.');
+            }
 
             $filterCondition->setConfiguration($config);
 
@@ -36,7 +42,7 @@ public function up(Schema $schema)
 
         $em->flush();
 
-        $db = $this->container->get('doctrine.dbal.default_connection')->executeQuery('ALTER TABLE coreshop_filter_condition CHANGE field field VARCHAR(255) DEFAULT NULL;');
+        $this->addSql('ALTER TABLE coreshop_filter_condition CHANGE field field VARCHAR(255) DEFAULT NULL;');
     }
 
     /**

diff --git a/src/CoreShop/Bundle/CoreBundle/Migrations/Version20181001085952.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20181001085952.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace CoreShop\Bundle\CoreBundle\Migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Pimcore\Migrations\Migration\AbstractPimcoreMigration;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+
+class Version20181001085952 extends AbstractPimcoreMigration implements ContainerAwareInterface
+{
+    use ContainerAwareTrait;
+
+    /**
+     * @param Schema $schema
+     */
+    public function up(Schema $schema)
+    {
+        $this->addSql('ALTER TABLE coreshop_filter_condition DROP field;');
+        $this->container->get('pimcore.cache.core.handler')->clearTag('doctrine_pimcore_cache');
+    }
+
+    /**
+     * @param Schema $schema
+     */
+    public function down(Schema $schema)
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+
+    }
+}
diff --git a/src/CoreShop/Bundle/CoreBundle/Order/OrderMailProcessor.php b/src/CoreShop/Bundle/CoreBundle/Order/OrderMailProcessor.php
@@ -159,6 +159,4 @@ public function sendOrderMail($emailDocument, OrderInterface $order, $sendInvoic
             return $this->mailProcessor->sendMail($emailDocument, $order, $recipient, $attachments, $emailParameters);
         });
     }
-}
-
-class_alias(OrderMailProcessor::class, 'CoreShop\Component\Core\Order\OrderMailProcessor');
+}
diff --git a/src/CoreShop/Bundle/CoreBundle/composer.json b/src/CoreShop/Bundle/CoreBundle/composer.json
@@ -49,7 +49,7 @@
       "CoreShop\\Bundle\\CoreBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/CurrencyBundle/composer.json b/src/CoreShop/Bundle/CurrencyBundle/composer.json
@@ -30,7 +30,7 @@
       "CoreShop\\Bundle\\CurrencyBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/CustomerBundle/composer.json b/src/CoreShop/Bundle/CustomerBundle/composer.json
@@ -30,7 +30,7 @@
       "CoreShop\\Bundle\\CustomerBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/FixtureBundle/composer.json b/src/CoreShop/Bundle/FixtureBundle/composer.json
@@ -35,7 +35,7 @@
       "CoreShop\\Bundle\\FixtureBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/FrontendBundle/composer.json b/src/CoreShop/Bundle/FrontendBundle/composer.json
@@ -30,7 +30,7 @@
       "CoreShop\\Bundle\\FrontendBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/IndexBundle/Resources/config/doctrine/model/FilterCondition.orm.yml b/src/CoreShop/Bundle/IndexBundle/Resources/config/doctrine/model/FilterCondition.orm.yml
@@ -8,10 +8,6 @@ CoreShop\Component\Index\Model\FilterCondition:
             id: true
             generator:
                 strategy: AUTO
-        field:
-            column: field
-            type: string
-            nullable: true
         type:
             column: type
             type: string

diff --git a/src/CoreShop/Bundle/IndexBundle/composer.json b/src/CoreShop/Bundle/IndexBundle/composer.json
@@ -31,7 +31,7 @@
       "CoreShop\\Bundle\\IndexBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/InventoryBundle/composer.json b/src/CoreShop/Bundle/InventoryBundle/composer.json
@@ -29,7 +29,7 @@
       "CoreShop\\Bundle\\InventoryBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/LocaleBundle/composer.json b/src/CoreShop/Bundle/LocaleBundle/composer.json
@@ -29,7 +29,7 @@
       "CoreShop\\Bundle\\LocaleBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/MoneyBundle/composer.json b/src/CoreShop/Bundle/MoneyBundle/composer.json
@@ -30,7 +30,7 @@
       "CoreShop\\Bundle\\MoneyBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/NotificationBundle/composer.json b/src/CoreShop/Bundle/NotificationBundle/composer.json
@@ -31,7 +31,7 @@
       "CoreShop\\Bundle\\NotificationBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/OrderBundle/Resources/config/services/purchasable.yml b/src/CoreShop/Bundle/OrderBundle/Resources/config/services/purchasable.yml
@@ -8,11 +8,6 @@ services:
             - CoreShop\Component\Order\Calculator\PurchasableRetailPriceCalculatorInterface
             - purchasable-retail-price-calculators
 
-    coreshop.order.purchasable.price_calculator.price_aware:
-        class: CoreShop\Component\Order\Calculator\PriceAwarePurchasableCalculator
-        tags:
-          - { name: coreshop.order.purchasable.retail_price_calculator, type: price_aware, priority: 10 }
-
     coreshop.order.purchasable.retail_price_calculator:
         class: CoreShop\Component\Order\Calculator\CompositePurchasableRetailPriceCalculator
         arguments:

diff --git a/src/CoreShop/Bundle/OrderBundle/composer.json b/src/CoreShop/Bundle/OrderBundle/composer.json
@@ -37,7 +37,7 @@
       "CoreShop\\Bundle\\OrderBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentProviderRepository.php b/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentProviderRepository.php
@@ -36,16 +36,6 @@ public function findByTitle($title, $locale)
             ->getResult();
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function findByName($name, $locale)
-    {
-        @trigger_error('findByName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use findByTitle instead', E_USER_DEPRECATED);
-
-        return $this->findByTitle($name, $locale);
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentRepository.php b/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentRepository.php
@@ -18,14 +18,6 @@
 
 class PaymentRepository extends EntityRepository implements PaymentRepositoryInterface
 {
-    /**
-     * {@inheritdoc}
-     */
-    public function findForOrder(PayableInterface $payable)
-    {
-        return $this->findForPayable($payable);
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/src/CoreShop/Bundle/PaymentBundle/composer.json b/src/CoreShop/Bundle/PaymentBundle/composer.json
@@ -32,7 +32,7 @@
       "CoreShop\\Bundle\\PaymentBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/PayumBundle/composer.json b/src/CoreShop/Bundle/PayumBundle/composer.json
@@ -36,7 +36,7 @@
       "CoreShop\\Bundle\\PaymentBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {

diff --git a/src/CoreShop/Bundle/PimcoreBundle/CoreExtension/SerializedData.php b/src/CoreShop/Bundle/PimcoreBundle/CoreExtension/SerializedData.php
@@ -196,6 +196,4 @@ public function setValues($data = [])
 
         return $this;
     }
-}
-
-class_alias(SerializedData::class, 'CoreShop\Bundle\ResourceBundle\CoreExtension\SerializedData');
+}
diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/config/services.yml b/src/CoreShop/Bundle/PimcoreBundle/Resources/config/services.yml
@@ -18,10 +18,6 @@ services:
     coreshop.object_link_generator:
         class: CoreShop\Component\Pimcore\DataObject\LinkGenerator
 
-    coreshop.pimcore.object_link_generator:
-        alias: coreshop.object_link_generator
-        deprecated: 'use @coreshop.object_link_generator instead'
-
     coreshop.grid_config_installer:
         class: CoreShop\Component\Pimcore\DataObject\GridConfigInstaller
 
@@ -39,10 +35,6 @@ services:
     coreshop.object_cloner:
         class: CoreShop\Component\Pimcore\DataObject\ObjectCloner
 
-    coreshop.resource.object_cloner:
-        alias: coreshop.object_cloner
-        deprecated: 'use @coreshop.object_cloner instead'
-
     coreshop.link_generator:
         class: CoreShop\Component\Pimcore\Routing\LinkGenerator
         arguments:

diff --git a/src/CoreShop/Bundle/PimcoreBundle/composer.json b/src/CoreShop/Bundle/PimcoreBundle/composer.json
@@ -30,7 +30,7 @@
       "CoreShop\\Bundle\\PimcoreBundle\\": ""
     }
   },
-  "minimum-stability": "dev",
+  "minimum-stability": "RC",
   "prefer-stable": true,
   "extra": {
     "branch-alias": {
-Original file line number
+Diff line change
@@ Expand Up @@
                 return $this->mailProcessor->sendMail($emailDocument, $order, $recipient, $attachments, $emailParameters);
             });
         }
-    }
-    class_alias(OrderMailProcessor::class, 'CoreShop\Component\Core\Order\OrderMailProcessor');
+    }