Fix various missing deps and not needed coupling to Symfony

This commit is contained in:
Paweł Jędrzejewski 2016-02-29 14:48:06 +01:00
parent 910172770c
commit d3d6351628
40 changed files with 95 additions and 65 deletions

View file

@ -1,4 +1,5 @@
suites:
Association: { namespace: Sylius\Component\Association, psr4_prefix: Sylius\Component\Association, spec_path: src/Sylius/Component/Association, src_path: src/Sylius/Component/Association }
Addressing: { namespace: Sylius\Component\Addressing, psr4_prefix: Sylius\Component\Addressing, spec_path: src/Sylius/Component/Addressing, src_path: src/Sylius/Component/Addressing }
Archetype: { namespace: Sylius\Component\Archetype, psr4_prefix: Sylius\Component\Archetype, spec_path: src/Sylius/Component/Archetype, src_path: src/Sylius/Component/Archetype }
Attribute: { namespace: Sylius\Component\Attribute, psr4_prefix: Sylius\Component\Attribute, spec_path: src/Sylius/Component/Attribute, src_path: src/Sylius/Component/Attribute }
@ -31,6 +32,7 @@ suites:
User: { namespace: Sylius\Component\User, psr4_prefix: Sylius\Component\User, spec_path: src/Sylius/Component/User, src_path: src/Sylius/Component/User }
Variation: { namespace: Sylius\Component\Variation, psr4_prefix: Sylius\Component\Variation, spec_path: src/Sylius/Component/Variation, src_path: src/Sylius/Component/Variation }
AssociationBundle: { namespace: Sylius\Bundle\AssociationBundle, psr4_prefix: Sylius\Bundle\AssociationBundle, spec_path: src/Sylius/Bundle/AssociationBundle, src_path: src/Sylius/Bundle/AssociationBundle }
AddressingBundle: { namespace: Sylius\Bundle\AddressingBundle, psr4_prefix: Sylius\Bundle\AddressingBundle, spec_path: src/Sylius/Bundle/AddressingBundle, src_path: src/Sylius/Bundle/AddressingBundle }
AdminBundle: { namespace: Sylius\Bundle\AdminBundle, psr4_prefix: Sylius\Bundle\AdminBundle, spec_path: src/Sylius/Bundle/AdminBundle, src_path: src/Sylius/Bundle/AdminBundle }
ApiBundle: { namespace: Sylius\Bundle\ApiBundle, psr4_prefix: Sylius\Bundle\ApiBundle, spec_path: src/Sylius/Bundle/ApiBundle, src_path: src/Sylius/Bundle/ApiBundle }

View file

@ -13,7 +13,7 @@ namespace Sylius\Behat\Context\Setup;
use Behat\Behat\Context\Context;
use Doctrine\Common\Persistence\ObjectManager;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Core\Model\AddressInterface;
use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Core\Model\OrderItemInterface;

View file

@ -15,7 +15,7 @@ use Behat\Behat\Context\Context;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Persistence\ObjectManager;
use PhpSpec\ObjectBehavior;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Core\Model\AddressInterface;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Core\Model\CustomerInterface;

View file

@ -31,6 +31,7 @@
"php": "^5.5.9|^7.0",
"symfony/framework-bundle": "^2.7.7",
"doctrine/orm": "^2.4.8,<2.5",
"stof/doctrine-extensions-bundle": "~1.1",
"symfony/form": "^2.7.7",
"symfony/validator": "^2.7.7",

View file

@ -29,10 +29,14 @@ class LoadMetadataSubscriberSpec extends ObjectBehavior
'product' => [
'subject' => 'Some\App\Product\Entity\Product',
'association' => [
'model' => 'Some\App\Product\Entity\EntityAssociation',
'classes' => [
'model' => 'Some\App\Product\Entity\EntityAssociation',
],
],
'association_type' => [
'model' => 'Some\App\Product\Entity\AssociationType',
'classes' => [
'model' => 'Some\App\Product\Entity\AssociationType',
]
],
],
]);
@ -86,12 +90,23 @@ class LoadMetadataSubscriberSpec extends ObjectBehavior
$associationMapping = [
'fieldName' => 'associatedObjects',
'targetEntity' => 'Some\App\Product\Entity\Product',
'joinColumns' => [[
'name' => 'product_id',
'referencedColumnName' => 'id',
'nullable' => false,
'onDelete' => 'CASCADE',
]],
'joinTable' => [
'name' => 'sylius_product_association_product',
'joinColumns' => [[
'name' => 'association_id',
'referencedColumnName' => 'id',
'nullable' => false,
'unique' => false,
'onDelete' => 'CASCADE',
]],
'inverseJoinColumns' => [[
'name' => 'product_id',
'referencedColumnName' => 'id',
'nullable' => false,
'unique' => false,
'onDelete' => 'CASCADE',
]],
],
];
$associationTypeMapping = [
'fieldName' => 'type',

View file

@ -12,7 +12,7 @@
namespace Sylius\Bundle\CartBundle\EventListener;
use Doctrine\Common\Persistence\ObjectManager;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Cart\Event\CartEvent;
use Sylius\Component\Cart\Event\CartItemEvent;
use Sylius\Component\Cart\Provider\CartProviderInterface;

View file

@ -11,7 +11,7 @@
namespace Sylius\Bundle\CartBundle\Templating\Helper;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Cart\Model\CartInterface;
use Sylius\Component\Cart\Provider\CartProviderInterface;
use Sylius\Component\Resource\Factory\FactoryInterface;

View file

@ -14,7 +14,7 @@ namespace spec\Sylius\Bundle\CartBundle\EventListener;
use Doctrine\Common\Collections\Collection;
use Doctrine\Common\Persistence\ObjectManager;
use PhpSpec\ObjectBehavior;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Cart\Event\CartEvent;
use Sylius\Component\Cart\Event\CartItemEvent;
use Sylius\Component\Cart\Model\CartInterface;

View file

@ -12,7 +12,7 @@
namespace spec\Sylius\Bundle\CartBundle\Templating\Helper;
use PhpSpec\ObjectBehavior;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Cart\Model\CartInterface;
use Sylius\Component\Cart\Model\CartItemInterface;
use Sylius\Component\Cart\Provider\CartProviderInterface;

View file

@ -104,7 +104,7 @@
<parameter key="sylius.purger.orm_purger.class">Sylius\Bundle\CoreBundle\Purger\ORMPurger</parameter>
<parameter key="sylius.provider.default_zone_provider.class">Sylius\Bundle\CoreBundle\Provider\DefaultTaxZoneProvider</parameter>
<parameter key="sylius.integer_distributor.class">Sylius\Bundle\CoreBundle\Distributor\IntegerDistributor</parameter>
<parameter key="sylius.integer_distributor.class">Sylius\Component\Core\Distributor\IntegerDistributor</parameter>
<!-- Data fetchers -->
<parameter key="sylius.form.type.data_fetcher.number_of_orders.class">Sylius\Bundle\CoreBundle\Form\Type\DataFetcher\NumberOfOrdersType</parameter>

View file

@ -14,7 +14,7 @@ namespace Sylius\Bundle\OrderBundle\DependencyInjection;
use Sylius\Bundle\OrderBundle\Controller\AdjustmentController;
use Sylius\Bundle\OrderBundle\Controller\CommentController;
use Sylius\Bundle\OrderBundle\Controller\OrderItemController;
use Sylius\Bundle\OrderBundle\Factory\OrderItemUnitFactory;
use Sylius\Component\Order\Factory\OrderItemUnitFactory;
use Sylius\Bundle\OrderBundle\Form\Type\AdjustmentType;
use Sylius\Bundle\OrderBundle\Form\Type\CommentType;
use Sylius\Bundle\OrderBundle\Form\Type\OrderItemType;

View file

@ -11,7 +11,7 @@
namespace Sylius\Bundle\OrderBundle\Form\DataMapper;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Symfony\Component\Form\DataMapperInterface;
/**

View file

@ -23,7 +23,7 @@
<parameter key="sylius.originator.class">Sylius\Component\Originator\Originator\Originator</parameter>
<parameter key="sylius.order_item_quantity_modifier.class">Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifier</parameter>
<parameter key="sylius.order_item_quantity_modifier.class">Sylius\Component\Order\Modifier\OrderItemQuantityModifier</parameter>
<parameter key="sylius.form.data_mapper.property_path.class">Symfony\Component\Form\Extension\Core\DataMapper\PropertyPathMapper</parameter>
<parameter key="sylius.form.data_mapper.order_item_quantity.class">Sylius\Bundle\OrderBundle\Form\DataMapper\OrderItemQuantityDataMapper</parameter>

View file

@ -12,8 +12,8 @@
namespace spec\Sylius\Bundle\OrderBundle\Form\DataMapper;
use PhpSpec\ObjectBehavior;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Core\Model\OrderItemInterface;
use Sylius\Component\Order\Model\OrderItemInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Symfony\Component\Form\DataMapperInterface;
use Symfony\Component\Form\FormInterface;

View file

@ -9,8 +9,8 @@ before_install:
- phpenv config-rm xdebug.ini || true
before_script:
- composer install --prefer-source --no-interaction
- composer install --no-interaction --prefer-source
script:
- vendor/bin/phpspec run -f dot
- vendor/bin/phpunit ./
- bin/phpspec run -fpretty --verbose
- bin/phpunit

View file

@ -36,14 +36,16 @@
"phpunit/phpunit": "^4.1",
"symfony/twig-bundle": "^2.7.7"
},
"minimum-stability": "dev",
"prefer-stable": true,
"config": {
"bin-dir": "bin"
},
"autoload": {
"psr-4": { "Sylius\\Bundle\\ThemeBundle\\": "" }
},
"autoload-dev": {
"psr-4": { "Sylius\\Bundle\\ThemeBundle\\spec\\": "spec/" }
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "0.17-dev"

View file

@ -8,17 +8,13 @@
>
<testsuites>
<testsuite name="Sylius Test Suite">
<directory>Tests</directory>
<directory>./Tests</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory>src</directory>
<exclude>
<directory>Resources</directory>
<directory>Tests</directory>
</exclude>
<directory>./Tests</directory>
</whitelist>
</filter>
</phpunit>

View file

@ -23,7 +23,8 @@
"php": "^5.5.9|^7.0",
"knplabs/knp-menu-bundle": "^1.1",
"symfony/framework-bundle": "^2.7.7"
"symfony/framework-bundle": "^2.7.7",
"symfony/security": "^2.7"
},
"require-dev": {
"phpspec/phpspec": "^2.4",

View file

@ -121,7 +121,7 @@ class Association implements AssociationInterface
*/
public function removeAssociatedObject(AssociableInterface $associatedObject)
{
if (!$this->hasAssociatedObject($associatedObject)) {
if ($this->hasAssociatedObject($associatedObject)) {
$this->associatedObjects->removeElement($associatedObject);
}
}

View file

@ -15,7 +15,6 @@ use PhpSpec\ObjectBehavior;
use Sylius\Component\Association\Model\AssociableInterface;
use Sylius\Component\Association\Model\AssociationInterface;
use Sylius\Component\Association\Model\AssociationType;
use Sylius\Component\Product\Model\ProductInterface;
/**
* @author Leszek Prabucki <leszek.prabucki@gmail.com>
@ -33,7 +32,7 @@ class AssociationSpec extends ObjectBehavior
$this->shouldHaveType(AssociationInterface::class);
}
function it_has_owner_object(ProductInterface $product)
function it_has_owner_object(AssociableInterface $product)
{
$this->setOwner($product);
$this->getOwner()->shouldReturn($product);

View file

@ -23,6 +23,8 @@
"php": "^5.5.9|^7.0",
"sylius/resource": "0.17.*",
"symfony/form": "^2.7",
"symfony/http-foundation": "^2.7",
"zendframework/zend-stdlib": "^2.0|^3.0"
},
"require-dev": {

View file

@ -14,7 +14,7 @@ namespace spec\Sylius\Component\Channel\Context\RequestBased;
use PhpSpec\ObjectBehavior;
use Sylius\Component\Channel\Context\RequestBased\CompositeRequestResolver;
use Sylius\Component\Channel\Context\RequestBased\RequestResolverInterface;
use Sylius\Component\Core\Model\ChannelInterface;
use Sylius\Component\Channel\Model\ChannelInterface;
use Symfony\Component\HttpFoundation\Request;
/**

View file

@ -9,7 +9,9 @@
* file that was distributed with this source code.
*/
namespace Sylius\Bundle\CoreBundle\Distributor;
namespace Sylius\Component\Core\Distributor;
use Sylius\Component\Core\Distributor\IntegerDistributorInterface;
/**
* @author Mateusz Zalewski <mateusz.zalewski@lakion.com>

View file

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Sylius\Bundle\CoreBundle\Distributor;
namespace Sylius\Component\Core\Distributor;
/**
* @author Mateusz Zalewski <mateusz.zalewski@lakion.com>

View file

@ -13,7 +13,7 @@ namespace Sylius\Component\Core\OrderProcessing;
use Doctrine\Common\Collections\Collection;
use SM\Factory\FactoryInterface as StateMachineFactoryInteraface;
use Sylius\Bundle\OrderBundle\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Order\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Inventory\InventoryUnitTransitions;
use Sylius\Component\Inventory\Operator\InventoryOperatorInterface;

View file

@ -11,7 +11,7 @@
namespace Sylius\Component\Core\Promotion\Action;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Model\OrderInterface;
use Sylius\Component\Order\Model\OrderItemInterface;
use Sylius\Component\Promotion\Action\PromotionActionInterface;

View file

@ -12,7 +12,7 @@
namespace Sylius\Component\Core\Taxation;
use Doctrine\Common\Collections\Collection;
use Sylius\Bundle\CoreBundle\Distributor\IntegerDistributorInterface;
use Sylius\Component\Core\Distributor\IntegerDistributorInterface;
use Sylius\Component\Addressing\Model\ZoneInterface;
use Sylius\Component\Core\Model\AdjustmentInterface;
use Sylius\Component\Core\Model\OrderInterface;

View file

@ -9,10 +9,10 @@
* file that was distributed with this source code.
*/
namespace spec\Sylius\Bundle\CoreBundle\Distributor;
namespace spec\Sylius\Component\Core\Distributor;
use PhpSpec\ObjectBehavior;
use Sylius\Bundle\CoreBundle\Distributor\IntegerDistributorInterface;
use Sylius\Component\Core\Distributor\IntegerDistributorInterface;
/**
* @author Mateusz Zalewski <mateusz.zalewski@lakion.com>
@ -21,7 +21,7 @@ class IntegerDistributorSpec extends ObjectBehavior
{
function it_is_initializable()
{
$this->shouldHaveType('Sylius\Bundle\CoreBundle\Distributor\IntegerDistributor');
$this->shouldHaveType('Sylius\Component\Core\Distributor\IntegerDistributor');
}
function it_implements_integer_distributor_interface()

View file

@ -14,7 +14,7 @@ namespace spec\Sylius\Component\Core\OrderProcessing;
use Doctrine\Common\Collections\ArrayCollection;
use PhpSpec\ObjectBehavior;
use SM\Factory\FactoryInterface as StateMachineFactoryInterface;
use Sylius\Bundle\OrderBundle\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Order\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Core\Model\OrderItemInterface;
use Sylius\Component\Core\Model\OrderItemUnitInterface;

View file

@ -12,7 +12,7 @@
namespace spec\Sylius\Component\Core\Promotion\Action;
use PhpSpec\ObjectBehavior;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Core\Model\OrderInterface;
use Sylius\Component\Core\Model\OrderItemInterface;
use Sylius\Component\Core\Model\ProductVariantInterface;

View file

@ -14,7 +14,7 @@ namespace spec\Sylius\Component\Core\Taxation;
use Doctrine\Common\Collections\Collection;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\CoreBundle\Distributor\IntegerDistributorInterface;
use Sylius\Component\Core\Distributor\IntegerDistributorInterface;
use Sylius\Component\Addressing\Model\ZoneInterface;
use Sylius\Component\Core\Model\AdjustmentInterface;
use Sylius\Component\Core\Model\OrderInterface;

View file

@ -12,4 +12,4 @@ before_script:
- composer install --no-interaction --prefer-source
script:
- vendor/bin/phpspec run -f pretty --verbose
- bin/phpspec run -f pretty --verbose

View file

@ -20,10 +20,19 @@
}
],
"require": {
"php": "^5.5.9|^7.0"
"php": "^5.5.9|^7.0",
"sylius/resource": "0.17.*",
"symfony/property-access": "^2.7",
"symfony/options-resolver": "^2.7",
"twig/twig": "~1.11"
},
"require-dev": {
"phpspec/phpspec": "^2.4"
"phpspec/phpspec": "^2.4",
"phpunit/phpunit": "^4.1"
},
"config": {
"bin-dir": "bin"
},
"autoload": {
"psr-4": { "Sylius\\Component\\Metadata\\": "" }
@ -31,6 +40,7 @@
"autoload-dev": {
"psr-4": { "Sylius\\Component\\Metadata\\spec\\": "spec/" }
},
"minimum-stability": "dev",
"extra": {
"branch-alias": {
"dev-master": "0.17-dev"

View file

@ -3,9 +3,9 @@ language: php
sudo: false
php:
- 7.0
- 5.6
- 5.5
- 7.0
- 5.6
- 5.5
before_install:
- echo "memory_limit=2048M" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini

View file

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Sylius\Bundle\OrderBundle\Factory;
namespace Sylius\Component\Order\Factory;
use Sylius\Component\Order\Model\OrderItemInterface;
use Sylius\Component\Order\Model\OrderItemUnit;

View file

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Sylius\Bundle\OrderBundle\Factory;
namespace Sylius\Component\Order\Factory;
use Sylius\Component\Order\Model\OrderItemInterface;
use Sylius\Component\Order\Model\OrderItemUnit;

View file

@ -9,9 +9,9 @@
* file that was distributed with this source code.
*/
namespace Sylius\Bundle\OrderBundle\Modifier;
namespace Sylius\Component\Order\Modifier;
use Sylius\Bundle\OrderBundle\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Order\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Order\Model\OrderItemInterface;
/**

View file

@ -9,7 +9,7 @@
* file that was distributed with this source code.
*/
namespace Sylius\Bundle\OrderBundle\Modifier;
namespace Sylius\Component\Order\Modifier;
use Sylius\Component\Order\Model\OrderItemInterface;

View file

@ -9,10 +9,10 @@
* file that was distributed with this source code.
*/
namespace spec\Sylius\Bundle\OrderBundle\Factory;
namespace spec\Sylius\Component\Order\Factory;
use PhpSpec\ObjectBehavior;
use Sylius\Bundle\OrderBundle\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Order\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Order\Model\OrderItemInterface;
use Sylius\Component\Order\Model\OrderItemUnit;
use Sylius\Component\Order\Model\OrderItemUnitInterface;
@ -30,7 +30,7 @@ class OrderItemUnitFactorySpec extends ObjectBehavior
function it_is_initializable()
{
$this->shouldHaveType('Sylius\Bundle\OrderBundle\Factory\OrderItemUnitFactory');
$this->shouldHaveType('Sylius\Component\Order\Factory\OrderItemUnitFactory');
}
function it_implements_factory_interface()

View file

@ -9,13 +9,13 @@
* file that was distributed with this source code.
*/
namespace spec\Sylius\Bundle\OrderBundle\Modifier;
namespace spec\Sylius\Component\Order\Modifier;
use Doctrine\Common\Collections\Collection;
use PhpSpec\ObjectBehavior;
use Prophecy\Argument;
use Sylius\Bundle\OrderBundle\Factory\OrderItemUnitFactoryInterface;
use Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Order\Factory\OrderItemUnitFactoryInterface;
use Sylius\Component\Order\Modifier\OrderItemQuantityModifierInterface;
use Sylius\Component\Core\Model\OrderItemInterface;
use Sylius\Component\Core\Model\OrderItemUnitInterface;
@ -31,7 +31,7 @@ class OrderItemQuantityModifierSpec extends ObjectBehavior
function it_is_initializable()
{
$this->shouldHaveType('Sylius\Bundle\OrderBundle\Modifier\OrderItemQuantityModifier');
$this->shouldHaveType('Sylius\Component\Order\Modifier\OrderItemQuantityModifier');
}
function it_implements_order_item_quantity_modifier_interface()