(fix): Formatting style checked and fixed according to http://framework.zend.com/manual/1.12/en/coding-standard.coding-style.html

Author: a-lucas

library/Zend/Console/Getopt.php

@@ -731,26 +731,17 @@ public function parse()
         return $this;
     }
 
-    public function checkRequiredArguments(){
-        
-        
-        foreach($this->_rules as $name=>$rule){
-            
-            if($rule['param'] === 'required'){
-                
-                $defined = false;
-                
-                foreach($rule['alias'] as $alias){
-                    
-                    $defined = $defined === true ? true : array_key_exists($alias, $this->_options);
-                    
+    public function checkRequiredArguments()
+    {    
+        foreach ($this->_rules as $name=>$rule){           
+            if ($rule['param'] === 'required'){                
+                $defined = false;                
+                foreach ($rule['alias'] as $alias){                    
+                    $defined = $defined === true ? true : array_key_exists($alias, $this->_options);                    
                 }
-                if($defined === false){
-                    
+                if ($defined === false){                    
                     require_once 'Zend/Console/Getopt/Exception.php';
-                    throw new Zend_Console_Getopt_Exception(
-                        "Option \"$alias\" requires a parameter.",
-                            $this->getUsageMessage());
+                    throw new Zend_Console_Getopt_Exception("Option \"$alias\" requires a parameter.", $this->getUsageMessage());
 
                 }
             }            

tests/Zend/Console/GetoptTest.php

@@ -269,51 +269,40 @@ public function testGetoptUnSetBeforeParse()
         $this->assertFalse(isset($opts->a));
     }
 
-    public function testVerifyRequiredArgument(){
-        $opts = new Zend_Console_Getopt(array(
-            'apple|a=s' =>"First required argument"
-        ));
+    public function testVerifyRequiredArgument()
+    {
+        $opts = new Zend_Console_Getopt(array('apple|a=s' => "First required argument"));
         try {   
             $opts->parse();
             $opts->checkRequiredArguments();
             $this->fail('Expected to catch a Zend_Console_Getopt_Exception');
         }
-        catch (Exception $e){
+        catch (Zend_Exception $e){
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got '. get_class($e));
-            
-            $this->assertEquals( 'Option "a" requires a parameter.' , $e->getMessage() );
+                'Expected Zend_Console_Getopt_Exception, got '. get_class($e));            
+            $this->assertEquals('Option "a" requires a parameter.' , $e->getMessage());
         }        
 
-        $opts->addArguments( array( "-a", "apple") );
+        $opts->addArguments(array( "-a", "apple") );
         $opts->parse();
         $opts->checkRequiredArguments();//-> no Exception here
     }
 
-    public function testEmptyRequiredOption(){
-        
+    public function testEmptyRequiredOption()
+    {       
         $opts = new Zend_Console_Getopt(array(
             'apple|a=s' =>"First required argument",
             'banana|b=i'  =>"Second required argument"
-        ));
-        
-        $opts->addArguments(array(
-                "-a",
-                "-b",
-                "123"
-        ));
-            
+        ));        
+        $opts->addArguments(array("-a","-b","123"));
         try {   
             $opts->parse();
             $opts->checkRequiredArguments();
-            $this->fail('Expected to catch a Zend_Console_Getopt_Exception');
-             
-         } catch (Exception $e) {             
-             
+            $this->fail('Expected to catch a Zend_Console_Getopt_Exception');             
+         } catch (Zend_Exception $e) {                          
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got '. get_class($e));
-            
-            $this->assertEquals( 'Option "a" requires a parameter.' , $e->getMessage() );
+                'Expected Zend_Console_Getopt_Exception, got '. get_class($e));            
+            $this->assertEquals('Option "a" requires a parameter.' , $e->getMessage());
          }
     }