Merge branch 'master' of git://github.com/zendframework/zf2 into zf11884

zendframework · Nov 19, 2011 · 3617ea6 · 3617ea6
commit 3617ea6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Container.php b/src/Container.php
@@ -71,8 +71,8 @@ class Container extends ArrayObject
      */
     public function __construct($name = 'Default', $manager = null)
     {
-        if (!preg_match('/^[a-z][a-z0-9_]+$/i', $name)) {
-            throw new Exception\InvalidArgumentException('Name passed to container is invalid; must consist of alphanumerics and underscores only');
+        if (!preg_match('/^[a-z][a-z0-9_\\\]+$/i', $name)) {
+            throw new Exception\InvalidArgumentException('Name passed to container is invalid; must consist of alphanumerics, backslashes and underscores only');
         }
         $this->_name = $name;
         $this->_setManager($manager);

diff --git a/test/ContainerTest.php b/test/ContainerTest.php
@@ -93,6 +93,18 @@ public function testPassingNameToConstructorInstantiatesContainerWithThatName()
         $this->assertEquals('foo', $container->getName());
     }
 
+    public function testUsingOldZF1NameIsStillValid()
+    {
+        $container = new Container('Zend_Foo', $this->manager);
+        $this->assertEquals('Zend_Foo', $container->getName());
+    }
+
+    public function testUsingNewZF2NamespaceIsValid()
+    {
+        $container = new Container('Zend\Foo', $this->manager);
+        $this->assertEquals('Zend\Foo', $container->getName());
+    }
+
     public function testPassingInvalidNameToConstructorRaisesException()
     {
         $tries = array(
@@ -101,6 +113,8 @@ public function testPassingInvalidNameToConstructorRaisesException()
             '_foo',
             '__foo',
             '0foo',
+            '\foo',
+            '\\foo'
         );
         foreach ($tries as $try) {
             try {