Thanks to visit codestin.com
Credit goes to github.com

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

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

Merged
weierophinney merged 3 commits into from
Jan 7, 2013
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
933dfc5
cs error that caused all new travis builds to fail
tca3 Jan 7, 2013
51abfec
fix
tca3 Jan 7, 2013
3284fa7
last try?
tca3 Jan 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tests/ZendTest/Db/Sql/SelectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public function testFrom()
$select = new Select;
$return = $select->from('foo', 'bar');
$this->assertSame($select, $return);

return $return;
}

Expand All @@ -61,6 +62,7 @@ public function testColumns()
$select = new Select;
$return = $select->columns(array('foo', 'bar'));
$this->assertSame($select, $return);

return $select;
}

Expand Down Expand Up @@ -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;
}

Expand Down Expand Up @@ -295,6 +298,7 @@ public function testGroup()
$select = new Select;
$return = $select->group(array('col1', 'col2'));
$this->assertSame($select, $return);

return $return;
}

Expand All @@ -320,6 +324,7 @@ public function testHaving()
$select = new Select;
$return = $select->having(array('x = ?' => 5));
$this->assertSame($select, $return);

return $return;
}

Expand Down Expand Up @@ -896,14 +901,14 @@ public function providerData()
'processSelect' => array(array(array('"bar"', '"bar"')), '"foo"')
);


/**
* $select = the select object
* $sqlPrep = the sql as a result of preparation
* $params = the param container contents result of preparation
* $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),
Expand Down Expand Up @@ -946,5 +951,4 @@ public function providerData()
array($select37, $sqlPrep37, array(), $sqlStr37, $internalTests37),
);
}

}