From 4b38603b726886f23090ba431387643f7b681c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20J=C4=99drzejewski?= Date: Tue, 1 Apr 2014 11:03:23 +0200 Subject: [PATCH] Fix reported issues --- phpspec.yml | 76 +++++++++---------- .../SyliusAttributeExtension.php | 4 +- .../EventListener/LoadMetadataSubscriber.php | 3 +- .../EventListener/LoadMetadataSubscriber.php | 3 +- 4 files changed, 42 insertions(+), 44 deletions(-) diff --git a/phpspec.yml b/phpspec.yml index f910bb32c6..ed6f09acff 100644 --- a/phpspec.yml +++ b/phpspec.yml @@ -1,40 +1,40 @@ suites: - Addressing : { namespace: Sylius, spec_path: src/Sylius/Component/Addressing } - Attribute : { namespace: Sylius, spec_path: src/Sylius/Component/Attribute } - Cart : { namespace: Sylius, spec_path: src/Sylius/Component/Cart } - Core : { namespace: Sylius, spec_path: src/Sylius/Component/Core } - Installer : { namespace: Sylius, spec_path: src/Sylius/Component/Installer } - Inventory : { namespace: Sylius, spec_path: src/Sylius/Component/Inventory } - Money : { namespace: Sylius, spec_path: src/Sylius/Component/Money } - Omnipay : { namespace: Sylius, spec_path: src/Sylius/Component/Omnipay } - Order : { namespace: Sylius, spec_path: src/Sylius/Component/Order } - Payment : { namespace: Sylius, spec_path: src/Sylius/Component/Payment } - Payum : { namespace: Sylius, spec_path: src/Sylius/Component/Payum } - Product : { namespace: Sylius, spec_path: src/Sylius/Component/Product } - Promotion : { namespace: Sylius, spec_path: src/Sylius/Component/Promotion } - Resource : { namespace: Sylius, spec_path: src/Sylius/Component/Resource } - Settings : { namespace: Sylius, spec_path: src/Sylius/Component/Settings } - Shipping : { namespace: Sylius, spec_path: src/Sylius/Component/Shipping } - Taxation : { namespace: Sylius, spec_path: src/Sylius/Component/Taxation } - Taxonomies : { namespace: Sylius, spec_path: src/Sylius/Component/Taxonomies } - Variation : { namespace: Sylius, spec_path: src/Sylius/Component/Variation } + Addressing : { namespace: Sylius, spec_path: src/Sylius/Component/Addressing } + Attribute : { namespace: Sylius, spec_path: src/Sylius/Component/Attribute } + Cart : { namespace: Sylius, spec_path: src/Sylius/Component/Cart } + Core : { namespace: Sylius, spec_path: src/Sylius/Component/Core } + Installer : { namespace: Sylius, spec_path: src/Sylius/Component/Installer } + Inventory : { namespace: Sylius, spec_path: src/Sylius/Component/Inventory } + Money : { namespace: Sylius, spec_path: src/Sylius/Component/Money } + Omnipay : { namespace: Sylius, spec_path: src/Sylius/Component/Omnipay } + Order : { namespace: Sylius, spec_path: src/Sylius/Component/Order } + Payment : { namespace: Sylius, spec_path: src/Sylius/Component/Payment } + Payum : { namespace: Sylius, spec_path: src/Sylius/Component/Payum } + Product : { namespace: Sylius, spec_path: src/Sylius/Component/Product } + Promotion : { namespace: Sylius, spec_path: src/Sylius/Component/Promotion } + Resource : { namespace: Sylius, spec_path: src/Sylius/Component/Resource } + Settings : { namespace: Sylius, spec_path: src/Sylius/Component/Settings } + Shipping : { namespace: Sylius, spec_path: src/Sylius/Component/Shipping } + Taxation : { namespace: Sylius, spec_path: src/Sylius/Component/Taxation } + Taxonomy : { namespace: Sylius, spec_path: src/Sylius/Component/Taxonomy } + Variation : { namespace: Sylius, spec_path: src/Sylius/Component/Variation } - AddressingBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/AddressingBundle } - AttributeBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/AttributeBundle } - CartBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/CartBundle } - CoreBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/CoreBundle } - InstallerBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/InstallerBundle } - InventoryBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/InventoryBundle } - MoneyBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/MoneyBundle } - OmnipayBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/OmnipayBundle } - OrderBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/OrderBundle } - PaymentBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PaymentBundle } - PayumBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PayumBundle } - ProductBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/ProductBundle } - PromotionBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PromotionBundle } - ResourceBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/ResourceBundle } - SettingsBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/SettingsBundle } - ShippingBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/ShippingBundle } - TaxationBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/TaxationBundle } - TaxonomiesBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/TaxonomiesBundle } - VariationBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/VariationBundle } + AddressingBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/AddressingBundle } + AttributeBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/AttributeBundle } + CartBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/CartBundle } + CoreBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/CoreBundle } + InstallerBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/InstallerBundle } + InventoryBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/InventoryBundle } + MoneyBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/MoneyBundle } + OmnipayBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/OmnipayBundle } + OrderBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/OrderBundle } + PaymentBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PaymentBundle } + PayumBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PayumBundle } + ProductBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/ProductBundle } + PromotionBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/PromotionBundle } + ResourceBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/ResourceBundle } + SettingsBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/SettingsBundle } + ShippingBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/ShippingBundle } + TaxationBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/TaxationBundle } + TaxonomyBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/TaxonomyBundle } + VariationBundle : { namespace: Sylius, spec_path: src/Sylius/Bundle/VariationBundle } diff --git a/src/Sylius/Bundle/AttributeBundle/DependencyInjection/SyliusAttributeExtension.php b/src/Sylius/Bundle/AttributeBundle/DependencyInjection/SyliusAttributeExtension.php index dfda5c5e34..834abe4613 100644 --- a/src/Sylius/Bundle/AttributeBundle/DependencyInjection/SyliusAttributeExtension.php +++ b/src/Sylius/Bundle/AttributeBundle/DependencyInjection/SyliusAttributeExtension.php @@ -87,8 +87,8 @@ class SyliusAttributeExtension extends AbstractResourceExtension */ private function createSubjectServices(ContainerBuilder $container, $driver, $subject, array $config) { - $attributeAlias = $subject.'_'.'attribute'; - $attributeValueAlias = $subject.'_'.'attribute_value'; + $attributeAlias = $subject.'_attribute'; + $attributeValueAlias = $subject.'_attribute_value'; $attributeClasses = $config[$attributeAlias]; $attributeValueClasses = $config[$attributeValueAlias]; diff --git a/src/Sylius/Bundle/AttributeBundle/EventListener/LoadMetadataSubscriber.php b/src/Sylius/Bundle/AttributeBundle/EventListener/LoadMetadataSubscriber.php index d0d898b0e6..64b6562b7b 100644 --- a/src/Sylius/Bundle/AttributeBundle/EventListener/LoadMetadataSubscriber.php +++ b/src/Sylius/Bundle/AttributeBundle/EventListener/LoadMetadataSubscriber.php @@ -33,7 +33,7 @@ class LoadMetadataSubscriber implements EventSubscriber * * @param array $subjects */ - public function __construct($subjects) + public function __construct(array $subjects) { $this->subjects = $subjects; } @@ -54,7 +54,6 @@ class LoadMetadataSubscriber implements EventSubscriber public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) { $metadata = $eventArgs->getClassMetadata(); - $configuration = $eventArgs->getEntityManager()->getConfiguration(); foreach ($this->subjects as $class) { if ($class['attribute_value']['model'] !== $metadata->getName()) { diff --git a/src/Sylius/Bundle/VariationBundle/EventListener/LoadMetadataSubscriber.php b/src/Sylius/Bundle/VariationBundle/EventListener/LoadMetadataSubscriber.php index c421794f01..7179c4dac1 100644 --- a/src/Sylius/Bundle/VariationBundle/EventListener/LoadMetadataSubscriber.php +++ b/src/Sylius/Bundle/VariationBundle/EventListener/LoadMetadataSubscriber.php @@ -33,7 +33,7 @@ class LoadMetadataSubscriber implements EventSubscriber * * @param array $variables */ - public function __construct($variables) + public function __construct(array $variables) { $this->variables = $variables; } @@ -54,7 +54,6 @@ class LoadMetadataSubscriber implements EventSubscriber public function loadClassMetadata(LoadClassMetadataEventArgs $eventArgs) { $metadata = $eventArgs->getClassMetadata(); - $configuration = $eventArgs->getEntityManager()->getConfiguration(); foreach ($this->variables as $variable => $class) { if ($class['variant']['model'] !== $metadata->getName()) {