[PSR-2] fixers=braces,elseif,short_tag,php_closing_tag,trailing_space…

…s,linefeed Applied php-cs-fixer --fixers=braces,elseif,short_tag,php_closing_tag,trailing_spaces,linefeed
zendframework · Jul 12, 2012 · 65e3b0b · 65e3b0b
1 parent 284b50c
commit 65e3b0b
Show file tree

Hide file tree

Showing 69 changed files with 177 additions and 175 deletions.
diff --git a/src/Client/Adapter/Exception/InvalidArgumentException.php b/src/Client/Adapter/Exception/InvalidArgumentException.php
@@ -17,6 +17,6 @@
  * @category  Zend
  * @package   Zend_Application
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface
 {}
diff --git a/src/Client/Adapter/Exception/OutOfRangeException.php b/src/Client/Adapter/Exception/OutOfRangeException.php
@@ -17,6 +17,6 @@
  * @category  Zend
  * @package   Zend_Application
  */
-class OutOfRangeException extends Exception\OutOfRangeException implements 
+class OutOfRangeException extends Exception\OutOfRangeException implements
     ExceptionInterface
 {}
diff --git a/src/Client/Adapter/Exception/RuntimeException.php b/src/Client/Adapter/Exception/RuntimeException.php
@@ -17,6 +17,6 @@
  * @category  Zend
  * @package   Zend_Application
  */
-class RuntimeException extends Exception\RuntimeException implements 
+class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
 {}
diff --git a/src/Client/Cookies.php b/src/Client/Cookies.php
@@ -248,7 +248,8 @@ public function getCookie($uri, $cookie_name, $ret_as = self::COOKIE_OBJECT)
      * @param int $ret_as What value to return
      * @return array|string
      */
-    protected function _flattenCookiesArray($ptr, $ret_as = self::COOKIE_OBJECT) {
+    protected function _flattenCookiesArray($ptr, $ret_as = self::COOKIE_OBJECT)
+    {
         if (is_array($ptr)) {
             $ret = ($ret_as == self::COOKIE_STRING_CONCAT ? '' : array());
             foreach ($ptr as $item) {

diff --git a/src/Client/Exception/InvalidArgumentException.php b/src/Client/Exception/InvalidArgumentException.php
@@ -17,6 +17,6 @@
  * @category  Zend
  * @package   Zend_Application
  */
-class InvalidArgumentException extends Exception\InvalidArgumentException implements 
+class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface
 {}
diff --git a/src/Client/Exception/OutOfRangeException.php b/src/Client/Exception/OutOfRangeException.php
@@ -12,6 +12,6 @@
 
 use Zend\Http\Exception;
 
-class OutOfRangeException extends Exception\OutOfRangeException implements 
+class OutOfRangeException extends Exception\OutOfRangeException implements
     ExceptionInterface
 {}
diff --git a/src/Client/Exception/RuntimeException.php b/src/Client/Exception/RuntimeException.php
@@ -17,6 +17,6 @@
  * @category  Zend
  * @package   Zend_Application
  */
-class RuntimeException extends Exception\RuntimeException implements 
+class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface
 {}
diff --git a/src/Cookies.php b/src/Cookies.php
@@ -220,7 +220,8 @@ public function getCookie($uri, $cookie_name, $ret_as = self::COOKIE_OBJECT)
      * @param int $ret_as What value to return
      * @return array|string
      */
-    protected function _flattenCookiesArray($ptr, $ret_as = self::COOKIE_OBJECT) {
+    protected function _flattenCookiesArray($ptr, $ret_as = self::COOKIE_OBJECT)
+    {
         if (is_array($ptr)) {
             $ret = ($ret_as == self::COOKIE_STRING_CONCAT ? '' : array());
             foreach ($ptr as $item) {

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -10,7 +10,7 @@
 
 namespace Zend\Http\Exception;
 
-class InvalidArgumentException extends \InvalidArgumentException implements 
+class InvalidArgumentException extends \InvalidArgumentException implements
     ExceptionInterface
 {
 }
diff --git a/src/Exception/OutOfRangeException.php b/src/Exception/OutOfRangeException.php
@@ -10,6 +10,6 @@
 
 namespace Zend\Http\Exception;
 
-class OutOfRangeException extends \OutOfRangeException implements 
+class OutOfRangeException extends \OutOfRangeException implements
     ExceptionInterface
 {}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -10,7 +10,7 @@
 
 namespace Zend\Http\Exception;
 
-class RuntimeException extends \RuntimeException implements 
+class RuntimeException extends \RuntimeException implements
     ExceptionInterface
 {
 }
diff --git a/src/Header/AbstractAccept.php b/src/Header/AbstractAccept.php
@@ -27,12 +27,12 @@ abstract class AbstractAccept implements HeaderInterface
     protected $priorityQueue;
     protected $types = array();
 
-    protected $regexAddType; 
-    
+    protected $regexAddType;
+
     /**
      * Factory method: parse Accept header string
-     * 
-     * @param  string $headerLine 
+     *
+     * @param  string $headerLine
      * @return Accept
      */
     public static function fromString($headerLine)
@@ -87,7 +87,7 @@ public static function fromString($headerLine)
 
     /**
      * Get field value
-     * 
+     *
      * @return string
      */
     public function getFieldValue()
@@ -101,10 +101,10 @@ public function getFieldValue()
 
     /**
      * Add a type, with the given priority
-     * 
-     * @param  string $type 
-     * @param  int|float $priority 
-     * @param  int $level 
+     *
+     * @param  string $type
+     * @param  int|float $priority
+     * @param  int $level
      * @return Accept
      */
     protected function addType($type, $priority = 1, $level = null)
@@ -140,7 +140,7 @@ protected function addType($type, $priority = 1, $level = null)
                 $level
             ));
         }
-        
+
         $this->types[$type] = true;
 
         if (!empty($level)) {
@@ -155,7 +155,7 @@ protected function addType($type, $priority = 1, $level = null)
                 'priority'   => $priority
             );
         }
-        
+
         $value = $type;
         if (!empty($level)) {
             $value .= sprintf(';level=%d', $level);
@@ -170,8 +170,8 @@ protected function addType($type, $priority = 1, $level = null)
 
     /**
      * Does the header have the requested type?
-     * 
-     * @param  string $type 
+     *
+     * @param  string $type
      * @return bool
      */
     protected function hasType($type)
@@ -184,7 +184,7 @@ protected function hasType($type)
         }
 
         // Check for media type
-        if (false !== strstr($type, '/')) {      
+        if (false !== strstr($type, '/')) {
             // Parent type wildcard matching
             $parent = substr($type, 0, strpos($type, '/'));
             if (isset($this->types[$parent . '/*'])) {
@@ -206,7 +206,7 @@ protected function hasType($type)
 
     /**
      * Get a prioritized list of types
-     * 
+     *
      * @return PriorityQueue
      */
     public function getPrioritized()
@@ -220,7 +220,7 @@ public function getPrioritized()
 
     /**
      * Create the priority queue
-     * 
+     *
      * @return void
      */
     protected function createPriorityQueue()
@@ -232,7 +232,7 @@ protected function createPriorityQueue()
                 continue;
             }
 
-            // Hack to ensure priorities are correct; was not treating 
+            // Hack to ensure priorities are correct; was not treating
             // fractional values correctly
             $suffix = '';
             $level = 0;

diff --git a/src/Header/Accept.php b/src/Header/Accept.php
@@ -20,10 +20,10 @@
 class Accept extends AbstractAccept
 {
     protected $regexAddType = '#^([a-zA-Z+-]+|\*)/(\*|[a-zA-Z0-9+-]+)$#';
-        
+
     /**
      * Get field name
-     * 
+     *
      * @return string
      */
     public function getFieldName()
@@ -33,7 +33,7 @@ public function getFieldName()
 
     /**
      * Cast to string
-     * 
+     *
      * @return string
      */
     public function toString()
@@ -43,10 +43,10 @@ public function toString()
 
     /**
      * Add a media type, with the given priority
-     * 
-     * @param  string $type 
-     * @param  int|float $priority 
-     * @param  int $level 
+     *
+     * @param  string $type
+     * @param  int|float $priority
+     * @param  int $level
      * @return Accept
      */
     public function addMediaType($type, $priority = 1, $level = null)
@@ -56,8 +56,8 @@ public function addMediaType($type, $priority = 1, $level = null)
 
     /**
      * Does the header have the requested media type?
-     * 
-     * @param  string $type 
+     *
+     * @param  string $type
      * @return bool
      */
     public function hasMediaType($type)

diff --git a/src/Header/AcceptCharset.php b/src/Header/AcceptCharset.php
@@ -20,10 +20,10 @@
 class AcceptCharset extends AbstractAccept
 {
     protected $regexAddType = '#^([a-zA-Z0-9+-]+|\*)$#';
-    
+
     /**
      * Get field name
-     * 
+     *
      * @return string
      */
     public function getFieldName()
@@ -33,30 +33,30 @@ public function getFieldName()
 
     /**
      * Cast to string
-     * 
+     *
      * @return string
      */
     public function toString()
     {
         return 'Accept-Charset: ' . $this->getFieldValue();
     }
-    
+
     /**
      * Add a charset, with the given priority
-     * 
-     * @param  string $type 
-     * @param  int|float $priority 
+     *
+     * @param  string $type
+     * @param  int|float $priority
      * @return Accept
      */
     public function addCharset($type, $priority = 1)
     {
         return $this->addType($type, $priority);
     }
-    
+
     /**
      * Does the header have the requested charset?
-     * 
-     * @param  string $type 
+     *
+     * @param  string $type
      * @return bool
      */
     public function hasCharset($type)

diff --git a/src/Header/AcceptEncoding.php b/src/Header/AcceptEncoding.php
@@ -21,10 +21,10 @@ class AcceptEncoding extends AbstractAccept
 {
 
     protected $regexAddType = '#^([a-zA-Z0-9+-]+|\*)$#';
-    
+
     /**
      * Get field name
-     * 
+     *
      * @return string
      */
     public function getFieldName()
@@ -34,30 +34,30 @@ public function getFieldName()
 
     /**
      * Cast to string
-     * 
+     *
      * @return string
      */
     public function toString()
     {
         return 'Accept-Encoding: ' . $this->getFieldValue();
     }
-    
+
     /**
      * Add an encoding, with the given priority
-     * 
-     * @param  string $type 
-     * @param  int|float $priority 
+     *
+     * @param  string $type
+     * @param  int|float $priority
      * @return Accept
      */
     public function addEncoding($type, $priority = 1)
     {
         return $this->addType($type, $priority);
     }
-    
+
     /**
      * Does the header have the requested encoding?
-     * 
-     * @param  string $type 
+     *
+     * @param  string $type
      * @return bool
      */
     public function hasEncoding($type)