Merged Source/Master

zendframework · Mar 13, 2013 · cddbfdf · cddbfdf
commit cddbfdf
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/composer.json b/composer.json
@@ -33,8 +33,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.4-dev",
-            "dev-develop": "2.5-dev"
+            "dev-master": "2.1-dev",
+            "dev-develop": "2.2-dev"
         }
     },
     "autoload-dev": {

diff --git a/src/Factory.php b/src/Factory.php
@@ -157,7 +157,7 @@ public static function toFile($filename, $config)
             );
         }
 
-        if(!isset(self::$writerExtensions[$extension])) {
+        if (!isset(self::$writerExtensions[$extension])) {
             throw new Exception\RuntimeException(
                 "Unsupported config file extension: '.{$extension}' for writing."
             );

diff --git a/src/Reader/Ini.php b/src/Reader/Ini.php
@@ -148,7 +148,7 @@ protected function process(array $data)
      */
     private function buildNestedSection($sections, $value)
     {
-        if(count($sections) == 0) {
+        if (count($sections) == 0) {
             return $this->processSection($value);
         }
 

diff --git a/test/FactoryTest.php b/test/FactoryTest.php
@@ -32,7 +32,7 @@ protected function getTestAssetFileName($ext)
 
     public function tearDown()
     {
-        foreach($this->tmpFiles as $file) {
+        foreach ($this->tmpFiles as $file) {
             if (file_exists($file)) {
                 if (!is_writable($file)) {
                     chmod($file, 0777);