Skip to content

Commit

Permalink
Small fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
MASNathan committed May 28, 2015
1 parent fe0ff83 commit 11663a6
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 24 deletions.
16 changes: 3 additions & 13 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
language: php
cache:
directories:
- vendor

php:
- 5.6
- 5.5
- 5.4
- 5.3.3
- nightly

matrix:
allow_failures:
- php: nightly

before_script:
- travis_retry composer self-update
- alias composer="php -d zend.enable_gc=0 /usr/bin/composer"
- composer require --dev satooshi/php-coveralls:dev-master
- composer install
- travis_retry composer install --no-interaction --prefer-source --dev

after_script:
- export COVERALLS_RUN_LOCALLY=1
Expand All @@ -25,7 +19,3 @@ after_script:
script:
- bin/phpunit --coverage-text
- bin/phpunit-randomizer --order rand --repeat 10

matrix:
allow_failures:
- php: hhvm-nightly
6 changes: 0 additions & 6 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,5 @@
"config":
{
"bin-dir": "bin"
},
"minimum-stability": "stable",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
}
}
10 changes: 5 additions & 5 deletions tests/Builder/GenericBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ public function itShouldCreateUnionAllObject()
public function itCanAcceptATableNameForSelectInsertUpdateDeleteQueries()
{
$table = 'user';
$queries = [
$queries = array(
'select' => $this->writer->select($table),
'insert' => $this->writer->insert($table),
'update' => $this->writer->update($table),
'delete' => $this->writer->delete($table),
];
);

foreach ($queries as $type => $query) {
$this->assertEquals($table, $query->getTable()->getName(), "Checking table in $type query");
Expand All @@ -124,7 +124,7 @@ public function itCanAcceptATableNameForSelectInsertUpdateDeleteQueries()
public function itCanAcceptATableAndColumnsForSelect()
{
$table = 'user';
$columns = ['id', 'role'];
$columns = array('id', 'role');
$expected = <<<QUERY
SELECT
user.id,
Expand All @@ -144,7 +144,7 @@ public function itCanAcceptATableAndColumnsForSelect()
public function itCanAcceptATableAndValuesForInsert()
{
$table = 'user';
$values = ['id' => 1, 'role' => 'admin'];
$values = array('id' => 1, 'role' => 'admin');
$expected = <<<QUERY
INSERT INTO user (user.id, user.role)
VALUES
Expand All @@ -162,7 +162,7 @@ public function itCanAcceptATableAndValuesForInsert()
public function itCanAcceptATableAndValuesForUpdate()
{
$table = 'user';
$values = ['id' => 1, 'role' => 'super-admin'];
$values = array('id' => 1, 'role' => 'super-admin');
$expected = <<<QUERY
UPDATE
user
Expand Down

0 comments on commit 11663a6

Please sign in to comment.