Merge branch 'master' into acceptHandling

Conflicts: library/Zend/Http/Header/AbstractAccept.php library/Zend/Http/Header/AcceptEncoding.php library/Zend/Http/Header/AcceptLanguage.php tests/Zend/Http/Header/AcceptCharsetTest.php tests/Zend/Http/Header/AcceptEncodingTest.php tests/Zend/Http/Header/AcceptLanguageTest.php tests/Zend/Http/Header/AcceptTest.php
zendframework · Jul 14, 2012 · 599ee3a · 599ee3a
5 parents 9932ccb + df6a706 + a82fc82 + 7c2a059 + 4fefb53
commit 599ee3a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/src/Translator/LoaderPluginManager.php b/src/Translator/LoaderPluginManager.php
@@ -17,7 +17,7 @@
  * Plugin manager implementation for translation loaders.
  *
  * Enforces that filters retrieved are either callbacks or instances of
- * Loader\LoaderInterface. Additionally, it registers a number of default 
+ * Loader\LoaderInterface. Additionally, it registers a number of default
  * loaders.
  *
  * @category   Zend
@@ -28,7 +28,7 @@ class LoaderPluginManager extends AbstractPluginManager
 {
     /**
      * Default set of loaders
-     * 
+     *
      * @var array
      */
     protected $invokableClasses = array(
@@ -40,8 +40,8 @@ class LoaderPluginManager extends AbstractPluginManager
      * Validate the plugin
      *
      * Checks that the filter loaded is an instance of Loader\LoaderInterface.
-     * 
-     * @param  mixed $plugin 
+     *
+     * @param  mixed $plugin
      * @return void
      * @throws Exception\RuntimeException if invalid
      */

diff --git a/src/Translator/TextDomain.php b/src/Translator/TextDomain.php
@@ -31,8 +31,8 @@ class TextDomain extends ArrayObject
 
     /**
      * Set the plural rule
-     * 
-     * @param  PluralRule $rule 
+     *
+     * @param  PluralRule $rule
      * @return TextDomain
      */
     public function setPluralRule(PluralRule $rule)

diff --git a/src/Translator/Translator.php b/src/Translator/Translator.php
@@ -247,8 +247,8 @@ public function getCache()
 
     /**
      * Set the plugin manager for translation loaders
-     * 
-     * @param  LoaderPluginManager $pluginManager 
+     *
+     * @param  LoaderPluginManager $pluginManager
      * @return Translator
      */
     public function setPluginManager(LoaderPluginManager $pluginManager)
@@ -288,9 +288,9 @@ public function translate($message, $textDomain = 'default', $locale = null)
 
         if ($translation !== null && $translation !== '') {
             return $translation;
-        } 
-        
-        if (null !== ($fallbackLocale = $this->getFallbackLocale()) 
+        }
+
+        if (null !== ($fallbackLocale = $this->getFallbackLocale())
             && $locale !== $fallbackLocale
         ) {
             return $this->translate($message, $textDomain, $fallbackLocale);
@@ -321,14 +321,14 @@ public function translatePlural(
         $translation = $this->getTranslatedMessage($singular, $locale, $textDomain);
 
         if ($translation === null || $translation === '') {
-            if (null !== ($fallbackLocale = $this->getFallbackLocale()) 
+            if (null !== ($fallbackLocale = $this->getFallbackLocale())
                 && $locale !== $fallbackLocale
             ) {
                 return $this->translatePlural(
-                    $singular, 
-                    $plural, 
-                    $number, 
-                    $textDomain, 
+                    $singular,
+                    $plural,
+                    $number,
+                    $textDomain,
                     $fallbackLocale
                 );
             }

diff --git a/src/View/Helper/TranslatePlural.php b/src/View/Helper/TranslatePlural.php
@@ -54,10 +54,10 @@ public function setTranslator(Translator $translator)
      * @throws Exception\RuntimeException
      */
     public function __invoke(
-        $singular, 
-        $plural, 
+        $singular,
+        $plural,
         $number,
-        $textDomain = 'default', 
+        $textDomain = 'default',
         $locale = null
     ) {
         if ($this->translator === null) {

diff --git a/test/Filter/NumberFormatTest.php b/test/Filter/NumberFormatTest.php
@@ -64,7 +64,7 @@ public function testFormattedToNumber($locale, $style, $type, $value, $expected)
         $this->assertEquals($expected, $filter->filter($value));
     }
 
-    static public function numberToFormattedProvider()
+    public static function numberToFormattedProvider()
     {
         return array(
             array(
@@ -91,7 +91,7 @@ static public function numberToFormattedProvider()
         );
     }
 
-    static public function formattedToNumberProvider()
+    public static function formattedToNumberProvider()
     {
         return array(
             array(

diff --git a/test/Translator/TranslatorTest.php b/test/Translator/TranslatorTest.php
@@ -108,7 +108,7 @@ public function testTranslate()
         $loader->textDomain = new TextDomain(array('foo' => 'bar'));
         $this->translator->getPluginManager()->setService('test', $loader);
         $this->translator->addTranslationFile('test', null);
-        
+
         $this->assertEquals('bar', $this->translator->translate('foo'));
     }