Merge pull request #920 from helhum/fix-tca-loading-order

TYPO3-Console · May 26, 2020 · 33547e2 · 33547e2
2 parents 6d9dd54 + c706957
commit 33547e2
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 19 deletions.
diff --git a/Classes/Console/Core/Booting/RunLevel.php b/Classes/Console/Core/Booting/RunLevel.php
@@ -291,7 +291,8 @@ function () {
                         function () {
                             Scripts::initializePersistence($this->container);
                         }
-                    )
+                    ),
+                    'helhum.typo3console:extensionconfiguration'
                 );
                 break;
             case 'helhum.typo3console:authentication':

diff --git a/Tests/Console/Functional/Command/DatabaseCommandControllerTest.php b/Tests/Console/Functional/Command/DatabaseCommandControllerTest.php
@@ -54,15 +54,17 @@ public function allUpdatesCanBePerformedWhenSpecified()
     public function addingAndRemovingFieldsAndTablesIncludingVerbositySwitchWork()
     {
         self::installFixtureExtensionCode('ext_test');
-        $this->executeConsoleCommand('install:generatepackagestates', ['--activate-default']);
+        try {
+            $this->executeConsoleCommand('install:generatepackagestates', ['--activate-default']);
 
-        $output = $this->executeConsoleCommand('database:updateschema', ['*', '--verbose']);
+            $output = $this->executeConsoleCommand('database:updateschema', ['*', '--verbose']);
 
-        $this->assertContains('The following database schema updates were performed:', $output);
-        $this->assertContains('Change fields', $output);
-        $this->assertContains('Add tables', $output);
-
-        self::removeFixtureExtensionCode('ext_test');
+            $this->assertContains('The following database schema updates were performed:', $output);
+            $this->assertContains('Change fields', $output);
+            $this->assertContains('Add tables', $output);
+        } finally {
+            self::removeFixtureExtensionCode('ext_test');
+        }
         $this->executeConsoleCommand('install:generatepackagestates', ['--activate-default']);
 
         $output = $this->executeConsoleCommand('database:updateschema', ['*', '--verbose']);

diff --git a/Tests/Console/Functional/Command/ExtensionCommandControllerTest.php b/Tests/Console/Functional/Command/ExtensionCommandControllerTest.php
@@ -86,19 +86,21 @@ public function extensionSetupActiveWorksWhenExtensionChecksConfigInExtLocalConf
     public function extensionSetupActivePerformsSchemaUpdate()
     {
         $this->backupDatabase();
-        self::installFixtureExtensionCode('ext_test');
-        $this->executeConsoleCommand('install:generatepackagestates', ['--activate-default']);
-
-        $output = $this->executeConsoleCommand('extension:setupactive');
-        $this->assertContains('ext_test', $output);
-        $this->assertContains('are now set up.', $output);
+        try {
+            self::installFixtureExtensionCode('ext_test');
+            $this->executeConsoleCommand('install:generatepackagestates', ['--activate-default']);
 
-        $output = $this->executeConsoleCommand('database:updateschema');
-        $this->assertContains('No schema updates were performed for update types:', $output);
+            $output = $this->executeConsoleCommand('extension:setupactive');
+            $this->assertContains('ext_test', $output);
+            $this->assertContains('are now set up.', $output);
 
-        self::removeFixtureExtensionCode('ext_test');
-        $this->executeConsoleCommand('install:generatepackagestates', ['--activate-default']);
-        $this->restoreDatabase();
+            $output = $this->executeConsoleCommand('database:updateschema');
+            $this->assertContains('No schema updates were performed for update types:', $output);
+        } finally {
+            self::removeFixtureExtensionCode('ext_test');
+            $this->executeConsoleCommand('install:generatepackagestates', ['--activate-default']);
+            $this->restoreDatabase();
+        }
     }
 
     /**

diff --git a/.../Console/Functional/Fixtures/Extensions/ext_test/Configuration/TCA/tx_exttest_cattest.php b/.../Console/Functional/Fixtures/Extensions/ext_test/Configuration/TCA/tx_exttest_cattest.php
@@ -0,0 +1,7 @@
+<?php
+declare(strict_types=1);
+
+return [
+    'ctrl' => [
+    ],
+];
diff --git a/Tests/Console/Functional/Fixtures/Extensions/ext_test/ext_tables.php b/Tests/Console/Functional/Fixtures/Extensions/ext_test/ext_tables.php
@@ -0,0 +1,6 @@
+<?php
+defined('TYPO3_MODE') or die();
+
+if (empty($GLOBALS['TCA']['tx_exttest_cattest'])) {
+    throw new \RuntimeException('TCA not loaded before ext_tables.php', 1590494014);
+}