Updated travis testing to work with new helper configuration (#175)

* Updated travis to call phpunit globally rather then booting application first
This commit is contained in:
Dan Brown 2016-08-27 11:27:23 +01:00 committed by GitHub
parent 7973412c29
commit 3f81eba13b
2 changed files with 26 additions and 27 deletions

View File

@ -6,7 +6,6 @@ php:
cache:
directories:
- vendor
- node_modules
- $HOME/.composer/cache
@ -29,8 +28,10 @@ before_script:
- 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
- php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
script:
- vendor/bin/phpunit
- phpunit

View File

@ -2,33 +2,31 @@
use BookStack\Ownable;
if (!function_exists('versioned_asset')) {
/**
* Get the path to a versioned file.
*
* @param string $file
* @return string
*
* @throws \InvalidArgumentException
*/
function versioned_asset($file)
{
static $manifest = null;
/**
* Get the path to a versioned file.
*
* @param string $file
* @return string
*
* @throws \InvalidArgumentException
*/
function versioned_asset($file)
{
static $manifest = null;
if (is_null($manifest)) {
$manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
}
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.");
if (is_null($manifest)) {
$manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
}
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.");
}
/**