diff --git a/.travis.yml b/.travis.yml
index c4d289a53..e2eb5f511 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,6 @@ php:
cache:
directories:
- - node_modules
- $HOME/.composer/cache
addons:
@@ -16,9 +15,6 @@ addons:
- mysql-client-core-5.6
- mysql-client-5.6
-before_install:
- - npm install -g npm@latest
-
before_script:
- mysql -u root -e 'create database `bookstack-test`;'
- composer config -g github-oauth.github.com $GITHUB_ACCESS_TOKEN
@@ -26,8 +22,6 @@ before_script:
- composer self-update
- composer dump-autoload --no-interaction
- composer install --prefer-dist --no-interaction
- - npm install
- - ./node_modules/.bin/gulp
- php artisan clear-compiled -n
- php artisan optimize -n
- php artisan migrate --force -n --database=mysql_testing
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 40dd1ec10..57e807db0 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -47,19 +47,44 @@ class Handler extends ExceptionHandler
{
// Handle notify exceptions which will redirect to the
// specified location then show a notification message.
- if ($e instanceof NotifyException) {
- session()->flash('error', $e->message);
+ if ($this->isExceptionType($e, NotifyException::class)) {
+ session()->flash('error', $this->getOriginalMessage($e));
return redirect($e->redirectLocation);
}
// Handle pretty exceptions which will show a friendly application-fitting page
// Which will include the basic message to point the user roughly to the cause.
- if (($e instanceof PrettyException || $e->getPrevious() instanceof PrettyException) && !config('app.debug')) {
- $message = ($e instanceof PrettyException) ? $e->getMessage() : $e->getPrevious()->getMessage();
+ if ($this->isExceptionType($e, PrettyException::class) && !config('app.debug')) {
+ $message = $this->getOriginalMessage($e);
$code = ($e->getCode() === 0) ? 500 : $e->getCode();
return response()->view('errors/' . $code, ['message' => $message], $code);
}
return parent::render($request, $e);
}
+
+ /**
+ * Check the exception chain to compare against the original exception type.
+ * @param Exception $e
+ * @param $type
+ * @return bool
+ */
+ protected function isExceptionType(Exception $e, $type) {
+ do {
+ if (is_a($e, $type)) return true;
+ } while ($e = $e->getPrevious());
+ return false;
+ }
+
+ /**
+ * Get original exception message.
+ * @param Exception $e
+ * @return string
+ */
+ protected function getOriginalMessage(Exception $e) {
+ do {
+ $message = $e->getMessage();
+ } while ($e = $e->getPrevious());
+ return $message;
+ }
}
diff --git a/app/Exceptions/PrettyException.php b/app/Exceptions/PrettyException.php
index d92acf831..889252006 100644
--- a/app/Exceptions/PrettyException.php
+++ b/app/Exceptions/PrettyException.php
@@ -1,5 +1,3 @@
validSocialDrivers)) abort(404, 'Social Driver Not Found');
- if (!$this->checkDriverConfigured($driver)) throw new SocialDriverNotConfigured;
+ if (!$this->checkDriverConfigured($driver)) throw new SocialDriverNotConfigured("Your {$driver} social settings are not configured correctly.");
return $driver;
}
diff --git a/app/helpers.php b/app/helpers.php
index d28b1956f..b8abb1006 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -7,25 +7,32 @@ use BookStack\Ownable;
*
* @param string $file
* @return string
- *
- * @throws \InvalidArgumentException
+ * @throws Exception
*/
-function versioned_asset($file)
+function versioned_asset($file = '')
{
- static $manifest = null;
+ // Don't require css and JS assets for testing
+ if (config('app.env') === 'testing') return '';
- if (is_null($manifest)) {
- $manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
+ static $manifest = null;
+ $manifestPath = 'build/manifest.json';
+
+ if (is_null($manifest) && file_exists($manifestPath)) {
+ $manifest = json_decode(file_get_contents(public_path($manifestPath)), true);
+ } else if (!file_exists($manifestPath)) {
+ if (config('app.env') !== 'production') {
+ $path = public_path($manifestPath);
+ $error = "No {$path} file found, Ensure you have built the css/js assets using gulp.";
+ } else {
+ $error = "No {$manifestPath} file found, Ensure you are using the release version of BookStack";
+ }
+ throw new \Exception($error);
}
if (isset($manifest[$file])) {
return baseUrl($manifest[$file]);
}
- if (file_exists(public_path($file))) {
- return baseUrl($file);
- }
-
throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
}
diff --git a/phpunit.xml b/phpunit.xml
index 2150a5aa3..a2b26d413 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -28,7 +28,7 @@
-
+