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

* Updated travis to call phpunit globally rather then booting application first

@@ -6,7 +6,6 @@ php:
 
 
 cache:
 cache:
   directories:
   directories:
-    - vendor
     - node_modules
     - node_modules
     - $HOME/.composer/cache
     - $HOME/.composer/cache
 
 
@@ -29,8 +28,10 @@ before_script:
   - composer install --prefer-dist --no-interaction
   - composer install --prefer-dist --no-interaction
   - npm install
   - npm install
   - ./node_modules/.bin/gulp
   - ./node_modules/.bin/gulp
+  - php artisan clear-compiled -n
+  - php artisan optimize -n
   - php artisan migrate --force -n --database=mysql_testing
   - php artisan migrate --force -n --database=mysql_testing
   - php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
   - php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
 
 
 script:
 script:
-  - vendor/bin/phpunit
\ No newline at end of file
+  - phpunit
\ No newline at end of file

@@ -2,8 +2,7 @@
 
 
 use BookStack\Ownable;
 use BookStack\Ownable;
 
 
-if (!function_exists('versioned_asset')) {
-    /**
+/**
  * Get the path to a versioned file.
  * Get the path to a versioned file.
  *
  *
  * @param  string $file
  * @param  string $file
@@ -11,8 +10,8 @@ if (!function_exists('versioned_asset')) {
  *
  *
  * @throws \InvalidArgumentException
  * @throws \InvalidArgumentException
  */
  */
-    function versioned_asset($file)
-    {
+function versioned_asset($file)
+{
     static $manifest = null;
     static $manifest = null;
 
 
     if (is_null($manifest)) {
     if (is_null($manifest)) {
@@ -28,7 +27,6 @@ if (!function_exists('versioned_asset')) {
     }
     }
 
 
     throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
     throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
-    }
 }
 }
 
 
 /**
 /**