diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-02-19 13:27:39 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-02-19 13:27:39 +0100 |
| commit | 268f4496a40b15af9fe52087cab4963d38020edd (patch) | |
| tree | b570223307fd9086e9aa133866260616617f76ba | |
| parent | e1d5a7a0a6078d0edb0b9ac6e5d60a4c746ae365 (diff) | |
| parent | b63f07a6b9d26fe55dd65d09e0de584629b7e8bc (diff) | |
Merge pull request #2253 from davidbarratt/develop
Allow CodeIgniter Projects to be deployed with composer
| -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..ab0aa5616 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 --no-progress - 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 |