Merge branch 'prepare-1.2'

okvpn · Aug 5, 2017 · e1ec99d · e1ec99d
2 parents 1daeb9d + bd506ad
commit e1ec99d
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 14 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,6 +1,7 @@
 # From 1.1 to 1.2
 
-## IMPORTANT BC Break
+## IMPORTANT DEPRECATED
 
 The class `Okvpn\Bundle\MigrationBundle\Migration\DataFixturesExecutor, Okvpn\Bundle\MigrationBundle\Entity\DataFixture`, 
 command `okvpn:migration:data:load` were marked as deprecated. Fixtures package will be moved to another separate repository
+
diff --git a/src/Command/DiffMigrationsCommand.php b/src/Command/DiffMigrationsCommand.php
@@ -70,7 +70,7 @@ protected function configure()
                 'Migration version',
                 'v1_0'
             )
-            ->setDescription('Diff');
+            ->setDescription('Compare current existing database structure with orm structure');
     }
 
     /**

diff --git a/src/Command/LoadDataFixturesCommand.php b/src/Command/LoadDataFixturesCommand.php
@@ -11,7 +11,7 @@
 use Okvpn\Bundle\MigrationBundle\Migration\DataFixturesExecutorInterface;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 class LoadDataFixturesCommand extends ContainerAwareCommand

diff --git a/src/Entity/DataFixture.php b/src/Entity/DataFixture.php
@@ -5,7 +5,7 @@
 use Doctrine\ORM\Mapping as ORM;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  *
  * @ORM\Table("okvpn_migrations_data")

diff --git a/src/Entity/Repository/DataFixtureRepository.php b/src/Entity/Repository/DataFixtureRepository.php
@@ -6,7 +6,7 @@
 use Okvpn\Bundle\MigrationBundle\Entity\DataFixture;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 class DataFixtureRepository extends EntityRepository

diff --git a/src/Fixture/AbstractEntityReferenceFixture.php b/src/Fixture/AbstractEntityReferenceFixture.php
@@ -9,7 +9,7 @@
 use Doctrine\ORM\EntityRepository;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 abstract class AbstractEntityReferenceFixture extends AbstractFixture implements FixtureInterface

diff --git a/src/Fixture/LoadedFixtureVersionAwareInterface.php b/src/Fixture/LoadedFixtureVersionAwareInterface.php
@@ -3,7 +3,7 @@
 namespace Okvpn\Bundle\MigrationBundle\Fixture;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 interface LoadedFixtureVersionAwareInterface

diff --git a/src/Fixture/VersionedFixtureInterface.php b/src/Fixture/VersionedFixtureInterface.php
@@ -3,7 +3,7 @@
 namespace Okvpn\Bundle\MigrationBundle\Fixture;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 interface VersionedFixtureInterface

diff --git a/src/Migration/DataFixturesExecutor.php b/src/Migration/DataFixturesExecutor.php
@@ -13,7 +13,7 @@
 /**
  * Executes ORM data fixtures.
  *
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 class DataFixturesExecutor implements DataFixturesExecutorInterface

diff --git a/src/Migration/DataFixturesExecutorInterface.php b/src/Migration/DataFixturesExecutorInterface.php
@@ -6,7 +6,7 @@
 
 /**
  * Provides an interface of data fixtures executor.
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 interface DataFixturesExecutorInterface

diff --git a/src/Migration/Loader/DataFixturesLoader.php b/src/Migration/Loader/DataFixturesLoader.php
@@ -14,7 +14,7 @@
 use Okvpn\Bundle\MigrationBundle\Fixture\LoadedFixtureVersionAwareInterface;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 class DataFixturesLoader extends ContainerAwareLoader

diff --git a/src/Migration/Sorter/DataFixturesSorter.php b/src/Migration/Sorter/DataFixturesSorter.php
@@ -11,7 +11,7 @@
  * Issue solved is notices during fixtures sorting
  *
  * @TODO could be removed when https://github.com/doctrine/data-fixtures/issues/148 will be resolved
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 class DataFixturesSorter

diff --git a/src/Migration/UpdateDataFixturesFixture.php b/src/Migration/UpdateDataFixturesFixture.php
@@ -8,7 +8,7 @@
 use Okvpn\Bundle\MigrationBundle\Entity\DataFixture;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 class UpdateDataFixturesFixture extends AbstractFixture

diff --git a/src/Tests/Functional/DataFixtures/LoadDataFixtures.php b/src/Tests/Functional/DataFixtures/LoadDataFixtures.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Yaml\Yaml;
 
 /**
- * @deprecated since 1.2 and will be removed in 1.3. Fixtures package will be moved to another separate repository,
+ * @deprecated since 1.2 and will be removed in 2.0. Fixtures package will be moved to another separate repository,
  *             it step needed to reduces the count of not necessary dependencies
  */
 class LoadDataFixtures extends AbstractFixture