Merge pull request #1430 from dpfaffenbauer/3.0-feature/doctrine-fixt…

…ures

[Fixtures] update fixtures version and fix Deprecation message

composer.json

@@ -16,7 +16,7 @@
     "require": {
         "dachcom-digital/emailizr": "^1.0.6",
         "doctrine/common": "^2.6",
-        "doctrine/data-fixtures": "^1.0",
+        "doctrine/data-fixtures": "^1.4",
         "doctrine/dbal": "^2.1",
         "doctrine/doctrine-bundle": "^1.11.0",
         "doctrine/orm": "^2.5",

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/AddressIdentifierFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
 use CoreShop\Component\Address\Model\AddressIdentifierInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/ConfigurationFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
 use CoreShop\Component\Core\Configuration\ConfigurationServiceInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/CountryFixture.php

@@ -19,7 +19,7 @@
 use CoreShop\Component\Core\Model\StoreInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Pimcore\Tool;
 use Rinvex\Country\Country;
 use Rinvex\Country\CountryLoader;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/CurrencyFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
 use CoreShop\Component\Core\Model\CurrencyInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Rinvex\Country\Country;
 use Rinvex\Country\CountryLoader;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/NotificationRulesFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
 use CoreShop\Bundle\NotificationBundle\Form\Type\NotificationRuleType;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Pimcore\Model\Document;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/StoreFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
 use CoreShop\Component\Core\Model\StoreInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Application/ZoneFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
 use CoreShop\Component\Address\Model\ZoneInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Rinvex\Country\Country;
 use Rinvex\Country\CountryLoader;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/AbstractProductFixture.php

@@ -21,16 +21,13 @@
 use CoreShop\Component\Pimcore\DataObject\ObjectServiceInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
 use Faker\Factory;
 use Faker\Provider\Barcode;
-use Faker\Provider\Image;
 use Faker\Provider\Lorem;
 use Pimcore\Model\Asset;
 use Pimcore\Model\DataObject\Service;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpKernel\KernelInterface;
 
 abstract class AbstractProductFixture extends AbstractFixture implements ContainerAwareInterface, VersionedFixtureInterface, DependentFixtureInterface

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/CarrierFixture.php

@@ -18,7 +18,7 @@
 use CoreShop\Component\Core\Model\CarrierInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Faker\Factory;
 use Faker\Provider\Lorem;
 use Pimcore\Tool;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/CategoryFixture.php

@@ -19,7 +19,7 @@
 use CoreShop\Component\Core\Model\CategoryInterface;
 use CoreShop\Component\Pimcore\DataObject\ObjectServiceInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Faker\Factory;
 use Pimcore\Model\DataObject\Service;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/PaymentProviderFixture.php

@@ -18,7 +18,7 @@
 use CoreShop\Bundle\PayumBundle\Model\GatewayConfig;
 use CoreShop\Component\Core\Model\PaymentProviderInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Faker\Factory;
 use Faker\Provider\Lorem;
 use Pimcore\Tool;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ProductFixture.php

@@ -19,7 +19,7 @@
 use CoreShop\Component\Core\Model\ProductInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Faker\Factory;
 use Faker\Provider\Barcode;
 use Faker\Provider\Image;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ProductUnitFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
 use CoreShop\Component\Product\Model\ProductUnitInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ProductWithUnitFixture.php

@@ -23,7 +23,7 @@
 use CoreShop\Component\Product\Model\ProductUnitDefinitionsInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Faker\Factory;
 use Faker\Provider\Barcode;
 use Faker\Provider\Image;

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ShippingRuleFixture.php

@@ -18,7 +18,7 @@
 use CoreShop\Component\Rule\Model\Action;
 use CoreShop\Component\Rule\Model\Condition;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/ShippingRuleGroupFixture.php

@@ -18,7 +18,7 @@
 use CoreShop\Component\Shipping\Model\ShippingRuleGroupInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/TaxRateFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Fixture\VersionedFixtureInterface;
 use CoreShop\Component\Taxation\Model\TaxRateInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/CoreShop/Bundle/CoreBundle/Fixtures/Data/Demo/TaxRuleGroupFixture.php

@@ -20,7 +20,7 @@
 use CoreShop\Component\Taxation\Calculator\TaxCalculatorInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 

src/CoreShop/Bundle/FixtureBundle/Fixture/UpdateDataFixturesFixture.php

@@ -17,7 +17,7 @@
 use CoreShop\Bundle\FixtureBundle\Repository\DataFixtureRepositoryInterface;
 use CoreShop\Component\Resource\Factory\FactoryInterface;
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class UpdateDataFixturesFixture extends AbstractFixture
 {

src/CoreShop/Bundle/FixtureBundle/composer.json

@@ -19,7 +19,7 @@
         "symfony/framework-bundle": "^4.3",
         "symfony/doctrine-bridge": "^4.3",
         "symfony/twig-bundle": "^4.3",
-        "doctrine/data-fixtures": "^1.0",
+        "doctrine/data-fixtures": "^1.4",
         "doctrine/dbal": "^2.1",
         "doctrine/orm": "^2.5"
     },