diff --git a/.travis.yml b/.travis.yml index bea8d1795..c4d289a53 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 \ No newline at end of file + - phpunit \ No newline at end of file diff --git a/app/helpers.php b/app/helpers.php index e4f9b1b10..d28b1956f 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -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."); } /**