[Core] Remove leftovers from SettingsBundle usage

Inventis · Sep 7, 2016 · a0978cb · a0978cb
1 parent 1c930a3
commit a0978cb
Show file tree

Hide file tree

Showing 12 changed files with 2 additions and 247 deletions.
diff --git a/Application/Kernel.php b/Application/Kernel.php
@@ -39,7 +39,6 @@ public function registerBundles()
             new \Sylius\Bundle\MoneyBundle\SyliusMoneyBundle(),
             new \Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle(),
             new \Sylius\Bundle\LocaleBundle\SyliusLocaleBundle(),
-            new \Sylius\Bundle\SettingsBundle\SyliusSettingsBundle(),
             new \Sylius\Bundle\CartBundle\SyliusCartBundle(),
             new \Sylius\Bundle\ProductBundle\SyliusProductBundle(),
             new \Sylius\Bundle\ChannelBundle\SyliusChannelBundle(),

diff --git a/Authorization/ToggleableAuthorizationChecker.php b/Authorization/ToggleableAuthorizationChecker.php
diff --git a/DependencyInjection/SyliusCoreExtension.php b/DependencyInjection/SyliusCoreExtension.php
@@ -47,7 +47,6 @@ final class SyliusCoreExtension extends AbstractResourceExtension implements Pre
         'sylius_promotion',
         'sylius_review',
         'sylius_report',
-        'sylius_settings',
         'sylius_shipping',
         'sylius_mailer',
         'sylius_taxation',

diff --git a/Resources/config/app/config.yml b/Resources/config/app/config.yml
@@ -40,7 +40,6 @@ doctrine:
 
 doctrine_cache:
     providers:
-        sylius_settings: "%sylius.cache%"
         sylius_rbac: "%sylius.cache%"
 
 doctrine_phpcr:

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -23,10 +23,6 @@
     </imports>
 
     <parameters>
-        <parameter key="sylius.settings_schema.general.class">Sylius\Bundle\CoreBundle\Settings\GeneralSettingsSchema</parameter>
-        <parameter key="sylius.settings_schema.taxation.class">Sylius\Bundle\CoreBundle\Settings\TaxationSettingsSchema</parameter>
-        <parameter key="sylius.settings_schema.security.class">Sylius\Bundle\CoreBundle\Settings\SecuritySettingsSchema</parameter>
-
         <parameter key="sylius.checkout_scenario.class">Sylius\Bundle\CoreBundle\Checkout\CheckoutProcessScenario</parameter>
         <parameter key="sylius.checkout_step.security.class">Sylius\Bundle\CoreBundle\Checkout\Step\SecurityStep</parameter>
         <parameter key="sylius.checkout_step.addressing.class">Sylius\Bundle\CoreBundle\Checkout\Step\AddressingStep</parameter>
@@ -128,17 +124,6 @@
     </parameters>
 
     <services>
-        <!-- settings schemas -->
-        <service id="sylius.settings_schema.general" class="%sylius.settings_schema.general.class%">
-            <argument type="collection">
-                <argument key="locale">%locale%</argument>
-            </argument>
-            <tag name="sylius.settings_schema" alias="sylius_general" />
-        </service>
-        <service id="sylius.settings_schema.security" class="%sylius.settings_schema.security.class%">
-            <tag name="sylius.settings_schema" alias="sylius_security" />
-        </service>
-
         <!-- cart -->
         <service id="sylius.cart_item_resolver.default" class="%sylius.cart_item_resolver.default.class%">
             <argument type="service" id="sylius.context.cart" />

diff --git a/Resources/translations/messages.en.yml b/Resources/translations/messages.en.yml
@@ -67,19 +67,6 @@ sylius:
             code: Code
         product_variant:
             tax_category: Tax category
-        settings:
-            general:
-                currency: Default currency
-                locale: Language
-                meta_description: Meta description
-                meta_keywords: Meta keywords
-                title: Page title
-                tracking_code: Tracking code (for example: Google Analytics code)
-            taxation:
-                default_tax_zone: Default tax zone
-                default_tax_calculation_strategy: Default tax calculation strategy
-            security:
-                enabled: Enable?
         shipment_filter:
             created_at_from: From
             created_at_to: To

diff --git a/Settings/GeneralSettingsSchema.php b/Settings/GeneralSettingsSchema.php
diff --git a/Settings/SecuritySettingsSchema.php b/Settings/SecuritySettingsSchema.php
diff --git a/Taxation/Strategy/TaxCalculationStrategy.php b/Taxation/Strategy/TaxCalculationStrategy.php
@@ -11,10 +11,8 @@
 
 namespace Sylius\Bundle\CoreBundle\Taxation\Strategy;
 
-use Sylius\Bundle\SettingsBundle\Model\SettingsInterface;
 use Sylius\Component\Addressing\Model\ZoneInterface;
 use Sylius\Component\Core\Model\OrderInterface;
-use Sylius\Component\Core\Taxation\Applicator\OrderTaxesApplicatorInterface;
 use Sylius\Component\Core\Taxation\Strategy\AbstractTaxCalculationStrategy;
 
 /**

diff --git a/composer.json b/composer.json
@@ -47,7 +47,6 @@
         "sylius/product-bundle": "^1.0",
         "sylius/promotion-bundle": "^1.0",
         "sylius/resource-bundle": "^1.0",
-        "sylius/settings-bundle": "^1.0",
         "sylius/shipping-bundle": "^1.0",
         "sylius/taxation-bundle": "^1.0",
         "sylius/taxonomy-bundle": "^1.0",

diff --git a/spec/Provider/ChannelBasedDefaultTaxZoneProviderSpec.php b/spec/Provider/ChannelBasedDefaultTaxZoneProviderSpec.php
@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\CoreBundle\Provider;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Bundle\SettingsBundle\Model\SettingsInterface;
 use Sylius\Component\Addressing\Model\ZoneInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\OrderInterface;

diff --git a/spec/Taxation/Strategy/TaxCalculationStrategySpec.php b/spec/Taxation/Strategy/TaxCalculationStrategySpec.php
@@ -12,9 +12,7 @@
 namespace spec\Sylius\Bundle\CoreBundle\Taxation\Strategy;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Sylius\Bundle\CoreBundle\Taxation\Strategy\TaxCalculationStrategy;
-use Sylius\Bundle\SettingsBundle\Model\SettingsInterface;
 use Sylius\Component\Addressing\Model\ZoneInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\OrderInterface;
@@ -59,10 +57,9 @@ function it_has_a_type()
     function it_throws_an_exception_if_any_of_the_applicators_are_not_of_the_correct_type(
         OrderTaxesApplicatorInterface $applicatorOne,
         OrderTaxesApplicatorInterface $applicatorTwo,
-        \stdClass $applicatorThree,
-        SettingsInterface $settings
+        \stdClass $applicatorThree
     ) {
-        $this->beConstructedWith('order_items_based', [$applicatorOne, $applicatorTwo, $applicatorThree], $settings);
+        $this->beConstructedWith('order_items_based', [$applicatorOne, $applicatorTwo, $applicatorThree]);
 
         $this->shouldThrow(\InvalidArgumentException::class)->duringInstantiation();
     }