Merge branch 'hotfix/psr-2_compliance' of git://github.com/RWOverdijk…

…/zf2 into RWOverdijk-hotfix/psr-2_compliance
zendframework · Aug 13, 2012 · f329014 · f329014
2 parents a1bfde3 + 736aba7
commit f329014
Show file tree

Hide file tree

Showing 16 changed files with 30 additions and 30 deletions.
diff --git a/src/Client.php b/src/Client.php
@@ -652,7 +652,7 @@ protected function calcAuthDigest($user, $password, $type = self::AUTH_BASIC, $d
             throw new Exception\InvalidArgumentException("Invalid or not supported authentication type: '$type'");
         }
         $response = false;
-        switch(strtolower($type)) {
+        switch (strtolower($type)) {
             case self::AUTH_BASIC :
                 // In basic authentication, the user name cannot contain ":"
                 if (strpos($user, ':') !== false) {

diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
@@ -131,7 +131,7 @@ public function setOptions($options = array())
 
         foreach ($options as $k => $v) {
             $option = strtolower($k);
-            switch($option) {
+            switch ($option) {
                 case 'proxyhost':
                     $this->setCurlOption(CURLOPT_PROXY, $v);
                     break;

diff --git a/src/PhpEnvironment/Request.php b/src/PhpEnvironment/Request.php
@@ -94,7 +94,7 @@ public function getContent()
     {
         if (empty($this->content)) {
             $requestBody = file_get_contents('php://input');
-            if (strlen($requestBody) > 0){
+            if (strlen($requestBody) > 0) {
                 $this->content = $requestBody;
             }
         }
@@ -307,7 +307,7 @@ public function getServer($name = null, $default = null)
             $this->serverParams = new Parameters();
         }
 
-        if($name === null){
+        if ($name === null) {
             return $this->serverParams;
         }
 
@@ -340,7 +340,7 @@ public function getEnv($name = null, $default = null)
             $this->envParams = new Parameters();
         }
 
-        if($name === null){
+        if ($name === null) {
             return $this->envParams;
         }
 

diff --git a/src/Request.php b/src/Request.php
@@ -237,7 +237,7 @@ public function getQuery($name = null, $default = null)
             $this->queryParams = new Parameters();
         }
 
-        if($name === null){
+        if ($name === null) {
             return $this->queryParams;
         }
 
@@ -270,7 +270,7 @@ public function getPost($name = null, $default = null)
             $this->postParams = new Parameters();
         }
 
-        if($name === null){
+        if ($name === null) {
             return $this->postParams;
         }
 
@@ -314,7 +314,7 @@ public function getFiles($name = null, $default = null)
             $this->fileParams = new Parameters();
         }
 
-        if($name === null){
+        if ($name === null) {
             return $this->fileParams;
         }
 
@@ -336,11 +336,11 @@ public function getHeaders($name = null, $default = false)
             $this->headers = (is_string($this->headers)) ? Headers::fromString($this->headers) : new Headers();
         }
 
-        if($name === null){
+        if ($name === null) {
             return $this->headers;
         }
 
-        if($this->headers->has($name)){
+        if ($this->headers->has($name)) {
             return $this->headers->get($name);
         }
 

diff --git a/src/Response/Stream.php b/src/Response/Stream.php
@@ -180,7 +180,7 @@ public static function fromStream($responseString, $stream)
         }
 
         $headers = $response->getHeaders();
-        foreach($headers as $header) {
+        foreach ($headers as $header) {
             if ($header instanceof \Zend\Http\Header\ContentLength) {
                 $response->contentLength = (int) $header->getFieldValue();
                 if (strlen($response->content) > $response->contentLength) {

diff --git a/test/Client/CommonHttpTests.php b/test/Client/CommonHttpTests.php
@@ -816,7 +816,7 @@ public function testMutipleFilesWithSameFormNameZF5744()
         $files = array('file1.txt', 'file2.txt', 'someotherfile.foo');
 
         $expectedBody = '';
-        foreach($files as $filename) {
+        foreach ($files as $filename) {
             $this->client->setFileUpload($filename, 'uploadfile[]', $rawData, 'text/plain');
             $expectedBody .= "uploadfile $filename text/plain " . strlen($rawData) . "\n";
         }
@@ -844,7 +844,7 @@ public function testZF4238FalseLinesInResponse()
 
     public function testStreamResponse()
     {
-        if(!($this->client->getAdapter() instanceof Adapter\StreamInterface)) {
+        if (!($this->client->getAdapter() instanceof Adapter\StreamInterface)) {
               $this->markTestSkipped('Current adapter does not support streaming');
               return;
         }
@@ -871,7 +871,7 @@ public function testStreamResponseBody()
     {
         $this->markTestSkipped('To check with the new ZF2 implementation');
 
-        if(!($this->client->getAdapter() instanceof Adapter\StreamInterface)) {
+        if (!($this->client->getAdapter() instanceof Adapter\StreamInterface)) {
               $this->markTestSkipped('Current adapter does not support streaming');
               return;
         }
@@ -891,7 +891,7 @@ public function testStreamResponseBody()
 
     public function testStreamResponseNamed()
     {
-        if(!($this->client->getAdapter() instanceof Adapter\StreamInterface)) {
+        if (!($this->client->getAdapter() instanceof Adapter\StreamInterface)) {
               $this->markTestSkipped('Current adapter does not support streaming');
               return;
         }
@@ -917,7 +917,7 @@ public function testStreamResponseNamed()
 
     public function testStreamRequest()
     {
-        if(!($this->client->getAdapter() instanceof Adapter\StreamInterface)) {
+        if (!($this->client->getAdapter() instanceof Adapter\StreamInterface)) {
               $this->markTestSkipped('Current adapter does not support streaming');
               return;
         }

diff --git a/test/Client/CurlTest.php b/test/Client/CurlTest.php
@@ -72,7 +72,7 @@ public function testConfigSetAsArray()
         $this->_adapter->setOptions($config);
 
         $hasConfig = $this->_adapter->getConfig();
-        foreach($config as $k => $v) {
+        foreach ($config as $k => $v) {
             $this->assertEquals($v, $hasConfig[$k]);
         }
     }

diff --git a/test/Client/SocketTest.php b/test/Client/SocketTest.php
@@ -60,7 +60,7 @@ public function testConfigSetAsArray()
         $this->_adapter->setOptions($config);
 
         $hasConfig = $this->_adapter->getConfig();
-        foreach($config as $k => $v) {
+        foreach ($config as $k => $v) {
             $this->assertEquals($v, $hasConfig[$k]);
         }
     }

diff --git a/test/Client/StaticTest.php b/test/Client/StaticTest.php
@@ -218,7 +218,7 @@ public function testConfigSetAsArray()
 
         $hasConfig = $this->_client->config;
 
-        foreach($config as $k => $v) {
+        foreach ($config as $k => $v) {
             $this->assertEquals($v, $hasConfig[$k]);
         }
     }

diff --git a/test/Client/_files/testRedirections.php b/test/Client/_files/testRedirections.php
@@ -8,7 +8,7 @@
  * @package   Zend_Http
  */
 
-if (! isset($_GET['redirection'])){
+if (! isset($_GET['redirection'])) {
     $_GET['redirection'] = 0;
 
     /**

diff --git a/test/Client/_files/testUploads.php b/test/Client/_files/testUploads.php
@@ -11,7 +11,7 @@
 if (! empty($_FILES)) {
     foreach ($_FILES as $name => $file) {
         if (is_array($file['name'])) {
-            foreach($file['name'] as $k => $v) {
+            foreach ($file['name'] as $k => $v) {
                 echo "$name $v {$file['type'][$k]} {$file['size'][$k]}\n";
             }
         } else {

diff --git a/test/Header/AcceptCharsetTest.php b/test/Header/AcceptCharsetTest.php
@@ -63,7 +63,7 @@ public function testPrioritizesValuesBasedOnQParameter()
         );
 
         $test = array();
-        foreach($header->getPrioritized() as $type) {
+        foreach ($header->getPrioritized() as $type) {
             $this->assertEquals(array_shift($expected), $type->getCharset());
         }
     }

diff --git a/test/Header/AcceptEncodingTest.php b/test/Header/AcceptEncodingTest.php
@@ -63,7 +63,7 @@ public function testPrioritizesValuesBasedOnQParameter()
         );
 
         $test = array();
-        foreach($header->getPrioritized() as $type) {
+        foreach ($header->getPrioritized() as $type) {
             $this->assertEquals(array_shift($expected), $type->getEncoding());
         }
     }

diff --git a/test/Header/AcceptLanguageTest.php b/test/Header/AcceptLanguageTest.php
@@ -62,7 +62,7 @@ public function testPrioritizesValuesBasedOnQParameter()
         );
 
         $test = array();
-        foreach($header->getPrioritized() as $type) {
+        foreach ($header->getPrioritized() as $type) {
             $this->assertEquals(array_shift($expected), $type->typeString);
         }
         $this->assertEquals($expected, $test);

diff --git a/test/Header/AcceptTest.php b/test/Header/AcceptTest.php
@@ -83,7 +83,7 @@ public function testPrioritizesValuesBasedOnQParameter()
         );
 
         $test = array();
-        foreach($header->getPrioritized() as $type) {
+        foreach ($header->getPrioritized() as $type) {
             $this->assertEquals(array_shift($expected), $type->typeString);
         }
     }
@@ -116,7 +116,7 @@ public function testPrioritizedLevel()
         );
 
         $test = array();
-        foreach($header->getPrioritized() as $type) {
+        foreach ($header->getPrioritized() as $type) {
             $this->assertEquals(array_shift($expected), $type->raw);
         }
     }

diff --git a/test/Response/ResponseStreamTest.php b/test/Response/ResponseStreamTest.php
@@ -32,9 +32,9 @@ public function testGzipResponse ()
         $stream = fopen(__DIR__ . '/../_files/response_gzip','rb');
 
         $headers = '';
-        while(false!== ($newLine = fgets($stream))) {
+        while (false!== ($newLine = fgets($stream))) {
             $headers .= $newLine;
-            if($headers == "\n" || $headers == "\r\n") {
+            if ($headers == "\n" || $headers == "\r\n") {
                 break;
             }
         }
@@ -93,9 +93,9 @@ protected function readResponse($response)
         $stream = fopen(__DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR . $response, 'rb');
 
         $data = '';
-        while(false!== ($newLine = fgets($stream))) {
+        while (false!== ($newLine = fgets($stream))) {
             $data .= $newLine;
-            if($newLine == "\n" || $newLine == "\r\n") {
+            if ($newLine == "\n" || $newLine == "\r\n") {
                 break;
             }
         }