Merge pull request #86 from pagemachine/toplevel-paths

Support toplevel paths

Author: mbrodala

Classes/Configuration/PhinxConfiguration.php

@@ -12,20 +12,10 @@ final class PhinxConfiguration
 
     public function toArray(): array
     {
-        $basePath = $this->getBasePath();
         $connectionParameters = $this->getConnectionParameters();
 
         return [
-            'paths' => [
-                'migrations' => sprintf(
-                    '%s/{Migrations,Classes/Migrations}/Phinx',
-                    $basePath
-                ),
-                'seeds' => sprintf(
-                    '%s/{Migrations,Classes/Migrations}/Phinx/Seeds',
-                    $basePath
-                ),
-            ],
+            'paths' => $this->getPaths(),
             'environments' => [
                 'default_migration_table' => self::MIGRATION_TABLE_NAME,
                 'default_environment' => 'typo3',
@@ -43,22 +33,51 @@ public function toArray(): array
         ];
     }
 
-    private function getBasePath(): string
+    private function getPaths(): array
     {
         if ($this->isLocatedInExtensionsPath()) {
             // <web-dir>/typo3conf/ext/*
-            return sprintf('%s/*', Environment::getExtensionsPath());
+            return [
+                'migrations' => sprintf(
+                    '%s/*/{Migrations,Classes/Migrations}/Phinx',
+                    Environment::getExtensionsPath(),
+                ),
+                'seeds' => sprintf(
+                    '%s/*/{Migrations,Classes/Migrations}/Phinx/Seeds',
+                    Environment::getExtensionsPath(),
+                ),
+            ];
         }
 
         // <vendor-dir>/*/*
-        return sprintf('%s/*/*', dirname(__DIR__, 4));
+        return [
+            'migrations' => [
+                sprintf('%s/migrations/phinx', Environment::getProjectPath()),
+                sprintf(
+                    '%s/*/*/{Migrations,Classes/Migrations}/Phinx',
+                    $this->getVendorPath(),
+                ),
+            ],
+            'seeds' => [
+                sprintf('%s/migrations/phinx/seeds', Environment::getProjectPath()),
+                sprintf(
+                    '%s/*/*/{Migrations,Classes/Migrations}/Phinx/Seeds',
+                    $this->getVendorPath(),
+                ),
+            ],
+        ];
     }
 
     private function isLocatedInExtensionsPath(): bool
     {
         return dirname(__DIR__, 3) === Environment::getExtensionsPath();
     }
 
+    private function getVendorPath(): string
+    {
+        return dirname(__DIR__, 4);
+    }
+
     private function getConnectionParameters(): array
     {
         return $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default'];

README.md

@@ -30,6 +30,7 @@ Notice that these wrapper commands are executed by TYPO3, thus the full API like
 
 The following paths are used for migrations:
 
+* `migrations/phinx` (Composer Mode)
 * `vendor/*/*/Migrations/Phinx`
 * `vendor/*/*/Classes/Migrations/Phinx`
 
@@ -47,6 +48,7 @@ the desired location.
 
 The following paths are used for seeds:
 
+* `migrations/phinx/seeds` (Composer Mode)
 * `vendor/*/*/Migrations/Phinx/Seeds`
 * `vendor/*/*/Classes/Migrations/Phinx/Seeds`