CS fixes for Zend_Application_Resource

library/Zend/Application/Resource/Frontcontroller.php

@@ -72,7 +72,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
                     if (is_string($value)) {
                         $front->addModuleDirectory($value);
                     } elseif (is_array($value)) {
-                        foreach($value as $moduleDir) {
+                        foreach ($value as $moduleDir) {
                             $front->addModuleDirectory($moduleDir);
                         }
                     }
@@ -103,11 +103,10 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
                 case 'plugins':
                     foreach ((array) $value as $pluginClass) {
                         $stackIndex = null;
-                        if(is_array($pluginClass)) {
+                        if (is_array($pluginClass)) {
                             $pluginClass = array_change_key_case($pluginClass, CASE_LOWER);
-                            if(isset($pluginClass['class']))
-                            {
-                                if(isset($pluginClass['stackindex'])) {
+                            if (isset($pluginClass['class'])) {
+                                if (isset($pluginClass['stackindex'])) {
                                     $stackIndex = $pluginClass['stackindex'];
                                 }
 
@@ -137,7 +136,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
                     break;
 
                 case 'dispatcher':
-                    if(!isset($value['class'])) {
+                    if (!isset($value['class'])) {
                         require_once 'Zend/Application/Exception.php';
                         throw new Zend_Application_Exception('You must specify both ');
                     }
@@ -146,7 +145,7 @@ class Zend_Application_Resource_Frontcontroller extends Zend_Application_Resourc
                     }
                     
                     $dispatchClass = $value['class'];
-                    if(!class_exists($dispatchClass)) {
+                    if (!class_exists($dispatchClass)) {
                         require_once 'Zend/Application/Exception.php';
                         throw new Zend_Application_Exception('Dispatcher class not found!');
                     }

library/Zend/Application/Resource/Locale.php

@@ -68,9 +68,9 @@ class Zend_Application_Resource_Locale
 
             if (!isset($options['default'])) {
                 $this->_locale = new Zend_Locale();
-            } elseif(!isset($options['force']) ||
-                     (bool) $options['force'] == false)
-            {
+            } elseif (!isset($options['force'])
+                      || (bool)$options['force'] == false
+            ) {
                 // Don't force any locale, just go for auto detection
                 Zend_Locale::setDefault($options['default']);
                 $this->_locale = new Zend_Locale();

library/Zend/Application/Resource/Mail.php

@@ -43,7 +43,8 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
      */
     protected $_transport;
 
-    public function init() {
+    public function init()
+    {
         return $this->getMail();
     }
 
@@ -55,21 +56,21 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
     {
         if (null === $this->_transport) {
             $options = $this->getOptions();
-            foreach($options as $key => $option) {
+            foreach ($options as $key => $option) {
                 $options[strtolower($key)] = $option;
             }
             $this->setOptions($options);
 
-            if(isset($options['transport']) &&
-               !is_numeric($options['transport']))
-            {
+            if (isset($options['transport'])
+                && !is_numeric($options['transport'])
+            ) {
                 $this->_transport = $this->_setupTransport($options['transport']);
-                if(!isset($options['transport']['register']) ||
-                   $options['transport']['register'] == '1' ||
-                   (isset($options['transport']['register']) &&
-                        !is_numeric($options['transport']['register']) &&
-                        (bool) $options['transport']['register'] == true))
-                {
+                if (!isset($options['transport']['register'])
+                    || $options['transport']['register'] == '1'
+                    || (isset($options['transport']['register'])
+                        && !is_numeric($options['transport']['register'])
+                        && (bool)$options['transport']['register'] == true)
+                ) {
                     Zend_Mail::setDefaultTransport($this->_transport);
                 }
             }
@@ -81,19 +82,23 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
         return $this->_transport;
     }
 
-    protected function _setDefaults($type) {
+    protected function _setDefaults($type)
+    {
         $key = strtolower('default' . $type);
         $options = $this->getOptions();
 
-        if(isset($options[$key]['email']) &&
-           !is_numeric($options[$key]['email']))
-        {
+        if (isset($options[$key]['email'])
+            && !is_numeric($options[$key]['email'])
+        ) {
             $method = array('Zend_Mail', 'setDefault' . ucfirst($type));
-            if(isset($options[$key]['name']) &&
-               !is_numeric($options[$key]['name']))
-            {
-                call_user_func($method, $options[$key]['email'],
-                                        $options[$key]['name']);
+            if (isset($options[$key]['name'])
+                && !is_numeric(
+                    $options[$key]['name']
+                )
+            ) {
+                call_user_func(
+                    $method, $options[$key]['email'], $options[$key]['name']
+                );
             } else {
                 call_user_func($method, $options[$key]['email']);
             }
@@ -102,19 +107,17 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
 
     protected function _setupTransport($options)
     {
-        if(!isset($options['type'])) {
+        if (!isset($options['type'])) {
             $options['type'] = 'sendmail';
         }
-        
+
         $transportName = $options['type'];
-        if(!Zend_Loader_Autoloader::autoload($transportName))
-        {
+        if (!Zend_Loader_Autoloader::autoload($transportName)) {
             $transportName = ucfirst(strtolower($transportName));
 
-            if(!Zend_Loader_Autoloader::autoload($transportName))
-            {
+            if (!Zend_Loader_Autoloader::autoload($transportName)) {
                 $transportName = 'Zend_Mail_Transport_' . $transportName;
-                if(!Zend_Loader_Autoloader::autoload($transportName)) {
+                if (!Zend_Loader_Autoloader::autoload($transportName)) {
                     throw new Zend_Application_Resource_Exception(
                         "Specified Mail Transport '{$transportName}'"
                         . 'could not be found'
@@ -128,10 +131,11 @@ class Zend_Application_Resource_Mail extends Zend_Application_Resource_ResourceA
 
         switch($transportName) {
             case 'Zend_Mail_Transport_Smtp':
-                if(!isset($options['host'])) {
+                if (!isset($options['host'])) {
                     throw new Zend_Application_Resource_Exception(
                         'A host is necessary for smtp transport,'
-                        .' but none was given');
+                        . ' but none was given'
+                    );
                 }
 
                 $transport = new $transportName($options['host'], $options);

library/Zend/Application/Resource/Modules.php

@@ -72,23 +72,27 @@ class Zend_Application_Resource_Modules extends Zend_Application_Resource_Resour
         foreach ($modules as $module => $moduleDirectory) {
             $bootstrapClass = $this->_formatModuleName($module) . '_Bootstrap';
             if (!class_exists($bootstrapClass, false)) {
-                $bootstrapPath  = dirname($moduleDirectory) . '/Bootstrap.php';
+                $bootstrapPath = dirname($moduleDirectory) . '/Bootstrap.php';
                 if (file_exists($bootstrapPath)) {
                     $eMsgTpl = 'Bootstrap file found for module "%s" but bootstrap class "%s" not found';
                     include_once $bootstrapPath;
                     if (($default != $module)
                         && !class_exists($bootstrapClass, false)
                     ) {
-                        throw new Zend_Application_Resource_Exception(sprintf(
-                            $eMsgTpl, $module, $bootstrapClass
-                        ));
+                        throw new Zend_Application_Resource_Exception(
+                            sprintf(
+                                $eMsgTpl, $module, $bootstrapClass
+                            )
+                        );
                     } elseif ($default == $module) {
                         if (!class_exists($bootstrapClass, false)) {
                             $bootstrapClass = 'Bootstrap';
                             if (!class_exists($bootstrapClass, false)) {
-                                throw new Zend_Application_Resource_Exception(sprintf(
-                                    $eMsgTpl, $module, $bootstrapClass
-                                ));
+                                throw new Zend_Application_Resource_Exception(
+                                    sprintf(
+                                        $eMsgTpl, $module, $bootstrapClass
+                                    )
+                                );
                             }
                         }
                     }
@@ -116,9 +120,9 @@ class Zend_Application_Resource_Modules extends Zend_Application_Resource_Resour
     protected function bootstrapBootstraps($bootstraps)
     {
         $bootstrap = $this->getBootstrap();
-        $out = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
+        $out       = new ArrayObject(array(), ArrayObject::ARRAY_AS_PROPS);
 
-        foreach($bootstraps as $module => $bootstrapClass) {
+        foreach ($bootstraps as $module => $bootstrapClass) {
             $moduleBootstrap = new $bootstrapClass($bootstrap);
             $moduleBootstrap->bootstrap();
             $out[$module] = $moduleBootstrap;

library/Zend/Application/Resource/Multidb.php

@@ -114,7 +114,7 @@ class Zend_Application_Resource_Multidb extends Zend_Application_Resource_Resour
      */
     public function isDefault($db)
     {
-        if(!$db instanceof Zend_Db_Adapter_Abstract) {
+        if (!$db instanceof Zend_Db_Adapter_Abstract) {
             $db = $this->getDb($db);
         }
 

library/Zend/Application/Resource/Navigation.php

@@ -57,10 +57,12 @@ class Zend_Application_Resource_Navigation
         if (!$this->_container) {
             $options = $this->getOptions();
 
-            if(isset($options['defaultPageType'])) {
-                Zend_Navigation_Page::setDefaultPageType($options['defaultPageType']);
+            if (isset($options['defaultPageType'])) {
+                Zend_Navigation_Page::setDefaultPageType(
+                    $options['defaultPageType']
+                );
             }
-            
+
             $pages = isset($options['pages']) ? $options['pages'] : array();
             $this->_container = new Zend_Navigation($pages);
         }
@@ -93,15 +95,16 @@ class Zend_Application_Resource_Navigation
     protected function _storeRegistry()
     {
         $options = $this->getOptions();
-        if(isset($options['storage']['registry']['key']) &&
-           !is_numeric($options['storage']['registry']['key'])) // see ZF-7461
-        {
-           $key = $options['storage']['registry']['key'];
+        // see ZF-7461
+        if (isset($options['storage']['registry']['key'])
+            && !is_numeric($options['storage']['registry']['key'])
+        ) {
+            $key = $options['storage']['registry']['key'];
         } else {
             $key = self::DEFAULT_REGISTRY_KEY;
         }
 
-        Zend_Registry::set($key,$this->getContainer());
+        Zend_Registry::set($key, $this->getContainer());
     }
 
     /**

library/Zend/Application/Resource/Translate.php

@@ -93,7 +93,7 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso
             }
 
             if (isset($options['options'])) {
-                foreach($options['options'] as $key => $value) {
+                foreach ($options['options'] as $key => $value) {
                     $options[$key] = $value;
                 }
             }
@@ -118,13 +118,15 @@ class Zend_Application_Resource_Translate extends Zend_Application_Resource_Reso
                  : self::DEFAULT_REGISTRY_KEY;
             unset($options['registry_key']);
 
-            if(Zend_Registry::isRegistered($key)) {
+            if (Zend_Registry::isRegistered($key)) {
                 $translate = Zend_Registry::get($key);
-                if(!$translate instanceof Zend_Translate) {
+                if (!$translate instanceof Zend_Translate) {
                     require_once 'Zend/Application/Resource/Exception.php';
-                    throw new Zend_Application_Resource_Exception($key
-                                   . ' already registered in registry but is '
-                                   . 'no instance of Zend_Translate');
+                    throw new Zend_Application_Resource_Exception(
+                        $key
+                        . ' already registered in registry but is '
+                        . 'no instance of Zend_Translate'
+                    );
                 }
 
                 $translate->addTranslation($options);