[zendframework/zendframework#2706] CS cleanup

- whitespace around conditionals - remove commented code - EOF markers
zendframework · Dec 10, 2012 · fd6f1d5 · fd6f1d5
1 parent fd6e1e5
commit fd6f1d5
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 23 deletions.
diff --git a/src/Translator/Loader/Ini.php b/src/Translator/Loader/Ini.php
@@ -42,21 +42,22 @@ public function load($locale, $filename)
             ));
         }
 
-        $messages = array();
-        $iniReader = new IniReader();
+        $messages           = array();
+        $iniReader          = new IniReader();
         $messagesNamespaced = $iniReader->fromFile($filename);
 
         $list = $messagesNamespaced;
-        if(isset($messagesNamespaced['translation'])) {
+        if (isset($messagesNamespaced['translation'])) {
            $list = $messagesNamespaced['translation'];
         }
-        foreach($list as $message) {
-            if(!is_array($message) || count($message) < 2) {
+
+        foreach ($list as $message) {
+            if (!is_array($message) || count($message) < 2) {
                 throw new Exception\InvalidArgumentException(
                     'Each INI row must be an array with message and translation'
                 );
             }
-            if(isset($message['message']) && isset($message['translation'])) {
+            if (isset($message['message']) && isset($message['translation'])) {
                 $messages[$message['message']] = $message['translation'];
                 continue;
             }
@@ -72,8 +73,9 @@ public function load($locale, $filename)
 
         $textDomain = new TextDomain($messages);
 
-        if (array_key_exists('plural', $messagesNamespaced) &&
-                isset($messagesNamespaced['plural']['plural_forms'])) {
+        if (array_key_exists('plural', $messagesNamespaced)
+            && isset($messagesNamespaced['plural']['plural_forms'])
+        ) {
             $textDomain->setPluralRule(
                 PluralRule::fromString($messagesNamespaced['plural']['plural_forms'])
             );

diff --git a/src/Translator/LoaderPluginManager.php b/src/Translator/LoaderPluginManager.php
@@ -32,9 +32,9 @@ class LoaderPluginManager extends AbstractPluginManager
      * @var array
      */
     protected $invokableClasses = array(
-        'phparray' => 'Zend\I18n\Translator\Loader\PhpArray',
         'gettext'  => 'Zend\I18n\Translator\Loader\Gettext',
         'ini'      => 'Zend\I18n\Translator\Loader\Ini',
+        'phparray' => 'Zend\I18n\Translator\Loader\PhpArray',
     );
 
     /**

diff --git a/test/Translator/Loader/IniTest.php b/test/Translator/Loader/IniTest.php
@@ -21,17 +21,9 @@ class IniTest extends TestCase
 
     public function setUp()
     {
-        //$this->originalLocale = Locale::getDefault();
-        //Locale::setDefault('en_EN');
-
         $this->testFilesDir = realpath(__DIR__ . '/../_files');
     }
 
-    public function tearDown()
-    {
-        //Locale::setDefault($this->originalLocale);
-    }
-
     public function testLoaderFailsToLoadMissingFile()
     {
         $loader = new IniLoader();
@@ -62,7 +54,6 @@ public function testLoaderFailsToLoadBadSyntax()
         $loader->load('en_EN', $this->testFilesDir . '/failed_syntax.ini');
     }
 
-
     public function testLoaderReturnsValidTextDomain()
     {
         $loader = new IniLoader();

diff --git a/test/Translator/_files/failed.ini b/test/Translator/_files/failed.ini
@@ -1 +1 @@
-identifier1  = "Message 1"
+identifier1  = "Message 1"
diff --git a/test/Translator/_files/failed_syntax.ini b/test/Translator/_files/failed_syntax.ini
@@ -1 +1 @@
-identifier1[]  = "Message 1"
+identifier1[]  = "Message 1"
diff --git a/test/Translator/_files/translation_en.ini b/test/Translator/_files/translation_en.ini
@@ -23,4 +23,4 @@ identifier6.message  = "Cooking furniture"
 identifier6.translation  = "Küchen Möbel (en)"
 
 identifier7.message  = "Küchen Möbel"
-identifier7.translation  = "Cooking furniture (en)"
+identifier7.translation  = "Cooking furniture (en)"
diff --git a/test/Translator/_files/translation_en_simple_syntax.ini b/test/Translator/_files/translation_en_simple_syntax.ini
@@ -23,4 +23,4 @@ identifier6[]  = "Cooking furniture"
 identifier6[]  = "Küchen Möbel (en)"
 
 identifier7[]  = "Küchen Möbel"
-identifier7[]  = "Cooking furniture (en)"
+identifier7[]  = "Cooking furniture (en)"
diff --git a/test/Translator/_files/translation_en_without_plural.ini b/test/Translator/_files/translation_en_without_plural.ini
@@ -19,4 +19,4 @@ identifier6.message  = "Cooking furniture"
 identifier6.translation  = "Küchen Möbel (en)"
 
 identifier7.message  = "Küchen Möbel"
-identifier7.translation  = "Cooking furniture (en)"
+identifier7.translation  = "Cooking furniture (en)"