Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Fixes CS latest build on travis : develop #7079

Closed
wants to merge 3 commits into from
Closed

Fixes CS latest build on travis : develop #7079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2925a05
Fixes latest build on travis : develop
samsonasik Dec 28, 2014
2d4597c
undo change join -> implode Zend/Db/Sql/Select.php
samsonasik Dec 28, 2014
2eae9e5
fixes method_argument_space cs
samsonasik Dec 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .php_cs
View file
Open in desktop
@@ -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')
Expand Down
3 changes: 1 addition & 2 deletions library/Zend/View/Resolver/PrefixPathStackResolver.php
View file
Open in desktop
Expand Up @@ -9,7 +9,6 @@

namespace Zend\View\Resolver;

use Zend\View\Exception;
use Zend\View\Renderer\RendererInterface as Renderer;

final class PrefixPathStackResolver implements ResolverInterface
Expand Down Expand Up @@ -54,6 +53,6 @@ public function resolve($name, Renderer $renderer = null)
}
}

return null;
return;
}
}
6 changes: 3 additions & 3 deletions tests/ZendTest/Http/Header/SetCookieTest.php
View file
Open in desktop
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion tests/ZendTest/Mail/Storage/ImapTest.php
View file
Open in desktop
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ZendTest/Mail/Storage/MaildirMessageOldTest.php
View file
Open in desktop
Expand Up @@ -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);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ocramius it makes cs error with "parenthesis" cs, but when it trimmed, it makes another error : "method_argument_space", should these files added to .php_cs too ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@samsonasik why not just removing the commas? I'll give that a shot first.

$this->assertEquals('Fair river! in thy bright, clear flow', trim($content));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ZendTest/Mail/Storage/MaildirTest.php
View file
Open in desktop
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ZendTest/Mail/Storage/MboxMessageOldTest.php
View file
Open in desktop
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ZendTest/Mail/Storage/MboxTest.php
View file
Open in desktop
Expand Up @@ -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));
}

Expand Down
2 changes: 1 addition & 1 deletion tests/ZendTest/Mail/Storage/Pop3Test.php
View file
Open in desktop
Expand Up @@ -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));
}

Expand Down