diff options
| author | David Barratt <david@davidwbarratt.com> | 2013-02-19 13:18:30 +0100 |
|---|---|---|
| committer | David Barratt <david@davidwbarratt.com> | 2013-02-19 13:18:30 +0100 |
| commit | dc5c5a371aeab5af6440c0c39a4501405636b826 (patch) | |
| tree | 3fe2b8717a2057564ebdb331e89edc8ba4445259 | |
| parent | eb5991ccd0686d15615bff3a730a641889063943 (diff) | |
Revert "Revert all changes to see if travis just doesn't like me."
This reverts commit eb5991ccd0686d15615bff3a730a641889063943.
| -rw-r--r-- | .travis.yml | 3 | ||||
| -rw-r--r-- | composer.json | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 070b23c8a..3b2f6bd57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,7 @@ env: - DB=pdo/sqlite before_script: - - curl -s http://getcomposer.org/installer | php - - php composer.phar install + - composer install --dev - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'pgsql' ] || [ '$DB' = 'pdo/pgsql' ]; then psql -c 'create database ci_test;' -U postgres; fi" - sh -c "if [ '$DB' = 'mysql' ] || [ '$DB' = 'mysqli' ] || [ '$DB' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi" diff --git a/composer.json b/composer.json index 7d60020c3..e21aaed2e 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,9 @@ { + "name" : "ellislab/codeigniter", "require": { - "mikey179/vfsStream": "*" + "php": ">=5.2.4" }, "require-dev": { - "phpunit/phpunit": "*" - } + "mikey179/vfsStream": "*" + } }
\ No newline at end of file |