Merge branch '3.1' into 3.2

orchestral · Mar 21, 2016 · 7bff913 · 7bff913
2 parents 5edc9a8 + 909d9c9
commit 7bff913
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/Processor/Installer.php b/src/Processor/Installer.php
@@ -183,6 +183,8 @@ protected function isAuthenticationInstallable(array $auth)
             return ($auth['provider']['driver'] === 'eloquent' && app($auth['provider']['model']) instanceof User);
         } catch (ReflectionException $e) {
             return false;
+        } finally {
+            return false;
         }
     }
 }
diff --git a/tests/InstallationTest.php b/tests/InstallationTest.php
@@ -121,6 +121,7 @@ public function testCreateAdminMethod()
     {
         $app = $this->app;
         $app['files'] = m::mock('\Illuminate\Filesystem\Filesystem');
+        $app['encrypter'] = m::mock('\Illuminate\Contracts\Encryption\Encrypter');
         $app['validator'] = $validator = m::mock('\Illuminate\Contracts\Validation\Validator');
         $app['orchestra.role'] = $role = m::mock('\Orchestra\Model\Role');
         $app['orchestra.user'] = $user = m::mock('\Orchestra\Model\User');