Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix trailing spaces CS error causing all travis builds to fail #3365

Merged
merged 3 commits into from

3 participants

@ThomasCantonnet

ZendTest/Db/Sql/SelectTest.php (trailing_spaces) on every travis build from develop.

Fixed with this PR (hopefully).

@samsonasik

have you try

php php-cs-fixer.phar fix /path/to/dir --fixers=trailing_spaces 

?

@ThomasCantonnet

@samsonasik yea it's really strange, this PR is the output of php-cs-fixer and yet it tells me it's invalid.

@samsonasik

i think it's a travis problem, based on travis error, it's Timeouts

@ThomasCantonnet

@samsonasik One of them yes, the others are still trailing_spaces

@weierophinney weierophinney referenced this pull request from a commit
@weierophinney weierophinney [#3365] Really fix CS issue
- used php-cs-fixer to remove trailing whitespace
dadb2e1
@weierophinney weierophinney merged commit 3284fa7 into from
@weierophinney weierophinney was assigned
@ThomasCantonnet ThomasCantonnet deleted the branch
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney [#3365] Really fix CS issue
- used php-cs-fixer to remove trailing whitespace
87fc9d5
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3365' into develop
Close #3365
9b54778
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 6 additions and 2 deletions.
  1. +6 −2 tests/ZendTest/Db/Sql/SelectTest.php
View
8 tests/ZendTest/Db/Sql/SelectTest.php
@@ -39,6 +39,7 @@ public function testFrom()
$select = new Select;
$return = $select->from('foo', 'bar');
$this->assertSame($select, $return);
+
return $return;
}
@@ -61,6 +62,7 @@ public function testColumns()
$select = new Select;
$return = $select->columns(array('foo', 'bar'));
$this->assertSame($select, $return);
+
return $select;
}
@@ -96,6 +98,7 @@ public function testJoin()
$select = new Select;
$return = $select->join('foo', 'x = y', Select::SQL_STAR, Select::JOIN_INNER);
$this->assertSame($select, $return);
+
return $return;
}
@@ -295,6 +298,7 @@ public function testGroup()
$select = new Select;
$return = $select->group(array('col1', 'col2'));
$this->assertSame($select, $return);
+
return $return;
}
@@ -320,6 +324,7 @@ public function testHaving()
$select = new Select;
$return = $select->having(array('x = ?' => 5));
$this->assertSame($select, $return);
+
return $return;
}
@@ -896,7 +901,6 @@ public function providerData()
'processSelect' => array(array(array('"bar"', '"bar"')), '"foo"')
);
-
/**
* $select = the select object
* $sqlPrep = the sql as a result of preparation
@@ -904,6 +908,7 @@ public function providerData()
* $sqlStr = the sql as a result of getting a string back
* $internalTests what the internal functions should return (safe-guarding extension)
*/
+
return array(
// $select $sqlPrep $params $sqlStr $internalTests // use named param
array($select0, $sqlPrep0, array(), $sqlStr0, $internalTests0),
@@ -946,5 +951,4 @@ public function providerData()
array($select37, $sqlPrep37, array(), $sqlStr37, $internalTests37),
);
}
-
}
Something went wrong with that request. Please try again.