Merge pull request #9297 from hluchas/fix-data-fixture-namespace

mautic · Nov 11, 2020 · 35c44b0 · 35c44b0
2 parents 3240101 + f7ed6a5
commit 35c44b0
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/app/bundles/CampaignBundle/Config/config.php b/app/bundles/CampaignBundle/Config/config.php
@@ -592,13 +592,6 @@
                 'tag' => 'console.command',
             ],
         ],
-        'fixtures' => [
-            'mautic.campaign.fixture.campaign' => [
-                'class'    => \Mautic\CampaignBundle\Tests\DataFixtures\Orm\CampaignData::class,
-                'tag'      => \Doctrine\Bundle\FixturesBundle\DependencyInjection\CompilerPass\FixturesCompilerPass::FIXTURE_TAG,
-                'optional' => true,
-            ],
-        ],
         'services' => [
             'mautic.campaign.service.campaign'=> [
                 'class'     => \Mautic\CampaignBundle\Service\Campaign::class,
@@ -608,6 +601,13 @@
                 ],
             ],
         ],
+        'fixtures' => [
+            'mautic.campaign.fixture.campaign' => [
+                'class'    => \Mautic\CampaignBundle\DataFixtures\ORM\CampaignData::class,
+                'tag'      => \Doctrine\Bundle\FixturesBundle\DependencyInjection\CompilerPass\FixturesCompilerPass::FIXTURE_TAG,
+                'optional' => true,
+            ],
+        ],
     ],
     'parameters' => [
         'campaign_time_wait_on_event_false' => 'PT1H',

diff --git a/...e/Tests/DataFixtures/Orm/CampaignData.php → ...nBundle/DataFixtures/ORM/CampaignData.php b/...e/Tests/DataFixtures/Orm/CampaignData.php → ...nBundle/DataFixtures/ORM/CampaignData.php
@@ -9,7 +9,7 @@
  * @license     GNU/GPLv3 http://www.gnu.org/licenses/gpl-3.0.html
  */
 
-namespace Mautic\CampaignBundle\Tests\DataFixtures\Orm;
+namespace Mautic\CampaignBundle\DataFixtures\ORM;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;

diff --git a/app/bundles/CampaignBundle/Tests/Functional/Campaign/DetailsTest.php b/app/bundles/CampaignBundle/Tests/Functional/Campaign/DetailsTest.php
@@ -11,7 +11,7 @@
 
 namespace Mautic\CampaignBundle\Tests\Functional\Campaign;
 
-use Mautic\CampaignBundle\Tests\DataFixtures\Orm\CampaignData;
+use Mautic\CampaignBundle\DataFixtures\ORM\CampaignData;
 use Mautic\CoreBundle\Test\MauticMysqlTestCase;
 
 class DetailsTest extends MauticMysqlTestCase

diff --git a/app/bundles/LeadBundle/Tests/Controller/AjaxControllerFunctionalTest.php b/app/bundles/LeadBundle/Tests/Controller/AjaxControllerFunctionalTest.php
@@ -14,7 +14,7 @@
 namespace Mautic\LeadBundle\Tests\Controller;
 
 use Doctrine\DBAL\Connection;
-use Mautic\CampaignBundle\Tests\DataFixtures\Orm\CampaignData;
+use Mautic\CampaignBundle\DataFixtures\ORM\CampaignData;
 use Mautic\CoreBundle\Test\MauticMysqlTestCase;
 use Mautic\InstallBundle\InstallFixtures\ORM\LeadFieldData;
 use Mautic\InstallBundle\InstallFixtures\ORM\RoleData;

diff --git a/app/bundles/LeadBundle/Tests/Controller/LeadControllerTest.php b/app/bundles/LeadBundle/Tests/Controller/LeadControllerTest.php
@@ -3,7 +3,7 @@
 namespace Mautic\LeadBundle\Tests\Controller;
 
 use Doctrine\DBAL\Connection;
-use Mautic\CampaignBundle\Tests\DataFixtures\Orm\CampaignData;
+use Mautic\CampaignBundle\DataFixtures\ORM\CampaignData;
 use Mautic\CoreBundle\Test\MauticMysqlTestCase;
 use Mautic\InstallBundle\InstallFixtures\ORM\LeadFieldData;
 use Mautic\InstallBundle\InstallFixtures\ORM\RoleData;

diff --git a/app/release_metadata.json b/app/release_metadata.json
@@ -1,6 +1,6 @@
 {
-  "version": "3.1.2",
-  "stability": "stable",
+  "version": "3.1.2-rc",
+  "stability": "rc",
   "minimum_php_version": "7.2.21",
   "maximum_php_version": "7.4.99",
   "minimum_mautic_version": "3.1.0",