Merge commit '2248f2d'

nextras · Jun 14, 2022 · 1854b9c · 1854b9c
2 parents 70ea169 + 2248f2d
commit 1854b9c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/src/Bridges/SymfonyConsole/CreateCommand.php b/src/Bridges/SymfonyConsole/CreateCommand.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\String\Slugger\AsciiSlugger;
 
 
 class CreateCommand extends BaseCommand
@@ -118,7 +119,7 @@ protected function getGroup($type)
 
 		$matchedGroups = [];
 		foreach ($this->config->getGroups() as $group) {
-			if (Strings::match($group->name, $groupNamePattern)) {
+			if (preg_match($groupNamePattern, $group->name)) {
 				$matchedGroups[] = $group;
 			}
 		}
@@ -148,7 +149,21 @@ protected function getGroup($type)
 	 */
 	protected function getFileName($label, $extension)
 	{
-		return date('Y-m-d-His-') . Strings::webalize($label, '.') . '.' . $extension;
+		if (preg_match('#^[a-z0-9.-]++$#i', $label)) {
+			$slug = strtolower($label);
+
+		} elseif (class_exists('Nette\Utils\Strings')) {
+			$slug = Strings::webalize($label, '.');
+
+		} elseif (class_exists('Symfony\Component\String\Slugger\AsciiSlugger')) {
+			$slugger = new AsciiSlugger('en');
+			$slug = $slugger->slug($label)->toString();
+
+		} else {
+			throw new Nextras\Migrations\LogicException("Provided label '$label' contains invalid characters.");
+		}
+
+		return date('Y-m-d-His-') . $slug . '.' . $extension;
 	}
 
 

diff --git a/src/Configurations/Configuration.php b/src/Configurations/Configuration.php
@@ -9,7 +9,6 @@
 
 namespace Nextras\Migrations\Configurations;
 
-use Nette\Utils\Validators;
 use Nextras\Migrations\Entities\Group;
 use Nextras\Migrations\IConfiguration;
 use Nextras\Migrations\IExtensionHandler;