From 3385ec3f7859dfe949807dd4c48c07c05b64e355 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 2 May 2016 10:35:42 +0100
Subject: [PATCH 1/3] Updated database config to be codeship compatible

---
 config/database.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/database.php b/config/database.php
index e4d6880c7..832852dc2 100644
--- a/config/database.php
+++ b/config/database.php
@@ -84,8 +84,8 @@ return [
             'driver'    => 'mysql',
             'host'      => 'localhost',
             'database'  => 'bookstack-test',
-            'username'  => 'bookstack-test',
-            'password'  => 'bookstack-test',
+            'username'  => env('MYSQL_USER', 'bookstack-test'),
+            'password'  => env('MYSQL_PASSWORD', 'bookstack-test'),
             'charset'   => 'utf8',
             'collation' => 'utf8_unicode_ci',
             'prefix'    => '',

From 5c1015d6fc9231a37b8155c601befb2c9ae1104d Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 2 May 2016 11:26:47 +0100
Subject: [PATCH 2/3] Updated social testing compatibility

---
 app/Services/SocialAuthService.php | 3 ---
 phpunit.xml                        | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/Services/SocialAuthService.php b/app/Services/SocialAuthService.php
index df213609a..ba3479349 100644
--- a/app/Services/SocialAuthService.php
+++ b/app/Services/SocialAuthService.php
@@ -1,14 +1,11 @@
 <?php namespace BookStack\Services;
 
-use GuzzleHttp\Exception\ClientException;
 use Laravel\Socialite\Contracts\Factory as Socialite;
 use BookStack\Exceptions\SocialDriverNotConfigured;
 use BookStack\Exceptions\SocialSignInException;
 use BookStack\Exceptions\UserRegistrationException;
-use BookStack\Http\Controllers\Auth\AuthController;
 use BookStack\Repos\UserRepo;
 use BookStack\SocialAccount;
-use BookStack\User;
 
 class SocialAuthService
 {
diff --git a/phpunit.xml b/phpunit.xml
index 66196e8cf..2150a5aa3 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -34,5 +34,6 @@
         <env name="GITHUB_APP_SECRET" value="aaaaaaaaaaaaaa"/>
         <env name="GOOGLE_APP_ID" value="aaaaaaaaaaaaaa"/>
         <env name="GOOGLE_APP_SECRET" value="aaaaaaaaaaaaaa"/>
+        <env name="APP_URL" value="http://bookstack.dev"/>
     </php>
 </phpunit>

From 3a1cda580250ff120f29a051b4a3c61178c6f267 Mon Sep 17 00:00:00 2001
From: Dan Brown <ssddanbrown@googlemail.com>
Date: Mon, 2 May 2016 11:38:07 +0100
Subject: [PATCH 3/3] Updated ldap so extension not required in testing

---
 app/Services/Ldap.php        | 11 +++++++++++
 app/Services/LdapService.php |  2 +-
 tests/Auth/LdapTest.php      |  6 +++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/Services/Ldap.php b/app/Services/Ldap.php
index cfefbb4b6..196e46a2f 100644
--- a/app/Services/Ldap.php
+++ b/app/Services/Ldap.php
@@ -33,6 +33,17 @@ class Ldap
         return ldap_set_option($ldapConnection, $option, $value);
     }
 
+    /**
+     * Set the version number for the given ldap connection.
+     * @param $ldapConnection
+     * @param $version
+     * @return bool
+     */
+    public function setVersion($ldapConnection, $version)
+    {
+        return $this->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $version);
+    }
+
     /**
      * Search LDAP tree using the provided filter.
      * @param resource   $ldapConnection
diff --git a/app/Services/LdapService.php b/app/Services/LdapService.php
index 3d89e1e44..b7f101ad2 100644
--- a/app/Services/LdapService.php
+++ b/app/Services/LdapService.php
@@ -122,7 +122,7 @@ class LdapService
 
         // Set any required options
         if ($this->config['version']) {
-            $this->ldap->setOption($ldapConnection, LDAP_OPT_PROTOCOL_VERSION, $this->config['version']);
+            $this->ldap->setVersion($ldapConnection, $this->config['version']);
         }
 
         $this->ldapConnection = $ldapConnection;
diff --git a/tests/Auth/LdapTest.php b/tests/Auth/LdapTest.php
index b52b6ffe1..76fbc662a 100644
--- a/tests/Auth/LdapTest.php
+++ b/tests/Auth/LdapTest.php
@@ -22,7 +22,7 @@ class LdapTest extends \TestCase
     public function test_login()
     {
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
-        $this->mockLdap->shouldReceive('setOption')->once();
+        $this->mockLdap->shouldReceive('setVersion')->once();
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(4)
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [
@@ -49,7 +49,7 @@ class LdapTest extends \TestCase
     public function test_login_works_when_no_uid_provided_by_ldap_server()
     {
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
-        $this->mockLdap->shouldReceive('setOption')->once();
+        $this->mockLdap->shouldReceive('setVersion')->once();
         $ldapDn = 'cn=test-user,dc=test' . config('services.ldap.base_dn');
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
@@ -73,7 +73,7 @@ class LdapTest extends \TestCase
     public function test_initial_incorrect_details()
     {
         $this->mockLdap->shouldReceive('connect')->once()->andReturn($this->resourceId);
-        $this->mockLdap->shouldReceive('setOption')->once();
+        $this->mockLdap->shouldReceive('setVersion')->once();
         $this->mockLdap->shouldReceive('searchAndGetEntries')->times(2)
             ->with($this->resourceId, config('services.ldap.base_dn'), Mockery::type('string'), Mockery::type('array'))
             ->andReturn(['count' => 1, 0 => [