Merge pull request #147 from DaveHewy/master

Patch all occurences of phpmig.sets with deep level key access w/o parent
davedevelopment · Jun 26, 2020 · b85793c · b85793c
2 parents 8b30615 + ac95e3d
commit b85793c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/Phpmig/Console/Command/AbstractCommand.php b/src/Phpmig/Console/Command/AbstractCommand.php
@@ -173,7 +173,7 @@ protected function bootstrapMigrations(InputInterface $input, OutputInterface $o
         $container = $this->getContainer();
         $set = $input->getOption('set');
 
-        if (!isset($container['phpmig.migrations']) && !isset($container['phpmig.migrations_path']) && !isset($container['phpmig.sets'][$set]['migrations_path'])) {
+        if (!isset($container['phpmig.migrations']) && !isset($container['phpmig.migrations_path']) && (isset($container['phpmig.sets']) && !isset($container['phpmig.sets'][$set]['migrations_path']))) {
             throw new \RuntimeException($this->getBootstrap() . ' must return container with array at phpmig.migrations or migrations default path at phpmig.migrations_path or migrations default path at phpmig.sets');
         }
 
@@ -398,4 +398,4 @@ private function isValidClassName($className)
     {
         return preg_match('/^[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*$/', $className) === 1;
     }
-}
+}
diff --git a/src/Phpmig/Console/Command/GenerateCommand.php b/src/Phpmig/Console/Command/GenerateCommand.php
@@ -60,9 +60,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             if (true === isset($this->container['phpmig.migrations_path'])) {
                 $path = $this->container['phpmig.migrations_path'];
             }
-            if (true === isset($this->container['phpmig.sets'][$set]['migrations_path'])) {
-                $path = $this->container['phpmig.sets'][$set]['migrations_path'];
-            }
+	    // do not deep link to nested keys without first testing the parent key
+	    if (true === isset($this->container['phpmig.sets'])){
+		    if (true === isset($this->container['phpmig.sets'][$set]['migrations_path'])) {
+			$path = $this->container['phpmig.sets'][$set]['migrations_path'];
+		    }
+	    }
         }
         $locator = new FileLocator(array());
         $path = $locator->locate($path, getcwd(), $first = true);
@@ -91,7 +94,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $className = $this->migrationToClassName($migrationName);
 
-        if (isset($this->container['phpmig.migrations_template_path']) || isset($this->container['phpmig.sets'][$set]['migrations_template_path'])) {
+        if (isset($this->container['phpmig.migrations_template_path']) || (isset($this->container['phpmig.sets']) && isset($this->container['phpmig.sets'][$set]['migrations_template_path']))) {
             if (true === isset($this->container['phpmig.migrations_template_path'])) {
                 $migrationsTemplatePath = $this->container['phpmig.migrations_template_path'];
             } else {