From 574320b6b7b5d9bc2e4d361e040f45b455009af5 Mon Sep 17 00:00:00 2001 From: Alexey Skobkin Date: Sat, 19 Jan 2019 04:30:15 +0300 Subject: [PATCH] composer update doctrine/doctrine-fixtures-bundle and corresponding changes. --- app/config/services.yml | 4 +++ composer.json | 2 +- composer.lock | 28 +++++++++++-------- .../DataFixtures/ORM/LoadCommentsData.php | 7 ++--- .../DataFixtures/ORM/LoadPostData.php | 4 +-- .../DataFixtures/ORM/LoadSubscribersData.php | 4 +-- .../DataFixtures/ORM/LoadUserData.php | 4 +-- 7 files changed, 31 insertions(+), 22 deletions(-) diff --git a/app/config/services.yml b/app/config/services.yml index 21617a4..0d2e3b2 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -10,6 +10,10 @@ services: resource: '../../src/Skobkin/Bundle/PointToolsBundle/*' exclude: '../../src/Skobkin/Bundle/PointToolsBundle/{DataFixtures,DependencyInjection,DQL,DTO,Entity,Exception,Repository,Twig}' + Skobkin\Bundle\PointToolsBundle\DataFixtures\ORM\: + resource: '../../src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/*' + tags: ['doctrine.fixture.orm'] + # HTTP clients # Default GuzzleHttp\ClientInterface: diff --git a/composer.json b/composer.json index 978b49c..a1b8591 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,7 @@ "require-dev": { "symfony/phpunit-bridge": "^3.0", "phpunit/phpunit": "^5.7", - "doctrine/doctrine-fixtures-bundle": "^2.3" + "doctrine/doctrine-fixtures-bundle": "^3" }, "scripts": { "symfony-scripts": [ diff --git a/composer.lock b/composer.lock index a53a024..fc4d41d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c50bcdcd4c9deacaba7bb6c8456d6ce1", + "content-hash": "78921ec850f4a0a77090cd19823be0a5", "packages": [ { "name": "composer/ca-bundle", @@ -4511,28 +4511,34 @@ }, { "name": "doctrine/doctrine-fixtures-bundle", - "version": "v2.4.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineFixturesBundle.git", - "reference": "74b8cc70a4a25b774628ee59f4cdf3623a146273" + "reference": "f016565b251c2dfa32a8d6da44d1650dc9ec1498" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/74b8cc70a4a25b774628ee59f4cdf3623a146273", - "reference": "74b8cc70a4a25b774628ee59f4cdf3623a146273", + "url": "https://api.github.com/repos/doctrine/DoctrineFixturesBundle/zipball/f016565b251c2dfa32a8d6da44d1650dc9ec1498", + "reference": "f016565b251c2dfa32a8d6da44d1650dc9ec1498", "shasum": "" }, "require": { - "doctrine/data-fixtures": "~1.0", - "doctrine/doctrine-bundle": "~1.0", - "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.7|~3.0|~4.0" + "doctrine/data-fixtures": "^1.3", + "doctrine/doctrine-bundle": "^1.6", + "php": "^7.1", + "symfony/doctrine-bridge": "~3.4|^4.1", + "symfony/framework-bundle": "^3.4|^4.1" + }, + "require-dev": { + "doctrine/coding-standard": "^5.0", + "phpunit/phpunit": "^7.4", + "symfony/phpunit-bridge": "^4.1" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -4564,7 +4570,7 @@ "Fixture", "persistence" ], - "time": "2017-10-30T19:26:42+00:00" + "time": "2018-12-21T10:10:51+00:00" }, { "name": "myclabs/deep-copy", diff --git a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadCommentsData.php b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadCommentsData.php index 14b8a40..e6d7b15 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadCommentsData.php +++ b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadCommentsData.php @@ -2,14 +2,13 @@ namespace Skobkin\Bundle\PointToolsBundle\DataFixtures\ORM; -use Doctrine\Common\DataFixtures\AbstractFixture; +use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Common\Persistence\ObjectManager; -use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\Comment; -use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\Post; +use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\{Comment, Post}; use Skobkin\Bundle\PointToolsBundle\Entity\User; -class LoadCommentsData extends AbstractFixture implements OrderedFixtureInterface +class LoadCommentsData extends Fixture implements OrderedFixtureInterface { public function load(ObjectManager $om) { diff --git a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadPostData.php b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadPostData.php index 4313e9b..4f548d7 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadPostData.php +++ b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadPostData.php @@ -2,13 +2,13 @@ namespace Skobkin\Bundle\PointToolsBundle\DataFixtures\ORM; -use Doctrine\Common\DataFixtures\AbstractFixture; +use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Common\Persistence\ObjectManager; use Skobkin\Bundle\PointToolsBundle\Entity\Blogs\Post; use Skobkin\Bundle\PointToolsBundle\Entity\User; -class LoadPostData extends AbstractFixture implements OrderedFixtureInterface +class LoadPostData extends Fixture implements OrderedFixtureInterface { public function load(ObjectManager $om) { diff --git a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadSubscribersData.php b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadSubscribersData.php index 4254e9f..276d60a 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadSubscribersData.php +++ b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadSubscribersData.php @@ -2,7 +2,7 @@ namespace Skobkin\Bundle\PointToolsBundle\DataFixtures\ORM; -use Doctrine\Common\DataFixtures\AbstractFixture; +use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Common\Persistence\ObjectManager; use Skobkin\Bundle\PointToolsBundle\Entity\Subscription; @@ -12,7 +12,7 @@ use Skobkin\Bundle\PointToolsBundle\Entity\User; /** * Load user subscriptions */ -class LoadSubscribersData extends AbstractFixture implements OrderedFixtureInterface +class LoadSubscribersData extends Fixture implements OrderedFixtureInterface { public function load(ObjectManager $om) { diff --git a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadUserData.php b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadUserData.php index db6a431..a9db3ee 100644 --- a/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadUserData.php +++ b/src/Skobkin/Bundle/PointToolsBundle/DataFixtures/ORM/LoadUserData.php @@ -2,12 +2,12 @@ namespace Skobkin\Bundle\PointToolsBundle\DataFixtures\ORM; -use Doctrine\Common\DataFixtures\AbstractFixture; +use Doctrine\Bundle\FixturesBundle\Fixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Common\Persistence\ObjectManager; use Skobkin\Bundle\PointToolsBundle\Entity\User; -class LoadUserData extends AbstractFixture implements OrderedFixtureInterface +class LoadUserData extends Fixture implements OrderedFixtureInterface { private $users = [ // 99999