CS fixer

Author: umpirsky

.php_cs

@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\CS\FixerInterface;
+
+$finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->notName('*.yml')
+    ->notName('*.xml')
+    ->notName('*Spec.php')
+    ->exclude('app')
+;
+
+return Symfony\CS\Config\Config::create()->finder($finder);

.phpspec_cs

@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * This file is part of the Sylius package.
+ *
+ * (c) Paweł Jędrzejewski
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+$finder = Symfony\Component\Finder\Finder::create()
+    ->files()
+    ->name('*Spec.php')
+    ->in(__DIR__.'/src')
+;
+
+return Symfony\CS\Config\Config::create()->finder($finder);

bin/sylius-cs-fixer

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+php-cs-fixer fix .
+php-cs-fixer fix . --config-file .phpspec_cs --fixers=-visibility

src/Sylius/Bundle/AddressingBundle/spec/Sylius/Bundle/AddressingBundle/Form/Type/CountryEntityChoiceTypeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\AddressingBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**

src/Sylius/Bundle/AddressingBundle/spec/Sylius/Bundle/AddressingBundle/Form/Type/ProvinceChoiceTypeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\AddressingBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository;
 
 /**

src/Sylius/Bundle/AddressingBundle/spec/Sylius/Bundle/AddressingBundle/Form/Type/ZoneEntityChoiceTypeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\AddressingBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**

src/Sylius/Bundle/AddressingBundle/spec/Sylius/Bundle/AddressingBundle/Form/Type/ZoneMemberCollectionTypeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\AddressingBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**

src/Sylius/Bundle/CartBundle/spec/Sylius/Bundle/CartBundle/Storage/SessionCartStorageSpec.php

@@ -45,10 +45,10 @@ function it_returns_cart_identifier_via_session($session)
 
     function it_sets_cart_identifier_via_session($session, CartInterface $cart)
     {
-        $cart->getIdentifier()->will(function() {
+        $cart->getIdentifier()->will(function () {
             return 3;
         });
-        $session->set(SessionCartStorage::KEY, 3)->will(function() use ($session) {
+        $session->set(SessionCartStorage::KEY, 3)->will(function () use ($session) {
             $session->get(SessionCartStorage::KEY)->willReturn(3);
         });
 

src/Sylius/Bundle/CoreBundle/Cart/ItemResolver.php

@@ -16,8 +16,6 @@
 use Sylius\Component\Cart\Provider\CartProviderInterface;
 use Sylius\Component\Cart\Resolver\ItemResolverInterface;
 use Sylius\Component\Cart\Resolver\ItemResolvingException;
-use Sylius\Component\Core\Model\OrderItemInterface;
-use Sylius\Component\Core\Model\ProductInterface;
 use Sylius\Component\Inventory\Checker\AvailabilityCheckerInterface;
 use Sylius\Component\Pricing\Calculator\DelegatingCalculatorInterface;
 use Sylius\Component\Resource\Repository\RepositoryInterface;

src/Sylius/Bundle/CoreBundle/DataCollector/SyliusDataCollector.php

@@ -41,4 +41,4 @@ public function getName()
     {
         return 'sylius';
     }
-} 
+}

src/Sylius/Bundle/CoreBundle/EventListener/ConfirmOrderListener.php

@@ -24,6 +24,7 @@ class ConfirmOrderListener
      * Set an Order as completed
      *
      * @param GenericEvent $event
+     *
      * @throws UnexpectedTypeException
      */
     public function confirmOrder(GenericEvent $event)

src/Sylius/Bundle/CoreBundle/Form/Type/Pricing/GroupBasedConfigurationType.php

@@ -68,4 +68,3 @@ public function getName()
         return 'sylius_price_calculator_group_based';
     }
 }
-

src/Sylius/Bundle/CoreBundle/spec/Sylius/Bundle/CoreBundle/EventListener/PurchaseListenerSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\CoreBundle\EventListener;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Sylius\Bundle\CoreBundle\Event\PurchaseCompleteEvent;
 use Sylius\Component\Cart\Provider\CartProviderInterface;
 use Sylius\Component\Payment\Model\PaymentInterface;

src/Sylius/Bundle/CoreBundle/spec/Sylius/Bundle/CoreBundle/Mailer/TwigSwiftMailerSpec.php

@@ -52,4 +52,4 @@ function it_prepares_email_properly($mailer, $twigEnvironment, \Twig_Template $t
 
         $this->sendEmail($templateName, $context, $from, $to);
     }
-}
+}

src/Sylius/Bundle/CoreBundle/spec/Sylius/Bundle/CoreBundle/OAuth/UserProviderSpec.php

@@ -13,7 +13,6 @@
 
 use FOS\UserBundle\Model\UserManagerInterface;
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 class UserProviderSpec extends ObjectBehavior
 {

src/Sylius/Bundle/InventoryBundle/spec/Sylius/Bundle/InventoryBundle/Validator/Constraints/InStockValidatorSpec.php

@@ -71,4 +71,4 @@ function it_should_not_add_violation_if_stock_is_sufficient(
 
         $this->validate($inventoryUnit, $constraint);
     }
-} 
+}

src/Sylius/Bundle/MoneyBundle/spec/Sylius/Bundle/MoneyBundle/Form/Type/MoneyTypeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\MoneyBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**

src/Sylius/Bundle/MoneyBundle/spec/Sylius/Bundle/MoneyBundle/Templating/Helper/MoneyHelperSpec.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\MoneyBundle\Twig;
+namespace spec\Sylius\Bundle\MoneyBundle\Templating\Helper;
 
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Money\Context\CurrencyContextInterface;

src/Sylius/Bundle/PayumBundle/spec/Sylius/Bundle/PayumBundle/Payum/Paypal/Action/NotifyOrderActionSpec.php

@@ -89,7 +89,7 @@ function it_must_not_dispatch_pre_and_post_payment_state_changed_if_state_not_ch
         $order->getPayment()->willReturn($paymentModel);
 
         $paymentModel->getState()->willReturn(Payment::STATE_COMPLETED);
-        $paymentModel->setState(Argument::type('string'))->will(function($args) use ($paymentModel) {
+        $paymentModel->setState(Argument::type('string'))->will(function ($args) use ($paymentModel) {
             $paymentModel->getState()->willReturn($args[0]);
         });
 
@@ -132,7 +132,7 @@ function it_must_dispatch_pre_and_post_payment_state_changed_if_state_changed(
         $order->getPayment()->willReturn($paymentModel);
 
         $paymentModel->getState()->willReturn(Payment::STATE_COMPLETED);
-        $paymentModel->setState(Argument::type('string'))->will(function($args) use ($paymentModel) {
+        $paymentModel->setState(Argument::type('string'))->will(function ($args) use ($paymentModel) {
             $paymentModel->getState()->willReturn($args[0]);
         });
 

src/Sylius/Bundle/PricingBundle/DependencyInjection/Configuration.php

@@ -11,7 +11,6 @@
 
 namespace Sylius\Bundle\PricingBundle\DependencyInjection;
 
-use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
 

src/Sylius/Bundle/PricingBundle/Form/EventListener/BuildPriceableFormListener.php

@@ -71,7 +71,6 @@ public function preBind(FormEvent $event)
     {
         $data = $event->getData();
 
-
         if (empty($data) || !array_key_exists('pricingCalculator', $data)) {
             return;
         }

src/Sylius/Bundle/PricingBundle/Form/Extension/PriceableTypeExtension.php

@@ -17,7 +17,6 @@
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Form\FormView;
-use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**
  * Priceable form extension.

src/Sylius/Bundle/PricingBundle/Form/Type/CalculatorChoiceType.php

@@ -66,4 +66,3 @@ public function getName()
         return 'sylius_price_calculator_choice';
     }
 }
-

src/Sylius/Bundle/PricingBundle/Form/Type/VolumeBasedConfigurationType.php

@@ -50,4 +50,3 @@ public function getName()
         return 'sylius_price_calculator_volume_based';
     }
 }
-

src/Sylius/Bundle/PricingBundle/Twig/PricingExtension.php

@@ -12,7 +12,6 @@
 namespace Sylius\Bundle\PricingBundle\Twig;
 
 use Sylius\Bundle\PricingBundle\Templating\Helper\PricingHelper;
-use Sylius\Component\Pricing\Calculator\DelegatingCalculatorInterface;
 use Sylius\Component\Pricing\Model\PriceableInterface;
 
 /**

src/Sylius/Bundle/ProductBundle/spec/Sylius/Bundle/ProductBundle/Form/Type/ProductTypeSpec.php

@@ -80,7 +80,6 @@ function it_builds_form_with_proper_fields(FormBuilder $builder)
             ->willReturn($builder)
         ;
 
-
         $this->buildForm($builder, array());
     }
 

src/Sylius/Bundle/PromotionBundle/Form/EventListener/BuildActionFormListener.php

@@ -12,7 +12,6 @@
 namespace Sylius\Bundle\PromotionBundle\Form\EventListener;
 
 use Sylius\Component\Registry\ServiceRegistryInterface;
-use Sylius\Component\Promotion\Action\Registry\PromotionActionRegistryInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;

src/Sylius/Bundle/PromotionBundle/Form/Type/RuleType.php

@@ -13,7 +13,6 @@
 
 use Sylius\Bundle\PromotionBundle\Form\EventListener\BuildRuleFormListener;
 use Sylius\Component\Registry\ServiceRegistryInterface;
-use Sylius\Component\Promotion\Checker\Registry\RuleCheckerRegistryInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;

src/Sylius/Bundle/ResourceBundle/spec/Sylius/Bundle/ResourceBundle/Doctrine/ORM/EntityRepositorySpec.php

@@ -88,7 +88,6 @@ function it_applies_criteria_when_finding_one($queryBuilder, Expr $expr)
             'bar' => 'baz',
         );
 
-
         foreach ($criteria as $property => $value) {
             $queryBuilder
                 ->expr()

src/Sylius/Bundle/ResourceBundle/spec/Sylius/Bundle/ResourceBundle/Form/DataTransformer/ObjectSelectionToIdentifierCollectionTransformerSpec.php

@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Collections\Collection;
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 // Since the root namespace "spec" is not in our autoload
 require_once __DIR__.DIRECTORY_SEPARATOR.'FakeEntity.php';

src/Sylius/Bundle/ResourceBundle/spec/Sylius/Bundle/ResourceBundle/Twig/ResourceExtensionSpec.php

@@ -13,7 +13,6 @@
 
 use Pagerfanta\Pagerfanta;
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Bundle\TwigBundle\TwigEngine;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;

src/Sylius/Bundle/SettingsBundle/spec/Sylius/Bundle/SettingsBundle/Templating/Helper/SettingsHelperSpec.php

@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace spec\Sylius\Bundle\SettingsBundle\Twig;
+namespace spec\Sylius\Bundle\SettingsBundle\Templating\Helper;
 
 use PhpSpec\ObjectBehavior;
 use Sylius\Bundle\SettingsBundle\Manager\SettingsManagerInterface;

src/Sylius/Bundle/TaxationBundle/spec/Sylius/Bundle/TaxationBundle/Form/Type/CalculatorChoiceTypeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\TaxationBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**

src/Sylius/Bundle/TaxationBundle/spec/Sylius/Bundle/TaxationBundle/Form/Type/TaxCategoryEntityTypeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\TaxationBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**

src/Sylius/Bundle/TaxonomyBundle/spec/Sylius/Bundle/TaxonomyBundle/Form/DataTransformer/TaxonSelectionToCollectionTransformerSpec.php

@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Collections\Collection;
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 // Since the root namespace "spec" is not in our autoload.
 require_once __DIR__.DIRECTORY_SEPARATOR.'FakeEntity.php';

src/Sylius/Bundle/VariationBundle/spec/Sylius/Bundle/VariationBundle/Form/DataTransformer/VariantToCombinationTransformerSpec.php

@@ -93,4 +93,4 @@ function it_should_not_reverse_transform_variable_with_variants_if_options_not_m
 
         $this->reverseTransform(array($optionValue))->shouldReturn(null);
     }
-} 
+}

src/Sylius/Bundle/VariationBundle/spec/Sylius/Bundle/VariationBundle/Form/Type/VariantTypeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Bundle\VariationBundle\Form\Type;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 
 /**

src/Sylius/Bundle/WebBundle/Resources/views/Backend/Misc/delete.html.twig

@@ -15,4 +15,4 @@
         <a href="{{ app.request.headers.get('referer') }}" class="btn btn-info"><i class="glyphicon glyphicon-remove"></i> {{ 'sylius.cancel'|trans }}</a>
     </div>
 </form>
-{% endblock %}
+{% endblock %}

src/Sylius/Bundle/WebBundle/Resources/views/Frontend/Account/Address/delete.html.twig

@@ -16,4 +16,4 @@
         </div>
     </form>
 </div>
-{% endblock %}
+{% endblock %}

src/Sylius/Bundle/WebBundle/Resources/views/Frontend/Address/_form.html.twig

@@ -1 +1 @@
-{% extends 'SyliusWebBundle:Common/Address:_form.html.twig' %}
+{% extends 'SyliusWebBundle:Common/Address:_form.html.twig' %}

src/Sylius/Component/Cart/spec/Sylius/Component/Cart/Resolver/ItemResolvingExceptionSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Component\Cart\Resolver;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 
 /**
  * @author Julien Janvier <[email protected]>

src/Sylius/Component/Core/spec/Sylius/Component/Core/OrderProcessing/InventoryHandlerSpec.php

@@ -13,7 +13,6 @@
 
 use Doctrine\Common\Collections\ArrayCollection;
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Sylius\Component\Core\Model\InventoryUnitInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\OrderItemInterface;

src/Sylius/Component/Core/spec/Sylius/Component/Core/OrderProcessing/StateResolverSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Component\Core\OrderProcessing;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Core\Model\OrderShippingStates;
 use Sylius\Component\Core\Model\ShipmentInterface;

src/Sylius/Component/Core/spec/Sylius/Component/Core/Pricing/GroupBasedCalculatorSpec.php

@@ -13,7 +13,6 @@
 
 use PhpSpec\ObjectBehavior;
 use Sylius\Component\Core\Model\GroupInterface;
-use Sylius\Component\Core\Pricing\Calculators;
 use Sylius\Component\Pricing\Model\PriceableInterface;;
 
 /**

src/Sylius/Component/Inventory/spec/Sylius/Component/Inventory/Operator/InsufficientStockExceptionSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Component\Inventory\Operator;
 
 use PhpSpec\ObjectBehavior;
-use Prophecy\Argument;
 use Sylius\Component\Inventory\Model\StockableInterface;
 
 /**

src/Sylius/Component/Pricing/Calculator/VolumeBasedCalculator.php

@@ -28,7 +28,7 @@ public function calculate(PriceableInterface $subject, array $configuration, arr
         $quantity = array_key_exists('quantity', $context) ? $context['quantity'] : 1;
 
         foreach ($configuration as $range) {
-            if (empty($range['max']) && $quantity > $range['min'])  {
+            if (empty($range['max']) && $quantity > $range['min']) {
                 return $range['price'];
             }
 

src/Sylius/Component/Product/spec/Sylius/Component/Product/Model/AttributeSpec.php

@@ -12,7 +12,6 @@
 namespace spec\Sylius\Component\Product\Model;
 
 use PhpSpec\ObjectBehavior;
-use Sylius\Component\Product\Model\AttributeTypes;
 
 /**
  * @author Paweł Jędrzejewski <[email protected]>