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

Conversation

samsonasik
Copy link
Contributor

ping @Ocramius . pointed to develop. should be green after pr #7078 merged to master and develop.

@samsonasik samsonasik changed the title Fixes latest build on travis : develop Fixes CS latest build on travis : develop Dec 28, 2014
@@ -248,7 +248,7 @@ public function columns(array $columns, $prefixColumnsWithTable = true)
* @throws Exception\InvalidArgumentException
* @return Select
*/
public function join($name, $on, $columns = self::SQL_STAR, $type = self::JOIN_INNER)
public function implode($name, $on, $columns = self::SQL_STAR, $type = self::JOIN_INNER)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

oh, it should be added into .php_cs...

@samsonasik
Copy link
Contributor Author

I've undo change "join" to "implode" function of library/Zend/Db/Sql/Select.php and added it to .php_cs config in notPath...

@@ -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.

@Ocramius
Copy link
Member

Manually merged after applying the comma changes. Thanks @samsonasik!

develop: 735e0fc

@Ocramius Ocramius closed this Dec 28, 2014
@samsonasik
Copy link
Contributor Author

thank you. travis still failure... it seems ->notPath('Zend/Db/Sql/Select.php') in .php_cs didn't work ...

@samsonasik
Copy link
Contributor Author

or maybe in latest travis build https://travis-ci.org/zendframework/zf2/builds/45305386 seems still show old behaviour...

weierophinney pushed a commit to zendframework/zend-mail that referenced this pull request May 14, 2015
weierophinney pushed a commit to zendframework/zend-mail that referenced this pull request May 14, 2015
gianarb pushed a commit to zendframework/zend-http that referenced this pull request May 15, 2015
gianarb pushed a commit to zendframework/zend-view that referenced this pull request May 15, 2015
weierophinney pushed a commit to zendframework/zend-i18n-resources that referenced this pull request May 28, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants