Show error when specified both path and namespace (#208)

yiisoft · Oct 14, 2023 · e8427c7 · e8427c7
1 parent 5e20ff5
commit e8427c7
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 3 deletions.
diff --git a/src/Service/MigrationService.php b/src/Service/MigrationService.php
@@ -60,7 +60,15 @@ public function before(string $defaultName): int
             case 'migrate:create':
                 if (empty($this->createNamespace) && empty($this->createPath)) {
                     $this->io?->error(
-                        'At least one of `createNamespace` or `createPath` should be specified.'
+                        'One of `createNamespace` or `createPath` should be specified.'
+                    );
+
+                    $result = Command::INVALID;
+                }
+
+                if (!empty($this->createNamespace) && !empty($this->createPath)) {
+                    $this->io?->error(
+                        'Only one of `createNamespace` or `createPath` should be specified.'
                     );
 
                     $result = Command::INVALID;

diff --git a/tests/Common/Command/AbstractCreateCommandTest.php b/tests/Common/Command/AbstractCreateCommandTest.php
@@ -1022,7 +1022,7 @@ public function testWithoutCreatePath(): void
 
         $this->assertSame(Command::INVALID, $exitCode);
         $this->assertStringContainsString(
-            'At least one of `createNamespace` or `createPath` should be specified.',
+            'One of `createNamespace` or `createPath` should be specified.',
             $output
         );
     }
@@ -1058,7 +1058,44 @@ public function testWithoutCreateNamespace(): void
 
         $this->assertSame(Command::INVALID, $exitCode);
         $this->assertStringContainsString(
-            'At least one of `createNamespace` or `createPath` should be specified.',
+            'One of `createNamespace` or `createPath` should be specified.',
+            $output
+        );
+    }
+
+    public function testWithCreatePathAndNamespace(): void
+    {
+        MigrationHelper::useMigrationsPath($this->container);
+        MigrationHelper::useMigrationsNamespace($this->container);
+
+        $command = $this->createCommand($this->container);
+        $command->setInputs(['yes']);
+
+        $exitCode = $command->execute(['name' => 'post']);
+        $output = $command->getDisplay(true);
+
+        $this->assertSame(Command::INVALID, $exitCode);
+        $this->assertStringContainsString(
+            'Only one of `createNamespace` or `createPath` should be specified.',
+            $output
+        );
+    }
+
+    public function testWithOptionsPathAndNamespace(): void
+    {
+        $command = $this->createCommand($this->container);
+        $command->setInputs(['yes']);
+
+        $exitCode = $command->execute([
+            'name' => 'post',
+            '--path' => MigrationHelper::PATH_ALIAS,
+            '--namespace' => MigrationHelper::NAMESPACE,
+        ]);
+        $output = $command->getDisplay(true);
+
+        $this->assertSame(Command::INVALID, $exitCode);
+        $this->assertStringContainsString(
+            'Only one of `createNamespace` or `createPath` should be specified.',
             $output
         );
     }