From 6bca9f836836f4bea2112cd6635a384e862b4db2 Mon Sep 17 00:00:00 2001
From: Taufan Aditya <toopay@taufanaditya.com>
Date: Fri, 25 May 2012 01:55:36 +0700
Subject: get vfsStream via composer if its PEAR package not exists

---
 .travis.yml         |  5 ++---
 composer.json       |  5 +++++
 tests/Bootstrap.php | 11 ++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 composer.json

diff --git a/.travis.yml b/.travis.yml
index 4076e2bdc..5eff68d18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,8 @@ env:
   - DB=pdo/sqlite
 
 before_script:
-  - sudo pyrus channel-discover pear.bovigo.org
-  - sudo pyrus install -f bovigo/vfsStream-beta
-  - phpenv rehash
+  - curl -s http://getcomposer.org/installer | php
+  - php composer.phar install
   - 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' = 'pdo/mysql' ]; then mysql -e 'create database IF NOT EXISTS ci_test;'; fi"
diff --git a/composer.json b/composer.json
new file mode 100644
index 000000000..fa6dc02e4
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "mikey179/vfsStream": "*"
+    }
+}
\ No newline at end of file
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
index 9f89d1be8..c14a4dee2 100644
--- a/tests/Bootstrap.php
+++ b/tests/Bootstrap.php
@@ -12,8 +12,17 @@ define('BASEPATH',		PROJECT_BASE.'system/');
 define('APPPATH',		PROJECT_BASE.'application/');
 define('VIEWPATH',		PROJECT_BASE.'');
 
+// Get vfsStream either via pear or composer
+if (file_exists('vfsStream/vfsStream.php'))
+{
+	require_once 'vfsStream/vfsStream.php';
+}
+else
+{
+	include_once '../vendor/autoload.php';
+}
+
 // Prep our test environment
-require_once 'vfsStream/vfsStream.php';
 include_once $dir.'/mocks/core/common.php';
 include_once $dir.'/mocks/autoloader.php';
 spl_autoload_register('autoload');
-- 
cgit v1.2.3-24-g4f1b