Merge branch 'cs/#7079-develop-cs-fixes' into develop

Close #7079
zendframework · Dec 28, 2014 · 735e0fc · 735e0fc
2 parents 16ff002 + d716333
commit 735e0fc
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/.php_cs b/.php_cs
@@ -1,5 +1,6 @@
 <?php
 $finder = Symfony\CS\Finder\DefaultFinder::create()
+    ->notPath('Zend/Db/Sql/Select.php')
     ->notPath('Zend/View/Stream.php')
     ->notPath('ZendTest/Code/Generator/TestAsset')
     ->notPath('ZendTest/Code/Reflection/FunctionReflectionTest.php')

diff --git a/library/Zend/View/Resolver/PrefixPathStackResolver.php b/library/Zend/View/Resolver/PrefixPathStackResolver.php
@@ -9,7 +9,6 @@
 
 namespace Zend\View\Resolver;
 
-use Zend\View\Exception;
 use Zend\View\Renderer\RendererInterface as Renderer;
 
 final class PrefixPathStackResolver implements ResolverInterface
@@ -54,6 +53,6 @@ public function resolve($name, Renderer $renderer = null)
             }
         }
 
-        return null;
+        return;
     }
 }
diff --git a/tests/ZendTest/Http/Header/SetCookieTest.php b/tests/ZendTest/Http/Header/SetCookieTest.php
@@ -362,15 +362,15 @@ public function testRfcCompatibility()
         $cookie = new SetCookie($name, $value);
 
         // default
-        $this->assertEquals( $cookie->toString(), sprintf($formatUnquoted, $cookie->getFieldName(), $name, $value));
+        $this->assertEquals($cookie->toString(), sprintf($formatUnquoted, $cookie->getFieldName(), $name, $value));
 
         // rfc with quote
         $cookie->setQuoteFieldValue(true);
-        $this->assertEquals( $cookie->toString(), sprintf($formatQuoted, $cookie->getFieldName(), $name, $value));
+        $this->assertEquals($cookie->toString(), sprintf($formatQuoted, $cookie->getFieldName(), $name, $value));
 
         // rfc without quote
         $cookie->setQuoteFieldValue(false);
-        $this->assertEquals( $cookie->toString(), sprintf($formatUnquoted, $cookie->getFieldName(), $name, $value));
+        $this->assertEquals($cookie->toString(), sprintf($formatUnquoted, $cookie->getFieldName(), $name, $value));
     }
 
     public function testSetJsonValue()

diff --git a/tests/ZendTest/Mail/Storage/ImapTest.php b/tests/ZendTest/Mail/Storage/ImapTest.php
@@ -264,7 +264,7 @@ public function testFetchMessageBody()
         $mail = new Storage\Imap($this->_params);
 
         $content = $mail->getMessage(3)->getContent();
-        list($content,) = explode("\n", $content, 2);
+        list($content) = explode("\n", $content, 2);
         $this->assertEquals('Fair river! in thy bright, clear flow', trim($content));
     }
 

diff --git a/tests/ZendTest/Mail/Storage/MaildirMessageOldTest.php b/tests/ZendTest/Mail/Storage/MaildirMessageOldTest.php
@@ -128,7 +128,7 @@ public function testFetchMessageBody()
         $mail = new MaildirOldMessage(array('dirname' => $this->_maildir));
 
         $content = $mail->getMessage(3)->getContent();
-        list($content,) = explode("\n", $content, 2);
+        list($content) = explode("\n", $content, 2);
         $this->assertEquals('Fair river! in thy bright, clear flow', trim($content));
     }
 

diff --git a/tests/ZendTest/Mail/Storage/MaildirTest.php b/tests/ZendTest/Mail/Storage/MaildirTest.php
@@ -192,7 +192,7 @@ public function testFetchMessageBody()
         $mail = new Storage\Maildir(array('dirname' => $this->_maildir));
 
         $content = $mail->getMessage(3)->getContent();
-        list($content,) = explode("\n", $content, 2);
+        list($content) = explode("\n", $content, 2);
         $this->assertEquals('Fair river! in thy bright, clear flow', trim($content));
     }
 

diff --git a/tests/ZendTest/Mail/Storage/MboxMessageOldTest.php b/tests/ZendTest/Mail/Storage/MboxMessageOldTest.php
@@ -97,7 +97,7 @@ public function testFetchMessageBody()
         $mail = new MboxOldMessage(array('filename' => $this->_mboxFile));
 
         $content = $mail->getMessage(3)->getContent();
-        list($content,) = explode("\n", $content, 2);
+        list($content) = explode("\n", $content, 2);
         $this->assertEquals('Fair river! in thy bright, clear flow', trim($content));
     }
 

diff --git a/tests/ZendTest/Mail/Storage/MboxTest.php b/tests/ZendTest/Mail/Storage/MboxTest.php
@@ -168,7 +168,7 @@ public function testFetchMessageBody()
         $mail = new Storage\Mbox(array('filename' => $this->_mboxFile));
 
         $content = $mail->getMessage(3)->getContent();
-        list($content,) = explode("\n", $content, 2);
+        list($content) = explode("\n", $content, 2);
         $this->assertEquals('Fair river! in thy bright, clear flow', trim($content));
     }
 

diff --git a/tests/ZendTest/Mail/Storage/Pop3Test.php b/tests/ZendTest/Mail/Storage/Pop3Test.php
@@ -230,7 +230,7 @@ public function testFetchMessageBody()
         $mail = new Storage\Pop3($this->_params);
 
         $content = $mail->getMessage(3)->getContent();
-        list($content,) = explode("\n", $content, 2);
+        list($content) = explode("\n", $content, 2);
         $this->assertEquals('Fair river! in thy bright, clear flow', trim($content));
     }