ZF-9472

General cleanup of tabs and return nulls


git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@23203 44c647ce-9c0f-0410-b52a-842ac1e357ba

bin/zf.php

@@ -148,9 +148,9 @@ class ZF
             $mode = 'runSetup';
         } elseif ($arguments[0] == '--info') {
             $mode = 'runInfo';
-    	}
-    	
-    	return $mode;
+        }
+        
+        return $mode;
     }
     
 
@@ -302,14 +302,14 @@ class ZF
      */
     protected function _setupPHPRuntime()
     {
-    	// set php runtime settings
-    	ini_set('display_errors', true);
-    	
+        // set php runtime settings
+        ini_set('display_errors', true);
+        
         // support the changing of the current working directory, necessary for some providers
         if (isset($_ENV['ZEND_TOOL_CURRENT_WORKING_DIRECTORY'])) {
             chdir($_ENV['ZEND_TOOL_CURRENT_WORKING_DIRECTORY']);
         }
-    	
+        
         if (!$this->_configFile) {
             return;
         }
@@ -323,8 +323,6 @@ class ZF
                 }
             }
         }
-
-        return null;
     }
     
     /**
@@ -368,8 +366,6 @@ class ZF
             $this->_mode = 'runError';
             return;
         }
-        
-        return null;
     }
     
     /**
@@ -429,7 +425,6 @@ Your are encourged to read more in the link that follows.
 
 EOS;
 
-        return null;
     }
     
     /**
@@ -474,8 +469,6 @@ EOS;
                 $this->_runSetupMoreInfo();
                 break;
         }
-        
-        return null;
     }
 
     /**
@@ -527,8 +520,6 @@ EOS;
         }
         
         echo 'Config file written to ' . $configFile . PHP_EOL;
-        
-        return null;
     }
 
     /**
@@ -592,21 +583,20 @@ EOS;
      */
     protected function _runTool()
     {
-	    
-	    $configOptions = array();
-	    if (isset($this->_configFile) && $this->_configFile) {
-	        $configOptions['configOptions']['configFilepath'] = $this->_configFile;
-	    }
-	    if (isset($this->_storageDirectory) && $this->_storageDirectory) {
-	        $configOptions['storageOptions']['directory'] = $this->_storageDirectory;
-	    }
-	    
-	    // ensure that zf.php loads the Zend_Tool_Project features
-	    $configOptions['classesToLoad'] = 'Zend_Tool_Project_Provider_Manifest';
-	    
-	    $console = new Zend_Tool_Framework_Client_Console($configOptions);
-	    $console->dispatch();
-		return null;
+        
+        $configOptions = array();
+        if (isset($this->_configFile) && $this->_configFile) {
+            $configOptions['configOptions']['configFilepath'] = $this->_configFile;
+        }
+        if (isset($this->_storageDirectory) && $this->_storageDirectory) {
+            $configOptions['storageOptions']['directory'] = $this->_storageDirectory;
+        }
+        
+        // ensure that zf.php loads the Zend_Tool_Project features
+        $configOptions['classesToLoad'] = 'Zend_Tool_Project_Provider_Manifest';
+        
+        $console = new Zend_Tool_Framework_Client_Console($configOptions);
+        $console->dispatch();
     }
 
     /**
@@ -631,5 +621,3 @@ EOS;
 if (!getenv('ZF_NO_MAIN')) {
     ZF::main();
 }
-
-

library/Zend/Tool/Framework/Client/Abstract.php

@@ -185,7 +185,7 @@ abstract class Zend_Tool_Framework_Client_Abstract implements Zend_Tool_Framewor
      */
     public function getRegistry()
     {
-    	return $this->_registry;
+        return $this->_registry;
     }
 
     /**

library/Zend/Tool/Framework/Client/Console.php

@@ -119,8 +119,8 @@ class Zend_Tool_Framework_Client_Console
     
     public function setClassesToLoad($classesToLoad)
     {
-    	$this->_classesToLoad = $classesToLoad;
-    	return $this;
+        $this->_classesToLoad = $classesToLoad;
+        return $this;
     }
 
     /**
@@ -150,11 +150,11 @@ class Zend_Tool_Framework_Client_Console
             );
             
         if ($this->_classesToLoad) {
-        	if (is_string($this->_classesToLoad)) {
-        		$classesToLoad[] = $this->_classesToLoad;
-        	} elseif (is_array($this->_classesToLoad)) {
-        		$classesToLoad = array_merge($classesToLoad, $this->_classesToLoad);
-        	}
+            if (is_string($this->_classesToLoad)) {
+                $classesToLoad[] = $this->_classesToLoad;
+            } elseif (is_array($this->_classesToLoad)) {
+                $classesToLoad = array_merge($classesToLoad, $this->_classesToLoad);
+            }
         }
         
         // add classes to the basic loader from the config file basicloader.classes.1 ..

library/Zend/Tool/Project/Context/Zf/ControllerFile.php

@@ -113,11 +113,11 @@ class Zend_Tool_Project_Context_Zf_ControllerFile extends Zend_Tool_Project_Cont
                         new Zend_CodeGenerator_Php_Method(array(
                             'name' => 'init',
                             'body' => '/* Initialize action controller here */',
-                        	))
-                    	)
-                	))
-            	)
-        	));
+                            ))
+                        )
+                    ))
+                )
+            ));
 
 
         if ($className == 'ErrorController') {