From 8e64355ee01a6b2364f40d1ecb74337f88b63419 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Mon, 1 Oct 2018 11:11:27 +0200 Subject: [PATCH 1/3] [2.0.0-rc.1] remove all deprecations and prepare rc.1 --- .../Behat/Context/Cli/InstallerContext.php | 25 +- .../Behat/Context/Domain/CartContext.php | 4 +- .../Behat/Context/Setup/ShippingContext.php | 1 + .../Bundle/CoreBundle/Application/Version.php | 2 +- .../Migrations/Version20180206111535.php | 10 +- .../Migrations/Version20181001085952.php | 31 ++ .../CoreBundle/Order/OrderMailProcessor.php | 4 +- .../doctrine/model/FilterCondition.orm.yml | 4 - .../Resources/config/services/purchasable.yml | 5 - .../ORM/PaymentProviderRepository.php | 10 - .../Doctrine/ORM/PaymentRepository.php | 8 - .../CoreExtension/SerializedData.php | 4 +- .../Resources/config/services.yml | 8 - .../CoreExtension/SerializedData.php | 25 -- .../PrioritizedCompositeServicePass.php | 23 -- .../Compiler/RegisterRegistryTypePass.php | 23 -- .../RegisterSimpleRegistryTypePass.php | 23 -- .../ResourceBundle/Pimcore/ResourceLoader.php | 25 -- .../Core/Order/OrderMailProcessor.php | 25 -- .../Index/Condition/AbstractRenderer.php | 27 -- .../Component/Index/Condition/Condition.php | 306 ------------------ .../Component/Index/Model/FilterCondition.php | 18 -- .../Index/Model/FilterConditionInterface.php | 16 - .../PriceAwarePurchasableCalculator.php | 36 --- .../Model/PriceAwarePurchasableInterface.php | 26 -- .../Component/Payment/Model/Payment.php | 20 -- .../Payment/Model/PaymentInterface.php | 14 - .../Payment/Model/PaymentProvider.php | 20 -- .../Model/PaymentProviderInterface.php | 17 - .../Model/PaymentProviderTranslation.php | 20 -- .../PaymentProviderTranslationInterface.php | 14 - .../PaymentProviderRepositoryInterface.php | 10 - .../Repository/PaymentRepositoryInterface.php | 9 - .../Pimcore/AbstractDefinitionUpdate.php | 25 -- .../Pimcore/BrickDefinitionUpdate.php | 25 -- .../ClassDefinitionAlreadyExistsException.php | 25 -- .../ClassDefinitionFieldNotFoundException.php | 25 -- .../ClassDefinitionNotFoundException.php | 25 -- .../Component/Pimcore/ClassInstaller.php | 25 -- .../Pimcore/ClassInstallerInterface.php | 25 -- .../Component/Pimcore/ClassLoader.php | 25 -- .../Component/Pimcore/ClassUpdate.php | 25 -- .../Pimcore/ClassUpdateInterface.php | 25 -- .../DataObject/AbstractDefinitionUpdate.php | 4 +- .../DataObject/BrickDefinitionUpdate.php | 4 +- .../Pimcore/DataObject/ClassInstaller.php | 4 +- .../DataObject/ClassInstallerInterface.php | 4 +- .../Pimcore/DataObject/ClassLoader.php | 4 +- .../Pimcore/DataObject/ClassUpdate.php | 4 +- .../DataObject/ClassUpdateInterface.php | 4 +- .../FieldCollectionDefinitionUpdate.php | 4 +- .../DataObject/GridConfigInstaller.php | 4 +- .../GridConfigInstallerInterface.php | 4 +- .../Pimcore/DataObject/InheritanceHelper.php | 4 +- .../Pimcore/DataObject/LinkGenerator.php | 4 +- .../Component/Pimcore/DataObject/Migrate.php | 4 +- .../Pimcore/DataObject/NoteService.php | 4 +- .../Pimcore/DataObject/ObjectCloner.php | 4 +- .../Pimcore/DataObject/ObjectService.php | 4 +- .../DataObject/ObjectServiceInterface.php | 4 +- .../Pimcore/DataObject/VersionHelper.php | 4 +- src/CoreShop/Component/Pimcore/Db.php | 25 -- src/CoreShop/Component/Pimcore/Db/Db.php | 4 +- .../ClassDefinitionAlreadyExistsException.php | 4 +- .../ClassDefinitionFieldNotFoundException.php | 4 +- .../ClassDefinitionNotFoundException.php | 4 +- .../ExpressionLanguage/ExpressionLanguage.php | 35 -- .../FieldCollectionDefinitionUpdate.php | 25 -- .../Component/Pimcore/GridConfigInstaller.php | 25 -- .../Pimcore/GridConfigInstallerInterface.php | 25 -- .../Component/Pimcore/InheritanceHelper.php | 25 -- src/CoreShop/Component/Pimcore/Migrate.php | 25 -- .../Component/Pimcore/ObjectLinkGenerator.php | 25 -- .../Component/Pimcore/ResourceLoader.php | 4 +- .../Component/Pimcore/VersionHelper.php | 25 -- .../Pimcore/DataObjectNoteService.php | 26 -- .../Resource/Pimcore/ObjectCloner.php | 25 -- .../Resource/Pimcore/ObjectService.php | 25 -- .../Pimcore/ObjectServiceInterface.php | 25 -- .../Component/Shipping/Model/Carrier.php | 40 --- .../Shipping/Model/CarrierInterface.php | 31 -- .../Shipping/Model/CarrierTranslation.php | 20 -- .../Model/CarrierTranslationInterface.php | 14 - 83 files changed, 69 insertions(+), 1527 deletions(-) create mode 100644 src/CoreShop/Bundle/CoreBundle/Migrations/Version20181001085952.php delete mode 100644 src/CoreShop/Bundle/ResourceBundle/CoreExtension/SerializedData.php delete mode 100755 src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/PrioritizedCompositeServicePass.php delete mode 100644 src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterRegistryTypePass.php delete mode 100644 src/CoreShop/Bundle/ResourceBundle/DependencyInjection/Compiler/RegisterSimpleRegistryTypePass.php delete mode 100644 src/CoreShop/Bundle/ResourceBundle/Pimcore/ResourceLoader.php delete mode 100644 src/CoreShop/Component/Core/Order/OrderMailProcessor.php delete mode 100644 src/CoreShop/Component/Index/Condition/AbstractRenderer.php delete mode 100644 src/CoreShop/Component/Index/Condition/Condition.php delete mode 100644 src/CoreShop/Component/Order/Calculator/PriceAwarePurchasableCalculator.php delete mode 100644 src/CoreShop/Component/Order/Model/PriceAwarePurchasableInterface.php delete mode 100644 src/CoreShop/Component/Pimcore/AbstractDefinitionUpdate.php delete mode 100644 src/CoreShop/Component/Pimcore/BrickDefinitionUpdate.php delete mode 100644 src/CoreShop/Component/Pimcore/ClassDefinitionAlreadyExistsException.php delete mode 100644 src/CoreShop/Component/Pimcore/ClassDefinitionFieldNotFoundException.php delete mode 100644 src/CoreShop/Component/Pimcore/ClassDefinitionNotFoundException.php delete mode 100644 src/CoreShop/Component/Pimcore/ClassInstaller.php delete mode 100644 src/CoreShop/Component/Pimcore/ClassInstallerInterface.php delete mode 100644 src/CoreShop/Component/Pimcore/ClassLoader.php delete mode 100644 src/CoreShop/Component/Pimcore/ClassUpdate.php delete mode 100644 src/CoreShop/Component/Pimcore/ClassUpdateInterface.php delete mode 100644 src/CoreShop/Component/Pimcore/Db.php delete mode 100644 src/CoreShop/Component/Pimcore/ExpressionLanguage/ExpressionLanguage.php delete mode 100644 src/CoreShop/Component/Pimcore/FieldCollectionDefinitionUpdate.php delete mode 100644 src/CoreShop/Component/Pimcore/GridConfigInstaller.php delete mode 100644 src/CoreShop/Component/Pimcore/GridConfigInstallerInterface.php delete mode 100644 src/CoreShop/Component/Pimcore/InheritanceHelper.php delete mode 100644 src/CoreShop/Component/Pimcore/Migrate.php delete mode 100644 src/CoreShop/Component/Pimcore/ObjectLinkGenerator.php delete mode 100644 src/CoreShop/Component/Pimcore/VersionHelper.php delete mode 100644 src/CoreShop/Component/Resource/Pimcore/DataObjectNoteService.php delete mode 100644 src/CoreShop/Component/Resource/Pimcore/ObjectCloner.php delete mode 100644 src/CoreShop/Component/Resource/Pimcore/ObjectService.php delete mode 100644 src/CoreShop/Component/Resource/Pimcore/ObjectServiceInterface.php diff --git a/src/CoreShop/Behat/Context/Cli/InstallerContext.php b/src/CoreShop/Behat/Context/Cli/InstallerContext.php index a232a935b1..e1645ab2d3 100644 --- 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 index 849747ed0b..c6143f0897 100644 --- 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 index 19492cc8f1..162a7853da 100644 --- 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/CoreBundle/Application/Version.php b/src/CoreShop/Bundle/CoreBundle/Application/Version.php index 7ed3980d30..2feaabda37 100644 --- 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/Migrations/Version20180206111535.php b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20180206111535.php index 0177e21edd..52e5ff0f9e 100644 --- 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 new file mode 100644 index 0000000000..8ce45821b2 --- /dev/null +++ b/src/CoreShop/Bundle/CoreBundle/Migrations/Version20181001085952.php @@ -0,0 +1,31 @@ +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 index 905edd5e7f..8e619d5cc8 100644 --- 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'); \ No newline at end of file +} \ No newline at end of file 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 index 8f1ccd0a68..2bb642d10b 100644 --- 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/OrderBundle/Resources/config/services/purchasable.yml b/src/CoreShop/Bundle/OrderBundle/Resources/config/services/purchasable.yml index 35d5fbdbcf..5fae1a2bbe 100644 --- 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/PaymentBundle/Doctrine/ORM/PaymentProviderRepository.php b/src/CoreShop/Bundle/PaymentBundle/Doctrine/ORM/PaymentProviderRepository.php index de0bb2d255..ccd1a08c9d 100644 --- 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 index e5d5e4a044..b0672a0793 100644 --- 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/PimcoreBundle/CoreExtension/SerializedData.php b/src/CoreShop/Bundle/PimcoreBundle/CoreExtension/SerializedData.php index 922340650d..b381495433 100644 --- 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'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Bundle/PimcoreBundle/Resources/config/services.yml b/src/CoreShop/Bundle/PimcoreBundle/Resources/config/services.yml index 18d1a1eb8c..5cf2f31600 100755 --- 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/ResourceBundle/CoreExtension/SerializedData.php b/src/CoreShop/Bundle/ResourceBundle/CoreExtension/SerializedData.php deleted file mode 100644 index c1bab21e4b..0000000000 --- a/src/CoreShop/Bundle/ResourceBundle/CoreExtension/SerializedData.php +++ /dev/null @@ -1,25 +0,0 @@ -fieldName = $fieldName; - $this->type = $type; - $this->values = $values; - } - - /** - * @deprecated Don't use anymore, use IsCondition directly - * - * IN Condition (in). - * - * @param $fieldName - * @param $null - * - * @return ConditionInterface - */ - public static function is($fieldName, $null) - { - @trigger_error('is() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use IsCondition class instead.', E_USER_DEPRECATED); - - return new IsCondition($fieldName, $null); - } - - /** - * @deprecated Don't use anymore, use InCondition directly - * - * IN Condition (in). - * - * @param $fieldName - * @param $array - * - * @return ConditionInterface - */ - public static function in($fieldName, $array) - { - @trigger_error('in() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use InCondition class instead.', E_USER_DEPRECATED); - - return new InCondition($fieldName, $array); - } - - /** - * @deprecated Don't use anymore, use RangeCondition directly - * - * Range Condition (>=, <=). - * - * @param $fieldName - * @param $fromRange - * @param $toRange - * - * @return ConditionInterface - */ - public static function range($fieldName, $fromRange, $toRange) - { - @trigger_error('range() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use RangeCondition class instead.', E_USER_DEPRECATED); - - return new RangeCondition($fieldName, $fromRange, $toRange); - } - - /** - * @deprecated Don't use anymore, use ConcatCondition directly - * - * Concat Conditions with "AND" or "OR". - * - * @param $fieldName - * @param ConditionInterface[] $conditions - * @param string $operator ("AND", "OR") - * - * @return ConditionInterface - */ - public static function concat($fieldName, $conditions, $operator) - { - @trigger_error('concat() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use ConcatCondition class instead.', E_USER_DEPRECATED); - - return new ConcatCondition($fieldName, $operator, $conditions); - } - - /** - * @deprecated Don't use anymore, use LikeCondition directly - * - * Like Condition (%). - * - * @param $fieldName - * @param $value - * @param $patternPosition ("left", "right", "both") - * - * @return ConditionInterface - */ - public static function like($fieldName, $value, $patternPosition) - { - @trigger_error('like() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use LikeCondition class instead.', E_USER_DEPRECATED); - - return new LikeCondition($fieldName, $patternPosition, $value); - } - - /** - * @deprecated Don't use anymore, use MatchCondition directly - * - * Match Condition (=). - * - * @param $fieldName - * @param $value - * - * @return ConditionInterface - */ - public static function match($fieldName, $value) - { - @trigger_error('match() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use MatchCondition class instead.', E_USER_DEPRECATED); - - return new MatchCondition($fieldName, $value); - } - - /** - * @deprecated Don't use anymore, use NotMatchCondition directly - * - * Match Condition (=). - * - * @param $fieldName - * @param $value - * - * @return ConditionInterface - */ - public static function notMatch($fieldName, $value) - { - @trigger_error('notMatch() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use NotMatchCondition class instead.', E_USER_DEPRECATED); - - return new NotMatchCondition($fieldName, $value); - } - - /** - * @deprecated Don't use anymore, use LowerThanCondition directly - * - * Lower Than Condition (<). - * - * @param $fieldName - * @param $value - * - * @return ConditionInterface - */ - public static function lt($fieldName, $value) - { - @trigger_error('lt() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use LowerThanCondition class instead.', E_USER_DEPRECATED); - - return new LowerThanCondition($fieldName, $value); - } - - /** - * @deprecated Don't use anymore, use LowerThanEqualCondition directly - * - * Lower Than Equal Condition (<=). - * - * @param $fieldName - * @param $value - * - * @return ConditionInterface - */ - public static function lte($fieldName, $value) - { - @trigger_error('lte() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use LowerThanEqualCondition class instead.', E_USER_DEPRECATED); - - return new LowerThanEqualCondition($fieldName, $value); - } - - /** - * @deprecated Don't use anymore, use GreaterThanCondition directly - * - * Greater Than Condition (>). - * - * @param $fieldName - * @param $value - * - * @return ConditionInterface - */ - public static function gt($fieldName, $value) - { - @trigger_error('gt() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use GreaterThanCondition class instead.', E_USER_DEPRECATED); - - return new GreaterThanCondition($fieldName, $value); - } - - /** - * @deprecated Don't use anymore, use GreaterThanEqualCondition directly - * - * Greater Than Equal Condition (<=). - * - * @param $fieldName - * @param $value - * - * @return ConditionInterface - */ - public static function gte($fieldName, $value) - { - @trigger_error('gte() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use GreaterThanEqualCondition class instead.', E_USER_DEPRECATED); - - return new GreaterThanEqualCondition($fieldName, $value); - } - - /** - * @deprecated Don't use anymore, use CompareCondition directly - * - * Compare Condition ($operator). - * - * @param $fieldName - * @param $value - * @param $operator - * - * @return ConditionInterface - */ - public static function compare($fieldName, $value, $operator) - { - @trigger_error('compare() is deprecated since version 2.0.0-beta.2 and will be removed in 2.0. Use CompareCondition class instead.', E_USER_DEPRECATED); - - return new CompareCondition($fieldName, $operator, $value); - } - - /** - * @return string - */ - public function getType() - { - return $this->type; - } - - /** - * @param string $type - */ - public function setType($type) - { - $this->type = $type; - } - - /** - * @return mixed - */ - public function getValues() - { - return $this->values; - } - - /** - * @param mixed $values - */ - public function setValues($values) - { - $this->values = $values; - } - - /** - * @return string - */ - public function getFieldName() - { - return $this->fieldName; - } - - /** - * @param string $fieldName - */ - public function setFieldName($fieldName) - { - $this->fieldName = $fieldName; - } -} diff --git a/src/CoreShop/Component/Index/Model/FilterCondition.php b/src/CoreShop/Component/Index/Model/FilterCondition.php index 19a712e919..4fe83f2896 100644 --- a/src/CoreShop/Component/Index/Model/FilterCondition.php +++ b/src/CoreShop/Component/Index/Model/FilterCondition.php @@ -73,24 +73,6 @@ public function setType($type) $this->type = $type; } - /** - * {@inheritdoc} - */ - public function getField() - { - return $this->field; - } - - /** - * {@inheritdoc} - */ - public function setField($field) - { - $this->field = $field; - - return $this; - } - /** * {@inheritdoc} */ diff --git a/src/CoreShop/Component/Index/Model/FilterConditionInterface.php b/src/CoreShop/Component/Index/Model/FilterConditionInterface.php index 7fc41e68d1..cbd241b136 100644 --- a/src/CoreShop/Component/Index/Model/FilterConditionInterface.php +++ b/src/CoreShop/Component/Index/Model/FilterConditionInterface.php @@ -29,22 +29,6 @@ public function getType(); */ public function setType($type); - /** - * @deprecated don't use anymore, it is inside configuration now - * - * @return string - */ - public function getField(); - - /** - * @deprecated don't use anymore, it is inside configuration now - * - * @param string $field - * - * @return static - */ - public function setField($field); - /** * @return string */ diff --git a/src/CoreShop/Component/Order/Calculator/PriceAwarePurchasableCalculator.php b/src/CoreShop/Component/Order/Calculator/PriceAwarePurchasableCalculator.php deleted file mode 100644 index 554dd92607..0000000000 --- a/src/CoreShop/Component/Order/Calculator/PriceAwarePurchasableCalculator.php +++ /dev/null @@ -1,36 +0,0 @@ -getPrice(); - } - - return null; - } -} \ No newline at end of file diff --git a/src/CoreShop/Component/Order/Model/PriceAwarePurchasableInterface.php b/src/CoreShop/Component/Order/Model/PriceAwarePurchasableInterface.php deleted file mode 100644 index 0955f928e2..0000000000 --- a/src/CoreShop/Component/Order/Model/PriceAwarePurchasableInterface.php +++ /dev/null @@ -1,26 +0,0 @@ -details = $details; } - - /** - * {@inheritdoc} - */ - public function getOrderId() - { - @trigger_error('getOrderId is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getOrder from Core Component instead', E_USER_DEPRECATED); - - return $this->orderId; - } - - /** - * {@inheritdoc} - */ - public function setOrderId($orderId) - { - @trigger_error('setOrderId is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setOrder from Core Component instead', E_USER_DEPRECATED); - - $this->orderId = $orderId; - } } diff --git a/src/CoreShop/Component/Payment/Model/PaymentInterface.php b/src/CoreShop/Component/Payment/Model/PaymentInterface.php index 6e8ba233d0..cba2251e95 100644 --- a/src/CoreShop/Component/Payment/Model/PaymentInterface.php +++ b/src/CoreShop/Component/Payment/Model/PaymentInterface.php @@ -77,18 +77,4 @@ public function setTotalAmount($amount); * @param $number */ public function setNumber($number); - - /** - * @deprecated setOrderId is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setOrder from Core Component instead - * - * @param int $orderId - */ - public function setOrderId($orderId); - - /** - * @deprecated getOrderId is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getOrder from Core Component instead - * - * @return int - */ - public function getOrderId(); } diff --git a/src/CoreShop/Component/Payment/Model/PaymentProvider.php b/src/CoreShop/Component/Payment/Model/PaymentProvider.php index 4882845878..a2fe4d3104 100644 --- a/src/CoreShop/Component/Payment/Model/PaymentProvider.php +++ b/src/CoreShop/Component/Payment/Model/PaymentProvider.php @@ -77,26 +77,6 @@ public function setIdentifier($identifier) $this->identifier = $identifier; } - /** - * {@inheritdoc} - */ - public function getName($language = null) - { - @trigger_error('getName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead', E_USER_DEPRECATED); - - return $this->getTitle($language); - } - - /** - * {@inheritdoc} - */ - public function setName($name, $language = null) - { - @trigger_error('setName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setTitle instead', E_USER_DEPRECATED); - - $this->setTitle($name, $language); - } - /** * {@inheritdoc} */ diff --git a/src/CoreShop/Component/Payment/Model/PaymentProviderInterface.php b/src/CoreShop/Component/Payment/Model/PaymentProviderInterface.php index de3df2ade0..bc3450f01d 100644 --- a/src/CoreShop/Component/Payment/Model/PaymentProviderInterface.php +++ b/src/CoreShop/Component/Payment/Model/PaymentProviderInterface.php @@ -28,23 +28,6 @@ public function getIdentifier(); */ public function setIdentifier($identifier); - /** - * @deprecated getName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead - * - * @param null $language - * - * @return string - */ - public function getName($language = null); - - /** - * @deprecated setName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setTitle instead - * - * @param string $name - * @param null $language - */ - public function setName($name, $language = null); - /** * @param null $language * diff --git a/src/CoreShop/Component/Payment/Model/PaymentProviderTranslation.php b/src/CoreShop/Component/Payment/Model/PaymentProviderTranslation.php index f1d267b461..9ebb22b153 100755 --- a/src/CoreShop/Component/Payment/Model/PaymentProviderTranslation.php +++ b/src/CoreShop/Component/Payment/Model/PaymentProviderTranslation.php @@ -55,26 +55,6 @@ public function getId() return $this->id; } - /** - * {@inheritdoc} - */ - public function getName() - { - @trigger_error('getName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead', E_USER_DEPRECATED); - - return $this->getTitle(); - } - - /** - * {@inheritdoc} - */ - public function setName($name) - { - @trigger_error('setName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setTitle instead', E_USER_DEPRECATED); - - $this->setTitle($name); - } - /** * {@inheritdoc} */ diff --git a/src/CoreShop/Component/Payment/Model/PaymentProviderTranslationInterface.php b/src/CoreShop/Component/Payment/Model/PaymentProviderTranslationInterface.php index bf08c8b2ea..4e1747bf20 100755 --- a/src/CoreShop/Component/Payment/Model/PaymentProviderTranslationInterface.php +++ b/src/CoreShop/Component/Payment/Model/PaymentProviderTranslationInterface.php @@ -17,20 +17,6 @@ interface PaymentProviderTranslationInterface extends ResourceInterface, TimestampableInterface { - /** - * @deprecated getName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead - * - * @return string - */ - public function getName(); - - /** - * @deprecated setName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setTitle instead - * - * @param string $name - */ - public function setName($name); - /** * @return string */ diff --git a/src/CoreShop/Component/Payment/Repository/PaymentProviderRepositoryInterface.php b/src/CoreShop/Component/Payment/Repository/PaymentProviderRepositoryInterface.php index db3400c22a..93c915cf9d 100644 --- a/src/CoreShop/Component/Payment/Repository/PaymentProviderRepositoryInterface.php +++ b/src/CoreShop/Component/Payment/Repository/PaymentProviderRepositoryInterface.php @@ -17,16 +17,6 @@ interface PaymentProviderRepositoryInterface extends RepositoryInterface { - /** - * @deprecated findByName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use findByTitle instead - * - * @param string $name - * @param string $locale - * - * @return PaymentProviderInterface[] - */ - public function findByName($name, $locale); - /** * @param string $title * @param string $locale diff --git a/src/CoreShop/Component/Payment/Repository/PaymentRepositoryInterface.php b/src/CoreShop/Component/Payment/Repository/PaymentRepositoryInterface.php index b6056594c1..626abccfb8 100644 --- a/src/CoreShop/Component/Payment/Repository/PaymentRepositoryInterface.php +++ b/src/CoreShop/Component/Payment/Repository/PaymentRepositoryInterface.php @@ -18,15 +18,6 @@ interface PaymentRepositoryInterface extends RepositoryInterface { - /** - * @param PayableInterface $payable - * - * @return PaymentInterface[] - * - * @deprecated use findForPayable instead - */ - public function findForOrder(PayableInterface $payable); - /** * @param PayableInterface $payable * diff --git a/src/CoreShop/Component/Pimcore/AbstractDefinitionUpdate.php b/src/CoreShop/Component/Pimcore/AbstractDefinitionUpdate.php deleted file mode 100644 index a3fa5df357..0000000000 --- a/src/CoreShop/Component/Pimcore/AbstractDefinitionUpdate.php +++ /dev/null @@ -1,25 +0,0 @@ -brickDefinition, json_encode($this->jsonDefinition), true); } -} - -class_alias(BrickDefinitionUpdate::class, 'CoreShop\Component\Pimcore\BrickDefinitionUpdate'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/ClassInstaller.php b/src/CoreShop/Component/Pimcore/DataObject/ClassInstaller.php index ee6bc3e3a4..2a4a9c125e 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ClassInstaller.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ClassInstaller.php @@ -107,6 +107,4 @@ public function createFieldCollection($jsonFile, $name) return $fieldCollection; } -} - -class_alias(ClassInstaller::class, 'CoreShop\Component\Pimcore\ClassInstaller'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/ClassInstallerInterface.php b/src/CoreShop/Component/Pimcore/DataObject/ClassInstallerInterface.php index 6315f0742f..c73e0b929c 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ClassInstallerInterface.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ClassInstallerInterface.php @@ -39,6 +39,4 @@ public function createClass($jsonFile, $className, $updateClass = false); * @return mixed|null|DataObject\Fieldcollection\Definition */ public function createFieldCollection($jsonFile, $name); -} - -class_alias(ClassInstallerInterface::class, 'CoreShop\Component\Pimcore\ClassInstallerInterface'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/ClassLoader.php b/src/CoreShop/Component/Pimcore/DataObject/ClassLoader.php index 84719cdf0f..a2b2915b69 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ClassLoader.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ClassLoader.php @@ -83,6 +83,4 @@ protected static function normalizeClassName($className) $classNameExploded = explode('\\', $className); return ucfirst($classNameExploded[count($classNameExploded) - 1]); } -} - -class_alias(ClassLoader::class, 'CoreShop\Component\Pimcore\ClassLoader'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/ClassUpdate.php b/src/CoreShop/Component/Pimcore/DataObject/ClassUpdate.php index 016776f9aa..c4813c4427 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ClassUpdate.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ClassUpdate.php @@ -75,6 +75,4 @@ function (&$foundField, $index, &$parent) use($fieldName, $newFieldName) { } ); } -} - -class_alias(ClassUpdate::class, 'CoreShop\Component\Pimcore\ClassUpdate'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/ClassUpdateInterface.php b/src/CoreShop/Component/Pimcore/DataObject/ClassUpdateInterface.php index 3e1ad734ab..1ef3b72fdd 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ClassUpdateInterface.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ClassUpdateInterface.php @@ -110,6 +110,4 @@ public function replaceFieldProperties($fieldName, array $keyValues); * @throws ClassDefinitionFieldNotFoundException */ public function removeField($fieldName); -} - -class_alias(ClassUpdateInterface::class, 'CoreShop\Component\Pimcore\ClassUpdateInterface'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/FieldCollectionDefinitionUpdate.php b/src/CoreShop/Component/Pimcore/DataObject/FieldCollectionDefinitionUpdate.php index b69cc718ed..60afacc142 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/FieldCollectionDefinitionUpdate.php +++ b/src/CoreShop/Component/Pimcore/DataObject/FieldCollectionDefinitionUpdate.php @@ -51,6 +51,4 @@ public function save() { return DataObject\ClassDefinition\Service::importFieldCollectionFromJson($this->fieldCollectionDefinition, json_encode($this->jsonDefinition), true); } -} - -class_alias(FieldCollectionDefinitionUpdate::class, 'CoreShop\Component\Pimcore\FieldCollectionDefinitionUpdate'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/GridConfigInstaller.php b/src/CoreShop/Component/Pimcore/DataObject/GridConfigInstaller.php index 7cf5d3c56e..2da4f164db 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/GridConfigInstaller.php +++ b/src/CoreShop/Component/Pimcore/DataObject/GridConfigInstaller.php @@ -44,6 +44,4 @@ public function installGridConfig($config, $name, $classId, $overwrite = false) $gridConfig->setClassId($classId); $gridConfig->save(); } -} - -class_alias(GridConfigInstaller::class, 'CoreShop\Component\Pimcore\GridConfigInstaller'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/GridConfigInstallerInterface.php b/src/CoreShop/Component/Pimcore/DataObject/GridConfigInstallerInterface.php index b1b20a7fe7..794d4e5e50 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/GridConfigInstallerInterface.php +++ b/src/CoreShop/Component/Pimcore/DataObject/GridConfigInstallerInterface.php @@ -21,6 +21,4 @@ interface GridConfigInstallerInterface * @param $overwrite */ public function installGridConfig($config, $name, $class, $overwrite = false); -} - -class_alias(GridConfigInstallerInterface::class, 'CoreShop\Component\Pimcore\GridConfigInstallerInterface'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/InheritanceHelper.php b/src/CoreShop/Component/Pimcore/DataObject/InheritanceHelper.php index 159e5fe9e7..200ca82210 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/InheritanceHelper.php +++ b/src/CoreShop/Component/Pimcore/DataObject/InheritanceHelper.php @@ -36,6 +36,4 @@ public static function useInheritedValues(\Closure $function, $inheritValues = t return $result; } -} - -class_alias(InheritanceHelper::class, 'CoreShop\Component\Pimcore\InheritanceHelper'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/LinkGenerator.php b/src/CoreShop/Component/Pimcore/DataObject/LinkGenerator.php index 63f304e062..1b0a6a7d31 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/LinkGenerator.php +++ b/src/CoreShop/Component/Pimcore/DataObject/LinkGenerator.php @@ -39,6 +39,4 @@ public function hasGenerator(Concrete $object): bool { return $object->getClass()->getLinkGenerator() instanceof LinkGeneratorInterface; } -} - -class_alias(LinkGenerator::class, 'CoreShop\Component\Pimcore\ObjectLinkGenerator'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/Migrate.php b/src/CoreShop/Component/Pimcore/DataObject/Migrate.php index 76cec6d9e9..efcfa84563 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/Migrate.php +++ b/src/CoreShop/Component/Pimcore/DataObject/Migrate.php @@ -216,6 +216,4 @@ public static function migrateData($oldPimcoreClass, $newPimcoreClass) $db->query("UPDATE objects SET o_classId=?, o_className=? WHERE o_classId=?", [$newClassDefinition->getId(), $newClassDefinition->getName(), $oldClassDefinition->getId()]); } -} - -class_alias(Migrate::class, 'CoreShop\Component\Pimcore\Migrate'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/NoteService.php b/src/CoreShop/Component/Pimcore/DataObject/NoteService.php index a7981e12af..723c9b776d 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/NoteService.php +++ b/src/CoreShop/Component/Pimcore/DataObject/NoteService.php @@ -135,6 +135,4 @@ public function deleteNote($noteId, $eventParams = []) new GenericEvent($note, $eventParams) ); } -} - -\class_alias(NoteService::class, 'CoreShop\Component\Resource\Pimcore\DataObjectNoteService'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/ObjectCloner.php b/src/CoreShop/Component/Pimcore/DataObject/ObjectCloner.php index 0323479c63..ee2e931165 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ObjectCloner.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ObjectCloner.php @@ -22,6 +22,4 @@ public function cloneObject(Concrete $object, $parent, $key) return $newObject; } -} - -\class_alias(ObjectCloner::class, 'CoreShop\Component\Resource\Pimcore\ObjectCloner'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/ObjectService.php b/src/CoreShop/Component/Pimcore/DataObject/ObjectService.php index 0163346cf8..8e2014e916 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ObjectService.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ObjectService.php @@ -50,6 +50,4 @@ public function copyObject(Concrete $fromObject, Concrete $toObject) } } } -} - -\class_alias(ObjectService::class, 'CoreShop\Component\Resource\Pimcore\ObjectService'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/ObjectServiceInterface.php b/src/CoreShop/Component/Pimcore/DataObject/ObjectServiceInterface.php index aa6e08c4ca..534907c859 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/ObjectServiceInterface.php +++ b/src/CoreShop/Component/Pimcore/DataObject/ObjectServiceInterface.php @@ -34,6 +34,4 @@ public function createFolderByPath($path); * @return mixed */ public function copyObject(Concrete $fromObject, Concrete $toObject); -} - -\class_alias(ObjectServiceInterface::class, 'CoreShop\Component\Resource\Pimcore\ObjectServiceInterface'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/DataObject/VersionHelper.php b/src/CoreShop/Component/Pimcore/DataObject/VersionHelper.php index 943047e2bf..63798c5b25 100644 --- a/src/CoreShop/Component/Pimcore/DataObject/VersionHelper.php +++ b/src/CoreShop/Component/Pimcore/DataObject/VersionHelper.php @@ -45,6 +45,4 @@ public static function useVersioning(\Closure $function, $enabled = true) return $result; } -} - -class_alias(VersionHelper::class, 'CoreShop\Component\Pimcore\VersionHelper'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/Db.php b/src/CoreShop/Component/Pimcore/Db.php deleted file mode 100644 index 92cac15031..0000000000 --- a/src/CoreShop/Component/Pimcore/Db.php +++ /dev/null @@ -1,25 +0,0 @@ - 0; } -} - -class_alias(Db::class, 'CoreShop\Component\Pimcore\Db'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionAlreadyExistsException.php b/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionAlreadyExistsException.php index 0d54194534..4c56895450 100644 --- a/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionAlreadyExistsException.php +++ b/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionAlreadyExistsException.php @@ -15,6 +15,4 @@ final class ClassDefinitionAlreadyExistsException extends \Exception { -} - -class_alias(ClassDefinitionAlreadyExistsException::class, 'CoreShop\Component\Pimcore\ClassDefinitionAlreadyExistsException'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionFieldNotFoundException.php b/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionFieldNotFoundException.php index 819be1129a..5c2cea4cda 100644 --- a/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionFieldNotFoundException.php +++ b/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionFieldNotFoundException.php @@ -15,6 +15,4 @@ final class ClassDefinitionFieldNotFoundException extends \Exception { -} - -class_alias(ClassDefinitionFieldNotFoundException::class, 'CoreShop\Component\Pimcore\ClassDefinitionFieldNotFoundException'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionNotFoundException.php b/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionNotFoundException.php index caed730b3f..41a30eb02c 100644 --- a/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionNotFoundException.php +++ b/src/CoreShop/Component/Pimcore/Exception/ClassDefinitionNotFoundException.php @@ -15,6 +15,4 @@ final class ClassDefinitionNotFoundException extends \Exception { -} - -class_alias(ClassDefinitionNotFoundException::class, 'CoreShop\Component\Pimcore\ClassDefinitionNotFoundException'); \ No newline at end of file +} \ No newline at end of file diff --git a/src/CoreShop/Component/Pimcore/ExpressionLanguage/ExpressionLanguage.php b/src/CoreShop/Component/Pimcore/ExpressionLanguage/ExpressionLanguage.php deleted file mode 100644 index 092e43817e..0000000000 --- a/src/CoreShop/Component/Pimcore/ExpressionLanguage/ExpressionLanguage.php +++ /dev/null @@ -1,35 +0,0 @@ -id; } - /** - * {@inheritdoc} - */ - public function getName() - { - @trigger_error('getName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getIdentifier instead', E_USER_DEPRECATED); - - return $this->getIdentifier(); - } - - /** - * {@inheritdoc} - */ - public function setName($name) - { - @trigger_error('setName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setIdentifier instead', E_USER_DEPRECATED); - - $this->setIdentifier($name); - } - /** * {@inheritdoc} */ @@ -117,31 +97,11 @@ public function setDescription($description, $language = null) $this->getTranslation($language)->setDescription($description); } - /** - * {@inheritdoc} - */ - public function getLabel($language = null) - { - return $this->getTitle($language); - } - - /** - * {@inheritdoc} - */ - public function setLabel($label, $language = null) - { - @trigger_error('getLabel is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead', E_USER_DEPRECATED); - - $this->setTitle($label, $language); - } - /** * {@inheritdoc} */ public function getTitle($language = null) { - @trigger_error('setLabel is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setTitle instead', E_USER_DEPRECATED); - return $this->getTranslation($language)->getTitle(); } diff --git a/src/CoreShop/Component/Shipping/Model/CarrierInterface.php b/src/CoreShop/Component/Shipping/Model/CarrierInterface.php index f403dcaafc..6e6bd9e94c 100644 --- a/src/CoreShop/Component/Shipping/Model/CarrierInterface.php +++ b/src/CoreShop/Component/Shipping/Model/CarrierInterface.php @@ -19,20 +19,6 @@ interface CarrierInterface extends ResourceInterface, TimestampableInterface, TranslatableInterface { - /** - * @deprecated getName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getIdentifier instead - * - * @return string - */ - public function getName(); - - /** - * @deprecated setName is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setIdentifier instead - * - * @param string $name - */ - public function setName($name); - /** * @return string */ @@ -56,23 +42,6 @@ public function getDescription($language = null); */ public function setDescription($description, $language = null); - /** - * @deprecated getLabel is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead - * - * @param null $language - * - * @return string - */ - public function getLabel($language = null); - - /** - * @deprecated setLabel is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use setTitle instead - * - * @param string $label - * @param null $language - */ - public function setLabel($label, $language = null); - /** * @param null $language * diff --git a/src/CoreShop/Component/Shipping/Model/CarrierTranslation.php b/src/CoreShop/Component/Shipping/Model/CarrierTranslation.php index 7d465277bc..d9ba222bff 100755 --- a/src/CoreShop/Component/Shipping/Model/CarrierTranslation.php +++ b/src/CoreShop/Component/Shipping/Model/CarrierTranslation.php @@ -51,26 +51,6 @@ public function getId() return $this->id; } - /** - * {@inheritdoc} - */ - public function getLabel() - { - @trigger_error('getLabel is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead', E_USER_DEPRECATED); - - return $this->getTitle(); - } - - /** - * {@inheritdoc} - */ - public function setLabel($label) - { - @trigger_error('setLabel is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead', E_USER_DEPRECATED); - - $this->setTitle($label); - } - /** * {@inheritdoc} */ diff --git a/src/CoreShop/Component/Shipping/Model/CarrierTranslationInterface.php b/src/CoreShop/Component/Shipping/Model/CarrierTranslationInterface.php index 192177956d..64d5bfbe06 100755 --- a/src/CoreShop/Component/Shipping/Model/CarrierTranslationInterface.php +++ b/src/CoreShop/Component/Shipping/Model/CarrierTranslationInterface.php @@ -17,20 +17,6 @@ interface CarrierTranslationInterface extends ResourceInterface, TimestampableInterface { - /** - * @deprecated getLabel is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead - * - * @return string - */ - public function getLabel(); - - /** - * @deprecated setLabel is deprecated since 2.0.0-beta.2 and will be removed in 2.0.0, use getTitle instead - * - * @param string $label - */ - public function setLabel($label); - /** * @return string */ From 5d372a77ac81aa71362f4cbce92faa4d4feb73f3 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Sat, 6 Oct 2018 01:06:01 +0200 Subject: [PATCH 2/3] [composer] change min stability to RC --- src/CoreShop/Bundle/AddressBundle/composer.json | 2 +- src/CoreShop/Bundle/ConfigurationBundle/composer.json | 2 +- src/CoreShop/Bundle/CoreBundle/composer.json | 2 +- src/CoreShop/Bundle/CurrencyBundle/composer.json | 2 +- src/CoreShop/Bundle/CustomerBundle/composer.json | 2 +- src/CoreShop/Bundle/FixtureBundle/composer.json | 2 +- src/CoreShop/Bundle/FrontendBundle/composer.json | 2 +- src/CoreShop/Bundle/IndexBundle/composer.json | 2 +- src/CoreShop/Bundle/InventoryBundle/composer.json | 2 +- src/CoreShop/Bundle/LocaleBundle/composer.json | 2 +- src/CoreShop/Bundle/MoneyBundle/composer.json | 2 +- src/CoreShop/Bundle/NotificationBundle/composer.json | 2 +- src/CoreShop/Bundle/OrderBundle/composer.json | 2 +- src/CoreShop/Bundle/PaymentBundle/composer.json | 2 +- src/CoreShop/Bundle/PayumBundle/composer.json | 2 +- src/CoreShop/Bundle/PimcoreBundle/composer.json | 2 +- src/CoreShop/Bundle/ProductBundle/composer.json | 2 +- src/CoreShop/Bundle/ResourceBundle/composer.json | 2 +- src/CoreShop/Bundle/RuleBundle/composer.json | 2 +- src/CoreShop/Bundle/SEOBundle/composer.json | 2 +- src/CoreShop/Bundle/SequenceBundle/composer.json | 2 +- src/CoreShop/Bundle/ShippingBundle/composer.json | 2 +- src/CoreShop/Bundle/StoreBundle/composer.json | 2 +- src/CoreShop/Bundle/TaxationBundle/composer.json | 2 +- src/CoreShop/Bundle/TrackingBundle/composer.json | 2 +- src/CoreShop/Bundle/WorkflowBundle/composer.json | 2 +- src/CoreShop/Component/Address/composer.json | 2 +- src/CoreShop/Component/Configuration/composer.json | 2 +- src/CoreShop/Component/Core/composer.json | 2 +- src/CoreShop/Component/Currency/composer.json | 2 +- src/CoreShop/Component/Customer/composer.json | 2 +- src/CoreShop/Component/Index/composer.json | 2 +- src/CoreShop/Component/Inventory/composer.json | 2 +- src/CoreShop/Component/Locale/composer.json | 2 +- src/CoreShop/Component/Notification/composer.json | 2 +- src/CoreShop/Component/Order/composer.json | 2 +- src/CoreShop/Component/Payment/composer.json | 2 +- src/CoreShop/Component/Pimcore/composer.json | 2 +- src/CoreShop/Component/Product/composer.json | 2 +- src/CoreShop/Component/Registry/composer.json | 2 +- src/CoreShop/Component/Resource/composer.json | 2 +- src/CoreShop/Component/Rule/composer.json | 2 +- src/CoreShop/Component/SEO/composer.json | 2 +- src/CoreShop/Component/Sequence/composer.json | 2 +- src/CoreShop/Component/Shipping/composer.json | 2 +- src/CoreShop/Component/StorageList/composer.json | 2 +- src/CoreShop/Component/Store/composer.json | 2 +- src/CoreShop/Component/Taxation/composer.json | 2 +- src/CoreShop/Component/Tracking/composer.json | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/CoreShop/Bundle/AddressBundle/composer.json b/src/CoreShop/Bundle/AddressBundle/composer.json index a4b8a40147..b5b2221f8c 100755 --- 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 index 1ce8922282..7f13c5d914 100644 --- 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/composer.json b/src/CoreShop/Bundle/CoreBundle/composer.json index 4d34894c27..ec8c9bc80e 100644 --- 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 index 60ac1fba5e..a854785b39 100644 --- 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 index 0d186758aa..2a3badbf7a 100644 --- 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 index 2888029dd2..f007b5fa90 100644 --- 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 index afafec2df3..8849a8d8fe 100644 --- 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/composer.json b/src/CoreShop/Bundle/IndexBundle/composer.json index 265fcd978a..79f205d511 100644 --- 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 index 3df2ac09cf..3c25f6ebe7 100644 --- 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 index 7f0659c63e..63063d7cd1 100644 --- 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 index b492636f32..1e711693a6 100644 --- 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 index 169a3e9e22..d94050203c 100644 --- 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/composer.json b/src/CoreShop/Bundle/OrderBundle/composer.json index 56c1bcafa6..8758fdf4ce 100644 --- 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/composer.json b/src/CoreShop/Bundle/PaymentBundle/composer.json index 1d2e1beecd..0acadca6f8 100644 --- 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 index fc9330b37d..f64359e201 100644 --- 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/composer.json b/src/CoreShop/Bundle/PimcoreBundle/composer.json index 8322013a7c..2fd5faa3bb 100644 --- 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": { diff --git a/src/CoreShop/Bundle/ProductBundle/composer.json b/src/CoreShop/Bundle/ProductBundle/composer.json index 7819b4cf15..914dcb6ee8 100644 --- a/src/CoreShop/Bundle/ProductBundle/composer.json +++ b/src/CoreShop/Bundle/ProductBundle/composer.json @@ -33,7 +33,7 @@ "CoreShop\\Bundle\\ProductBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/ResourceBundle/composer.json b/src/CoreShop/Bundle/ResourceBundle/composer.json index 92c9aa3079..012dfdc61d 100644 --- a/src/CoreShop/Bundle/ResourceBundle/composer.json +++ b/src/CoreShop/Bundle/ResourceBundle/composer.json @@ -45,7 +45,7 @@ "CoreShop\\Bundle\\ResourceBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/RuleBundle/composer.json b/src/CoreShop/Bundle/RuleBundle/composer.json index c263283625..aedc075d9d 100644 --- a/src/CoreShop/Bundle/RuleBundle/composer.json +++ b/src/CoreShop/Bundle/RuleBundle/composer.json @@ -31,7 +31,7 @@ "CoreShop\\Bundle\\RuleBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/SEOBundle/composer.json b/src/CoreShop/Bundle/SEOBundle/composer.json index 6e681457f9..90c137b80f 100644 --- a/src/CoreShop/Bundle/SEOBundle/composer.json +++ b/src/CoreShop/Bundle/SEOBundle/composer.json @@ -29,7 +29,7 @@ "CoreShop\\Bundle\\SEOBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/SequenceBundle/composer.json b/src/CoreShop/Bundle/SequenceBundle/composer.json index 611e1f5b41..2f79a2986d 100644 --- a/src/CoreShop/Bundle/SequenceBundle/composer.json +++ b/src/CoreShop/Bundle/SequenceBundle/composer.json @@ -30,7 +30,7 @@ "CoreShop\\Bundle\\SequenceBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/ShippingBundle/composer.json b/src/CoreShop/Bundle/ShippingBundle/composer.json index 762950db14..9230b425bd 100644 --- a/src/CoreShop/Bundle/ShippingBundle/composer.json +++ b/src/CoreShop/Bundle/ShippingBundle/composer.json @@ -35,7 +35,7 @@ "CoreShop\\Bundle\\ShippingBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/StoreBundle/composer.json b/src/CoreShop/Bundle/StoreBundle/composer.json index a0e6f3d425..be37cc5197 100644 --- a/src/CoreShop/Bundle/StoreBundle/composer.json +++ b/src/CoreShop/Bundle/StoreBundle/composer.json @@ -32,7 +32,7 @@ "CoreShop\\Bundle\\StoreBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/TaxationBundle/composer.json b/src/CoreShop/Bundle/TaxationBundle/composer.json index 55c37af115..e6e64a1f9d 100644 --- a/src/CoreShop/Bundle/TaxationBundle/composer.json +++ b/src/CoreShop/Bundle/TaxationBundle/composer.json @@ -31,7 +31,7 @@ "CoreShop\\Bundle\\TaxationBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/TrackingBundle/composer.json b/src/CoreShop/Bundle/TrackingBundle/composer.json index 9dfd3be76f..f58bfd1a55 100644 --- a/src/CoreShop/Bundle/TrackingBundle/composer.json +++ b/src/CoreShop/Bundle/TrackingBundle/composer.json @@ -30,7 +30,7 @@ "CoreShop\\Bundle\\TrackingBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Bundle/WorkflowBundle/composer.json b/src/CoreShop/Bundle/WorkflowBundle/composer.json index cb5347a113..8d4be2ab6d 100644 --- a/src/CoreShop/Bundle/WorkflowBundle/composer.json +++ b/src/CoreShop/Bundle/WorkflowBundle/composer.json @@ -39,7 +39,7 @@ "CoreShop\\Bundle\\WorkflowBundle\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Address/composer.json b/src/CoreShop/Component/Address/composer.json index 95202ce6ae..eeaac40d20 100644 --- a/src/CoreShop/Component/Address/composer.json +++ b/src/CoreShop/Component/Address/composer.json @@ -29,7 +29,7 @@ "CoreShop\\Component\\Address\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Configuration/composer.json b/src/CoreShop/Component/Configuration/composer.json index add3ebc7f9..425176139a 100644 --- a/src/CoreShop/Component/Configuration/composer.json +++ b/src/CoreShop/Component/Configuration/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Configuration\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Core/composer.json b/src/CoreShop/Component/Core/composer.json index d06d7e6396..f0167b9aea 100644 --- a/src/CoreShop/Component/Core/composer.json +++ b/src/CoreShop/Component/Core/composer.json @@ -43,7 +43,7 @@ "CoreShop\\Component\\Core\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Currency/composer.json b/src/CoreShop/Component/Currency/composer.json index feb5efb980..1e941113a7 100644 --- a/src/CoreShop/Component/Currency/composer.json +++ b/src/CoreShop/Component/Currency/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Currency\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Customer/composer.json b/src/CoreShop/Component/Customer/composer.json index eee285d0b2..e5b6e86ffa 100644 --- a/src/CoreShop/Component/Customer/composer.json +++ b/src/CoreShop/Component/Customer/composer.json @@ -29,7 +29,7 @@ "CoreShop\\Component\\Customer\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Index/composer.json b/src/CoreShop/Component/Index/composer.json index 719e7b16d5..ebae70ff00 100644 --- a/src/CoreShop/Component/Index/composer.json +++ b/src/CoreShop/Component/Index/composer.json @@ -29,7 +29,7 @@ "CoreShop\\Component\\Index\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Inventory/composer.json b/src/CoreShop/Component/Inventory/composer.json index 0fb9654a78..5bc64d11c8 100644 --- a/src/CoreShop/Component/Inventory/composer.json +++ b/src/CoreShop/Component/Inventory/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Inventory\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Locale/composer.json b/src/CoreShop/Component/Locale/composer.json index da22900243..35cb94ed8c 100644 --- a/src/CoreShop/Component/Locale/composer.json +++ b/src/CoreShop/Component/Locale/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Index\\Locale\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Notification/composer.json b/src/CoreShop/Component/Notification/composer.json index 9e3a213aa4..7f9a69e793 100644 --- a/src/CoreShop/Component/Notification/composer.json +++ b/src/CoreShop/Component/Notification/composer.json @@ -30,7 +30,7 @@ "CoreShop\\Component\\Notification\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Order/composer.json b/src/CoreShop/Component/Order/composer.json index 121c4ba795..7e511a94a9 100644 --- a/src/CoreShop/Component/Order/composer.json +++ b/src/CoreShop/Component/Order/composer.json @@ -41,7 +41,7 @@ "CoreShop\\Component\\Order\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Payment/composer.json b/src/CoreShop/Component/Payment/composer.json index 3315a144ab..edfb559d7a 100644 --- a/src/CoreShop/Component/Payment/composer.json +++ b/src/CoreShop/Component/Payment/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Payment\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Pimcore/composer.json b/src/CoreShop/Component/Pimcore/composer.json index dd5093e645..b57a07400b 100644 --- a/src/CoreShop/Component/Pimcore/composer.json +++ b/src/CoreShop/Component/Pimcore/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Pimcore\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Product/composer.json b/src/CoreShop/Component/Product/composer.json index 85e38c8a24..8f2b4010cb 100644 --- a/src/CoreShop/Component/Product/composer.json +++ b/src/CoreShop/Component/Product/composer.json @@ -31,7 +31,7 @@ "CoreShop\\Component\\Product\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Registry/composer.json b/src/CoreShop/Component/Registry/composer.json index 00256f3b12..7e3bb270e8 100644 --- a/src/CoreShop/Component/Registry/composer.json +++ b/src/CoreShop/Component/Registry/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Registry\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Resource/composer.json b/src/CoreShop/Component/Resource/composer.json index 9c0673a849..1bd9580101 100644 --- a/src/CoreShop/Component/Resource/composer.json +++ b/src/CoreShop/Component/Resource/composer.json @@ -30,7 +30,7 @@ "CoreShop\\Component\\Resource\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Rule/composer.json b/src/CoreShop/Component/Rule/composer.json index cbd9e67a00..2fb05c1ab1 100644 --- a/src/CoreShop/Component/Rule/composer.json +++ b/src/CoreShop/Component/Rule/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Rule\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/SEO/composer.json b/src/CoreShop/Component/SEO/composer.json index 8fbc6abe63..832183d7a4 100644 --- a/src/CoreShop/Component/SEO/composer.json +++ b/src/CoreShop/Component/SEO/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\SEO\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Sequence/composer.json b/src/CoreShop/Component/Sequence/composer.json index 442f8ef2df..397be45206 100644 --- a/src/CoreShop/Component/Sequence/composer.json +++ b/src/CoreShop/Component/Sequence/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Sequence\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Shipping/composer.json b/src/CoreShop/Component/Shipping/composer.json index 2f4d6c3549..f3a92c8eb7 100644 --- a/src/CoreShop/Component/Shipping/composer.json +++ b/src/CoreShop/Component/Shipping/composer.json @@ -30,7 +30,7 @@ "CoreShop\\Component\\Shipping\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/StorageList/composer.json b/src/CoreShop/Component/StorageList/composer.json index 3fb340ed70..7ef65fa6b6 100644 --- a/src/CoreShop/Component/StorageList/composer.json +++ b/src/CoreShop/Component/StorageList/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\StorageList\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Store/composer.json b/src/CoreShop/Component/Store/composer.json index 8c127b2680..69a7b8a148 100644 --- a/src/CoreShop/Component/Store/composer.json +++ b/src/CoreShop/Component/Store/composer.json @@ -29,7 +29,7 @@ "CoreShop\\Component\\Store\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Taxation/composer.json b/src/CoreShop/Component/Taxation/composer.json index e77ae6675d..6899f2f6e5 100644 --- a/src/CoreShop/Component/Taxation/composer.json +++ b/src/CoreShop/Component/Taxation/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Taxation\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { diff --git a/src/CoreShop/Component/Tracking/composer.json b/src/CoreShop/Component/Tracking/composer.json index 6927b150fa..e03c1f7f09 100644 --- a/src/CoreShop/Component/Tracking/composer.json +++ b/src/CoreShop/Component/Tracking/composer.json @@ -28,7 +28,7 @@ "CoreShop\\Component\\Tracking\\": "" } }, - "minimum-stability": "dev", + "minimum-stability": "RC", "prefer-stable": true, "extra": { "branch-alias": { From 7543ca095e1b74df87c3b6049e90364a70813587 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Thu, 18 Oct 2018 14:10:27 +0800 Subject: [PATCH 3/3] [2.0.0-rc.1] remove deprecated function from ProductStorePrice Repository --- .../Doctrine/ORM/ProductStorePriceRepository.php | 16 ---------------- .../ProductStorePriceRepositoryInterface.php | 9 --------- 2 files changed, 25 deletions(-) diff --git a/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStorePriceRepository.php b/src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStorePriceRepository.php index 0ef027e10e..15ace13464 100644 --- 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/Component/Core/Repository/ProductStorePriceRepositoryInterface.php b/src/CoreShop/Component/Core/Repository/ProductStorePriceRepositoryInterface.php index c2cba457f4..e9ccf22d22 100644 --- a/src/CoreShop/Component/Core/Repository/ProductStorePriceRepositoryInterface.php +++ b/src/CoreShop/Component/Core/Repository/ProductStorePriceRepositoryInterface.php @@ -27,15 +27,6 @@ interface ProductStorePriceRepositoryInterface extends RepositoryInterface */ public function findForProduct(ProductInterface $product); - /** - * @param ProductInterface $product - * @param StoreInterface $store - * @return ProductStorePriceInterface[] - * - * @deprecated Won't get you the direct price anymore, use findForProductAndStoreAndKey - */ - public function findForProductAndStore(ProductInterface $product, StoreInterface $store); - /** * @param ProductInterface $product * @param string $property