From e99211db319f4ed498702817476e40d233a6a9d7 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 20:13:02 +0000
Subject: [PATCH 01/12] Moved require_once statement outside of setUp tests
 method

---
 tests/authentication/server_test.php | 6 +++---
 tests/resource/server_test.php       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
index ef677c7e..e7132ec7 100644
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
@@ -1,12 +1,12 @@
 <?php
 
+require_once 'src/OAuth2/Authentication/Server.php';
+require_once 'src/OAuth2/Authentication/Database.php';
+
 class Authentication_Server_test extends PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        require_once 'src/OAuth2/Authentication/Server.php';
-        require_once 'src/OAuth2/Authentication/Database.php';
-
         $this->oauth = new Oauth2\Authentication\Server();
 
         require_once 'database_mock.php';
diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php
index 707d73ee..8d5fac2d 100644
--- a/tests/resource/server_test.php
+++ b/tests/resource/server_test.php
@@ -1,12 +1,12 @@
 <?php
 
+require_once 'src/OAuth2/Resource/Server.php';
+require_once 'src/OAuth2/Resource/Database.php';
+
 class Resource_Server_test extends PHPUnit_Framework_TestCase {
 
     function setUp()
     {
-        require_once 'src/OAuth2/Resource/Server.php';
-        require_once 'src/OAuth2/Resource/Database.php';
-
         require_once('database_mock.php');
         $this->server = new Oauth2\Resource\Server();
         $this->db = new ResourceDB();

From 755a753cb532b49e2af52147fe153778f24f806e Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 20:19:26 +0000
Subject: [PATCH 02/12] Test include path on travis

---
 tests/authentication/server_test.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
index e7132ec7..bd0b214e 100644
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
@@ -15,6 +15,11 @@ class Authentication_Server_test extends PHPUnit_Framework_TestCase
         $this->oauth->registerDbAbstractor($this->oauthdb);
     }
 
+    public function test_ip()
+    {
+        echo PHP_EOL.PHP_EOL.get_include_path().PHP_EOL.PHP_EOL;
+    }
+
     public function test_setupWithOptions()
     {
         $o = new Oauth2\Authentication\Server(array(

From b5e8f9206be9bb8c224c25f50cf0fa48b54f04ca Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 20:21:25 +0000
Subject: [PATCH 03/12] Fool.

---
 tests/authentication/server_test.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
index bd0b214e..a70ce384 100644
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
@@ -1,5 +1,7 @@
 <?php
 
+echo PHP_EOL.PHP_EOL.get_include_path().PHP_EOL.PHP_EOL;
+
 require_once 'src/OAuth2/Authentication/Server.php';
 require_once 'src/OAuth2/Authentication/Database.php';
 
@@ -15,11 +17,6 @@ class Authentication_Server_test extends PHPUnit_Framework_TestCase
         $this->oauth->registerDbAbstractor($this->oauthdb);
     }
 
-    public function test_ip()
-    {
-        echo PHP_EOL.PHP_EOL.get_include_path().PHP_EOL.PHP_EOL;
-    }
-
     public function test_setupWithOptions()
     {
         $o = new Oauth2\Authentication\Server(array(

From 8aba2b29b8453dd6715ae68888875a5a6e774f70 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 20:24:45 +0000
Subject: [PATCH 04/12] Better travis debugging

---
 tests/authentication/server_test.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
index a70ce384..15f1da87 100644
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
@@ -1,6 +1,10 @@
 <?php
 
-echo PHP_EOL.PHP_EOL.get_include_path().PHP_EOL.PHP_EOL;
+echo PHP_EOL.PHP_EOL.'DEBUG:'.PHP_EOL.PHP_EOL;
+echo 'getcwd: ' . getcwd() .PHP_EOL;
+echo 'include path: ' . get_include_path().PHP_EOL;
+echo '__FILE__: ' . __FILE__ . PHP_EOL;
+echo '__DIR__: ' . __DIR__ . PHP_EOL;
 
 require_once 'src/OAuth2/Authentication/Server.php';
 require_once 'src/OAuth2/Authentication/Database.php';

From a158883aed1573f5a926a60aa407666494436fc0 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 20:32:25 +0000
Subject: [PATCH 05/12] Another attempt to fix paths for travis

---
 tests/authentication/server_test.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
index 15f1da87..0f7a099e 100644
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
@@ -1,13 +1,7 @@
 <?php
 
-echo PHP_EOL.PHP_EOL.'DEBUG:'.PHP_EOL.PHP_EOL;
-echo 'getcwd: ' . getcwd() .PHP_EOL;
-echo 'include path: ' . get_include_path().PHP_EOL;
-echo '__FILE__: ' . __FILE__ . PHP_EOL;
-echo '__DIR__: ' . __DIR__ . PHP_EOL;
-
-require_once 'src/OAuth2/Authentication/Server.php';
-require_once 'src/OAuth2/Authentication/Database.php';
+require_once '../../src/OAuth2/Authentication/Server.php';
+require_once '../../src/OAuth2/Authentication/Database.php';
 
 class Authentication_Server_test extends PHPUnit_Framework_TestCase
 {

From 943fc1cc82f2302ccb1085399c83631c50845ce5 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 20:34:09 +0000
Subject: [PATCH 06/12] Possible fix for Travis?

---
 tests/authentication/server_test.php | 4 ++--
 tests/resource/server_test.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
index 0f7a099e..f5b4e091 100644
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once '../../src/OAuth2/Authentication/Server.php';
-require_once '../../src/OAuth2/Authentication/Database.php';
+require_once '../../../src/OAuth2/Authentication/Server.php';
+require_once '../../../src/OAuth2/Authentication/Database.php';
 
 class Authentication_Server_test extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php
index 8d5fac2d..9f5d52d9 100644
--- a/tests/resource/server_test.php
+++ b/tests/resource/server_test.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once 'src/OAuth2/Resource/Server.php';
-require_once 'src/OAuth2/Resource/Database.php';
+require_once '../../../src/OAuth2/Resource/Server.php';
+require_once '../../../src/OAuth2/Resource/Database.php';
 
 class Resource_Server_test extends PHPUnit_Framework_TestCase {
 

From 5ca63c921a92e9a8ca1cc693cd2ddd8a5f273cb2 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 21:13:12 +0000
Subject: [PATCH 07/12] Updated PHPUnit.xml

---
 build/phpunit.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build/phpunit.xml b/build/phpunit.xml
index 18e40915..29dde6c9 100644
--- a/build/phpunit.xml
+++ b/build/phpunit.xml
@@ -17,7 +17,8 @@
 		</blacklist>
 	</filter>
 	<logging>
-		<log type="coverage-html" target="coverage" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="35" highLowerBound="70"/>
+		<log type="coverage-html" target="coverage" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="50" highLowerBound="90"/>
+		<log type="coverage-text" target="php://stdout" title="lncd/OAuth" charset="UTF-8" yui="true" highlight="true" lowUpperBound="50" highLowerBound="90"/>
 		<log type="coverage-clover" target="logs/clover.xml"/>
 		<log type="junit" target="logs/junit.xml" logIncompleteSkipped="false"/>
 	</logging>

From 1069507ab4b24565bd0ea82bd61e18d8ef8a827b Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 21:13:32 +0000
Subject: [PATCH 08/12] Revert require_once statements

---
 tests/authentication/server_test.php | 4 ++--
 tests/resource/server_test.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
index f5b4e091..e7132ec7 100644
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once '../../../src/OAuth2/Authentication/Server.php';
-require_once '../../../src/OAuth2/Authentication/Database.php';
+require_once 'src/OAuth2/Authentication/Server.php';
+require_once 'src/OAuth2/Authentication/Database.php';
 
 class Authentication_Server_test extends PHPUnit_Framework_TestCase
 {
diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php
index 9f5d52d9..8d5fac2d 100644
--- a/tests/resource/server_test.php
+++ b/tests/resource/server_test.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once '../../../src/OAuth2/Resource/Server.php';
-require_once '../../../src/OAuth2/Resource/Database.php';
+require_once 'src/OAuth2/Resource/Server.php';
+require_once 'src/OAuth2/Resource/Database.php';
 
 class Resource_Server_test extends PHPUnit_Framework_TestCase {
 

From 1c3b319aa6c8f5521d5123f0e6affca94ee35010 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 21:22:09 +0000
Subject: [PATCH 09/12] Altered the script parameter of .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 133c78b8..ec9049bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ php:
   - 5.3
   - 5.4
 
-script: phpunit --coverage-text --configuration build/phpunit.xml
\ No newline at end of file
+script: phpunit -c build/phpunit.xml
\ No newline at end of file

From b10613c5e30de8bde6fb8f94b0037bc0a6e61242 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 21:31:33 +0000
Subject: [PATCH 10/12] Composer install

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index ec9049bc..fe21d0e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,5 @@ php:
   - 5.3
   - 5.4
 
+before_script: composer install
 script: phpunit -c build/phpunit.xml
\ No newline at end of file

From 5f1779c4e786879267ade96b8ee3d4e860c7f26b Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 22:32:49 +0000
Subject: [PATCH 11/12] Autoload dependencies with autoloader in bootstrap.php

---
 build/phpunit.xml                    | 2 +-
 tests/Bootstrap.php                  | 6 ++++++
 tests/authentication/server_test.php | 3 ---
 tests/resource/server_test.php       | 3 ---
 4 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 tests/Bootstrap.php

diff --git a/build/phpunit.xml b/build/phpunit.xml
index 29dde6c9..792b1799 100644
--- a/build/phpunit.xml
+++ b/build/phpunit.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false">
+<phpunit colors="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" stopOnError="false" stopOnFailure="false" stopOnIncomplete="false" stopOnSkipped="false" bootstrap="../tests/Bootstrap.php">
 	<testsuites>
 		<testsuite name="Authentication Server">
 			<directory suffix="test.php">../tests/authentication</directory>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
new file mode 100644
index 00000000..ff9fb28e
--- /dev/null
+++ b/tests/Bootstrap.php
@@ -0,0 +1,6 @@
+<?php
+
+if ( ! @include_once __DIR__ . '/../vendor/autoload.php')
+{
+    exit("You must set up the project dependencies, run the following commands:\n> wget http://getcomposer.org/composer.phar\n> php composer.phar install\n");
+}
\ No newline at end of file
diff --git a/tests/authentication/server_test.php b/tests/authentication/server_test.php
index e7132ec7..36ac49eb 100644
--- a/tests/authentication/server_test.php
+++ b/tests/authentication/server_test.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'src/OAuth2/Authentication/Server.php';
-require_once 'src/OAuth2/Authentication/Database.php';
-
 class Authentication_Server_test extends PHPUnit_Framework_TestCase
 {
     public function setUp()
diff --git a/tests/resource/server_test.php b/tests/resource/server_test.php
index 8d5fac2d..7db05113 100644
--- a/tests/resource/server_test.php
+++ b/tests/resource/server_test.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'src/OAuth2/Resource/Server.php';
-require_once 'src/OAuth2/Resource/Database.php';
-
 class Resource_Server_test extends PHPUnit_Framework_TestCase {
 
     function setUp()

From d65cdaf028863c7cb6e816b3422f2e849f9af1c6 Mon Sep 17 00:00:00 2001
From: Alex Bilbie <hello@alexbilbie.com>
Date: Wed, 2 Jan 2013 22:36:41 +0000
Subject: [PATCH 12/12] Version bump

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e87e8077..ff2341e4 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "lncd/oauth2",
 	"description": "OAuth 2.0 Framework",
-	"version": "0.4",
+	"version": "0.4.1",
 	"homepage": "https://github.com/lncd/OAuth2",
 	"license": "MIT",
 	"require": {