diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote branch 'Seldaek/init_bundle'

Browse Source 
* Seldaek/init_bundle:
  [FrameworkBundle] Allow init:bundle to be called with / as namespace separator
This commit is contained in:
Fabien Potencier 2011-04-11 18:39:36 +02:00
commit 27d2b049f8
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Bundle/FrameworkBundle/Command/InitBundleCommand.php
View File

@ -66,6 +66,7 @@ EOT
} }
// validate namespace // validate namespace
$namespace = strtr($namespace, '/', '\\');
if (preg_match('/[^A-Za-z0-9_\\\-]/', $namespace)) { if (preg_match('/[^A-Za-z0-9_\\\-]/', $namespace)) {
throw new \InvalidArgumentException('The namespace contains invalid characters.'); throw new \InvalidArgumentException('The namespace contains invalid characters.');
} }
@ -96,8 +97,6 @@ EOT
$targetDir = $dir.strtr($namespace, '\\', '/'); $targetDir = $dir.strtr($namespace, '\\', '/');
if (file_exists($targetDir)) { if (file_exists($targetDir)) {
throw new \RuntimeException(sprintf('Bundle "%s" already exists.', $bundle)); throw new \RuntimeException(sprintf('Bundle "%s" already exists.', $bundle));
} }