Merge remote-tracking branch 'weierophinney/feature/registry-remove-s…

…ingleton'
zendframework · Jun 28, 2012 · b5ac15d · b5ac15d
11 parents 046d669 + ab7d56c + 6dbeef6 + 84670b1 + cccfba9 + 2717653 + b4dd364 + 460818e + 436e613 + 2d218aa + f2e7f45
commit b5ac15d
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 67 deletions.
diff --git a/src/Alnum.php b/src/Alnum.php
@@ -22,8 +22,7 @@
 
 use Traversable;
 use Zend\Stdlib\ArrayUtils;
-use Zend\Locale\Locale as ZendLocale,
-    Zend\Registry;
+use Zend\Locale\Locale as ZendLocale;
 
 /**
  * @category   Zend

diff --git a/src/Alpha.php b/src/Alpha.php
@@ -22,7 +22,6 @@
 
 use Traversable,
     Zend\Locale\Locale as ZendLocale,
-    Zend\Registry,
     Zend\Stdlib\ArrayUtils;
 
 /**

diff --git a/test/AlnumTest.php b/test/AlnumTest.php
@@ -22,8 +22,7 @@
 namespace ZendTest\Filter;
 
 use Zend\Filter\Alnum as AlnumFilter,
-    Zend\Locale\Locale as ZendLocale,
-    Zend\Registry;
+    Zend\Locale\Locale as ZendLocale;
 
 /**
  * @category   Zend
@@ -183,34 +182,4 @@ public function testAllowWhiteSpace()
                 );
         }
     }
-
-    /**
-     * @group ZF-11631
-     */
-    public function testRegistryLocale()
-    {
-        $locale = new ZendLocale('ja');
-        \Zend\Registry::set('Zend_Locale', $locale);
-
-        if (!self::$_unicodeEnabled) {
-            $this->markTestSkipped('Unicode not enabled');
-        }
-
-        $valuesExpected = array(
-            'aＡBｂ3４5６'  => 'aB35',
-            'z７ Ｙ8　x９'  => 'z8x',
-            '，s1.2r３#:q,' => 's12rq',
-        );
-
-        $filter = new AlnumFilter();
-        $this->assertEquals('ja', (string) $filter->getLocale());
-
-        foreach ($valuesExpected as $input => $output) {
-            $this->assertEquals(
-                $output,
-                $result = $filter($input),
-                "Expected '$input' to filter to '$output', but received '$result' instead"
-                );
-        }
-    }
 }
diff --git a/test/AlphaTest.php b/test/AlphaTest.php
@@ -190,36 +190,4 @@ public function testAllowWhiteSpace()
                 );
         }
     }
-
-    /**
-     * @group ZF-11631
-     */
-    public function testRegistryLocale()
-    {
-        $locale = new Locale('ja');
-        \Zend\Registry::set('Zend_Locale', $locale);
-
-        if (!self::$_unicodeEnabled) {
-            $this->markTestSkipped('Unicode not enabled');
-        }
-
-        $valuesExpected = array(
-                'aＡBｂc'  => 'aBc',
-                'z Ｙ　x'  => 'zx',
-                'Ｗ1v３Ｕ4t' => 'vt',
-                '，sй.rλ:qν＿p' => 'srqp',
-                'onml' => 'onml'
-        );
-
-        $filter = new AlphaFilter();
-        $this->assertEquals('ja', (string) $filter->getLocale());
-
-        foreach ($valuesExpected as $input => $output) {
-            $this->assertEquals(
-                $output,
-                $result = $filter($input),
-                "Expected '$input' to filter to '$output', but received '$result' instead"
-                );
-        }
-    }
 }