Revert "Revert all changes to see if travis just doesn't like me."
This reverts commit eb5991ccd0686d15615bff3a730a641889063943.
diff --git a/.travis.yml b/.travis.yml
index 070b23c..3b2f6bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,7 @@
- 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 7d60020..e21aaed 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