Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introduce Factory for all resources #3613

Merged
merged 14 commits into from
Nov 24, 2015
Merged

Introduce Factory for all resources #3613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
952b501
Add simple resource Factory
pjedrzejewski Nov 15, 2015
be5b3dc
Update all specs using createNew on repository
pjedrzejewski Nov 16, 2015
32f10aa
Update all configurations to include factories
pjedrzejewski Nov 16, 2015
62233f3
Update fixtures and several services to use factory
pjedrzejewski Nov 16, 2015
515a546
Update bundle configurations
pjedrzejewski Nov 18, 2015
89b2a0c
Fix the invalid InventoryUnit factory service definition
pjedrzejewski Nov 23, 2015
f812817
Update Behat contexts
pjedrzejewski Nov 23, 2015
19d7fce
Fix usage in non-spec classes and in controller
pjedrzejewski Nov 23, 2015
d7b1694
Fix document repositories, remove createNew method
pjedrzejewski Nov 23, 2015
38d513c
Update changelogs of Resource component and bundle
pjedrzejewski Nov 23, 2015
3743745
Fix AddressingContext and some service defs
pjedrzejewski Nov 24, 2015
fbbbce8
Fix invalid spec for MongoDB Document Repo
pjedrzejewski Nov 24, 2015
7f3ee94
Fix PHPCR fixtures
pjedrzejewski Nov 24, 2015
e2343a5
Use decoration for translatable factory and fixes after review
pjedrzejewski Nov 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/AddressingBundle/Behat/AddressingContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public function thereIsCountry($name, $enabled = true, $provinces = null, $flush

/* @var $country CountryInterface */
if (null === $country = $this->getRepository('country')->findOneBy(array('isoName' => $isoName))) {
$country = $this->getRepository('country')->createNew();
$country = $this->getFactory('country')->createNew();
$country->setIsoName(trim($isoName));
$country->setEnabled($enabled);

Expand Down Expand Up @@ -104,13 +104,13 @@ public function thereIsZone($name, $type = ZoneInterface::TYPE_COUNTRY, array $m
$repository = $this->getRepository('zone');

/* @var $zone ZoneInterface */
$zone = $repository->createNew();
$zone = $this->getFactory('zone')->createNew();
$zone->setName($name);
$zone->setType($type);
$zone->setScope($scope);

foreach ($members as $memberName) {
$member = $this->getService('sylius.repository.zone_member_'.$type)->createNew();
$member = $this->getService('sylius.factory.zone_member_'.$type)->createNew();
if (ZoneInterface::TYPE_ZONE === $type) {
$zoneable = $repository->findOneBy(array('name' => $memberName));
} else {
Expand All @@ -137,7 +137,7 @@ public function thereIsZone($name, $type = ZoneInterface::TYPE_COUNTRY, array $m
public function thereIsProvince($name)
{
/* @var $province ProvinceInterface */
$province = $this->getRepository('province')->createNew();
$province = $this->getFactory('province')->createNew();
$province->setName($name);

$this->getEntityManager()->persist($province);
Expand Down
9 changes: 9 additions & 0 deletions src/Sylius/Bundle/AddressingBundle/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
use Sylius\Component\Resource\Factory\Factory;

/**
* This class contains the configuration information for the bundle.
Expand Down Expand Up @@ -118,6 +119,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Addressing\Model\Address')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -133,6 +135,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Addressing\Model\Country')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->defaultValue('Sylius\Bundle\ResourceBundle\Doctrine\ORM\EntityRepository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -148,6 +151,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Addressing\Model\Province')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\AddressingBundle\Controller\ProvinceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -163,6 +167,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Addressing\Model\Zone')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -178,6 +183,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Addressing\Model\ZoneMember')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -193,6 +199,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Addressing\Model\ZoneMemberCountry')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -208,6 +215,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Addressing\Model\ZoneMemberProvince')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -223,6 +231,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Addressing\Model\ZoneMemberZone')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/ApiBundle/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
namespace Sylius\Bundle\ApiBundle\DependencyInjection;

use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
use Sylius\Component\Resource\Factory\Factory;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
Expand Down Expand Up @@ -110,6 +111,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Bundle\ApiBundle\Model\Client')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -124,6 +126,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Bundle\ApiBundle\Model\AccessToken')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->end()
->end()
->arrayNode('api_refresh_token')
Expand All @@ -132,6 +135,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Bundle\ApiBundle\Model\RefreshToken')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->end()
->end()
->arrayNode('api_auth_code')
Expand All @@ -140,6 +144,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Bundle\ApiBundle\Model\AuthCode')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->end()
->end()
->end()
Expand Down
4 changes: 4 additions & 0 deletions src/Sylius/Bundle/ArchetypeBundle/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
namespace Sylius\Bundle\ArchetypeBundle\DependencyInjection;

use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
use Sylius\Component\Resource\Factory\Factory;
use Sylius\Component\Translation\Factory\TranslatableFactory;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
Expand Down Expand Up @@ -93,6 +95,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Archetype\Model\Archetype')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->defaultValue('Sylius\Bundle\TranslationBundle\Doctrine\ORM\TranslatableResourceRepository')->end()
->scalarNode('factory')->defaultValue(TranslatableFactory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -106,6 +109,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Archetype\Model\ArchetypeTranslation')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/ArchetypeBundle/DependencyInjection/SyliusArchetypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ private function createSubjectServices(ContainerBuilder $container, $subject)
{
$builderDefintion = new Definition('Sylius\Component\Archetype\Builder\ArchetypeBuilder');
$builderDefintion
->setArguments(array(new Reference(sprintf('sylius.repository.%s_attribute_value', $subject))))
->setArguments(array(new Reference(sprintf('sylius.factory.%s_attribute_value', $subject))))
;

$container->setDefinition('sylius.builder.'.$subject.'_archetype', $builderDefintion);
Expand Down
5 changes: 5 additions & 0 deletions src/Sylius/Bundle/AttributeBundle/DependencyInjection/Configuration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
namespace Sylius\Bundle\AttributeBundle\DependencyInjection;

use Sylius\Bundle\ResourceBundle\SyliusResourceBundle;
use Sylius\Component\Resource\Factory\Factory;
use Sylius\Component\Translation\Factory\TranslatableFactory;
use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
use Symfony\Component\Config\Definition\ConfigurationInterface;
Expand Down Expand Up @@ -99,6 +101,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Attribute\Model\Attribute')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->defaultValue('Sylius\Bundle\TranslationBundle\Doctrine\ORM\TranslatableResourceRepository')->end()
->scalarNode('factory')->defaultValue(TranslatableFactory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -112,6 +115,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->defaultValue('Sylius\Component\Archetype\Model\AttributeTranslation')->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand All @@ -138,6 +142,7 @@ private function addClassesSection(ArrayNodeDefinition $node)
->scalarNode('model')->isRequired()->end()
->scalarNode('controller')->defaultValue('Sylius\Bundle\ResourceBundle\Controller\ResourceController')->end()
->scalarNode('repository')->cannotBeEmpty()->end()
->scalarNode('factory')->defaultValue(Factory::class)->end()
->arrayNode('form')
->addDefaultsIfNotSet()
->children()
Expand Down
12 changes: 10 additions & 2 deletions src/Sylius/Bundle/CartBundle/Provider/CartProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use Sylius\Component\Cart\Model\CartInterface;
use Sylius\Component\Cart\Provider\CartProviderInterface;
use Sylius\Component\Cart\SyliusCartEvents;
use Sylius\Component\Resource\Factory\FactoryInterface;
use Sylius\Component\Resource\Repository\RepositoryInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;

Expand All @@ -41,6 +42,11 @@ class CartProvider implements CartProviderInterface
*/
protected $manager;

/**
* @var FactoryInterface
*/
protected $cartFactory;

/**
* Cart repository.
*
Expand All @@ -67,13 +73,15 @@ class CartProvider implements CartProviderInterface
*
* @param CartContextInterface $context
* @param ObjectManager $manager
* @param FactoryInterface $cartFactory
* @param RepositoryInterface $repository
* @param EventDispatcherInterface $eventDispatcher
*/
public function __construct(CartContextInterface $context, ObjectManager $manager, RepositoryInterface $repository, EventDispatcherInterface $eventDispatcher)
public function __construct(CartContextInterface $context, ObjectManager $manager, FactoryInterface $cartFactory, RepositoryInterface $repository, EventDispatcherInterface $eventDispatcher)
{
$this->context = $context;
$this->manager = $manager;
$this->cartFactory = $cartFactory;
$this->repository = $repository;
$this->eventDispatcher = $eventDispatcher;
}
Expand All @@ -99,7 +107,7 @@ public function getCart()
return $this->cart;
}

$this->cart = $this->repository->createNew();
$this->cart = $this->cartFactory->createNew();
$this->eventDispatcher->dispatch(SyliusCartEvents::CART_INITIALIZE, new CartEvent($this->cart));

return $this->cart;
Expand Down
4 changes: 4 additions & 0 deletions src/Sylius/Bundle/CartBundle/Resources/config/services.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
<service id="sylius.repository.cart" alias="sylius.repository.order" />
<service id="sylius.repository.cart_item" alias="sylius.repository.order_item" />

<service id="sylius.factory.cart" alias="sylius.factory.order" />
<service id="sylius.factory.cart_item" alias="sylius.factory.order_item" />

<service id="sylius.form.type.cart" class="%sylius.form.type.cart.class%">
<argument>%sylius.model.cart.class%</argument>
<argument>%sylius.validation_group.cart%</argument>
Expand All @@ -83,6 +86,7 @@
<service id="sylius.cart_provider.default" class="%sylius.cart_provider.default.class%">
<argument type="service" id="sylius.context.cart" />
<argument type="service" id="sylius.manager.cart" />
<argument type="service" id="sylius.factory.cart" />
<argument type="service" id="sylius.repository.cart" />
<argument type="service" id="event_dispatcher" />
</service>
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/CartBundle/Resources/config/templating.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<services>
<service id="sylius.templating.helper.cart" class="%sylius.templating.helper.cart.class%">
<argument type="service" id="sylius.cart_provider" />
<argument type="service" id="sylius.repository.cart_item" />
<argument type="service" id="sylius.factory.cart_item" />
<argument type="service" id="form.factory" />
<tag name="templating.helper" alias="sylius_cart" />
</service>
Expand Down
Loading