Re-aligned init files with Laravel default

Removed the custom init elements that we added in 2017 to
custom load the helpers file and instead load via composer.

Also removed laravel-microscope package due to not running due to
helpers file.

diff --git a/app/helpers.php b/app/helpers.php
index 83017c37dddda3c81043c7f29b1aad080e8e346e..935d4d8daee4a2d4600dc0394e85c28c7184c48e 100644 (file)
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -7,9 +7,6 @@ use BookStack\Settings\SettingService;
 
 /**
  * Get the path to a versioned file.
 
 /**
  * Get the path to a versioned file.

- *
- * @param  string $file
- * @return string

  * @throws Exception
  */
 function versioned_asset(string $file = ''): string
  * @throws Exception
  */
 function versioned_asset(string $file = ''): string


@@ -33,7 +30,6 @@ function versioned_asset(string $file = ''): string
 /**
  * Helper method to get the current User.
  * Defaults to public 'Guest' user if not logged in.
 /**
  * Helper method to get the current User.
  * Defaults to public 'Guest' user if not logged in.

- * @return User

  */
 function user(): User
 {
  */
 function user(): User
 {


@@ -57,9 +53,8 @@ function hasAppAccess(): bool
 }
 
 /**
 }
 
 /**

- * Check if the current user has a permission.
- * If an ownable element is passed in the jointPermissions are checked against
- * that particular item.
+ * Check if the current user has a permission. If an ownable element
+ * is passed in the jointPermissions are checked against that particular item.

  */
 function userCan(string $permission, Ownable $ownable = null): bool
 {
  */
 function userCan(string $permission, Ownable $ownable = null): bool
 {


@@ -75,9 +70,6 @@ function userCan(string $permission, Ownable $ownable = null): bool
 /**
  * Check if the current user has the given permission
  * on any item in the system.
 /**
  * Check if the current user has the given permission
  * on any item in the system.

- * @param string $permission
- * @param string|null $entityClass
- * @return bool

  */
 function userCanOnAny(string $permission, string $entityClass = null): bool
 {
  */
 function userCanOnAny(string $permission, string $entityClass = null): bool
 {


@@ -87,27 +79,26 @@ function userCanOnAny(string $permission, string $entityClass = null): bool
 
 /**
  * Helper to access system settings.
 
 /**
  * Helper to access system settings.

- * @param string $key
- * @param $default

  * @return bool|string|SettingService
  */
 function setting(string $key = null, $default = false)
 {
     $settingService = resolve(SettingService::class);
  * @return bool|string|SettingService
  */
 function setting(string $key = null, $default = false)
 {
     $settingService = resolve(SettingService::class);

+

     if (is_null($key)) {
         return $settingService;
     }
     if (is_null($key)) {
         return $settingService;
     }

+

     return $settingService->get($key, $default);
 }
 
 /**
  * Get a path to a theme resource.
     return $settingService->get($key, $default);
 }
 
 /**
  * Get a path to a theme resource.

- * @param string $path
- * @return string

  */
 function theme_path(string $path = ''): string
 {
     $theme = config('view.theme');
  */
 function theme_path(string $path = ''): string
 {
     $theme = config('view.theme');

+

     if (!$theme) {
         return '';
     }
     if (!$theme) {
         return '';
     }


@@ -121,9 +112,6 @@ function theme_path(string $path = ''): string
  * to the 'resources/assets/icons' folder.
  *
  * Returns an empty string if icon file not found.
  * to the 'resources/assets/icons' folder.
  *
  * Returns an empty string if icon file not found.

- * @param $name
- * @param array $attrs
- * @return mixed

  */
 function icon(string $name, array $attrs = []): string
 {
  */
 function icon(string $name, array $attrs = []): string
 {


@@ -139,6 +127,7 @@ function icon(string $name, array $attrs = []): string
 
     $iconPath = resource_path('icons/' . $name . '.svg');
     $themeIconPath = theme_path('icons/' . $name . '.svg');
 
     $iconPath = resource_path('icons/' . $name . '.svg');
     $themeIconPath = theme_path('icons/' . $name . '.svg');

+

     if ($themeIconPath && file_exists($themeIconPath)) {
         $iconPath = $themeIconPath;
     } else if (!file_exists($iconPath)) {
     if ($themeIconPath && file_exists($themeIconPath)) {
         $iconPath = $themeIconPath;
     } else if (!file_exists($iconPath)) {

diff --git a/artisan b/artisan
index dad16dcdefdee1989b99de8cddffffe06d10a381..d5c6aaf98542479db38a44dce76de952dbc34de6 100755 (executable)
--- a/artisan
+++ b/artisan
@@ -5,15 +5,17 @@ define('LARAVEL_START', microtime(true));
 
 /*
 |--------------------------------------------------------------------------
 
 /*
 |--------------------------------------------------------------------------

-| Initialize The App
+| Register The Auto Loader

 |--------------------------------------------------------------------------
 |
 |--------------------------------------------------------------------------
 |

-| We need to get things going before we start up the app.
-| The init file loads everything in, in the correct order.
+| Composer provides a convenient, automatically generated class loader
+| for our application. We just need to utilize it! We'll require it
+| into the script here so that we do not have to worry about the
+| loading of any our classes "manually". Feels great to relax.

 |
 */
 
 |
 */
 

-require __DIR__.'/bootstrap/init.php';
+require __DIR__.'/vendor/autoload.php';

 
 $app = require_once __DIR__.'/bootstrap/app.php';
 
 
 $app = require_once __DIR__.'/bootstrap/app.php';
 

diff --git a/bootstrap/init.php b/bootstrap/init.php
deleted file mode 100644 (file)
index 7d9e43f..0000000
--- a/bootstrap/init.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Load Our Own Helpers
-|--------------------------------------------------------------------------
-|
-| This custom function loads any helpers, before the Laravel Framework
-| is built so we can override any helpers as we please.
-|
-*/
-require __DIR__.'/../app/helpers.php';
-
-/*
-|--------------------------------------------------------------------------
-| Register The Composer Auto Loader
-|--------------------------------------------------------------------------
-|
-| Composer provides a convenient, automatically generated class loader
-| for our application. We just need to utilize it! We'll require it
-| into the script here so that we do not have to worry about the
-| loading of any our classes "manually". Feels great to relax.
-|
-*/
-require __DIR__.'/../vendor/autoload.php';
\ No newline at end of file

diff --git a/composer.json b/composer.json
index c6e45462e238e7c5a3587f857f8b5da451510132..8a2b7d656552e4c05aaad75242f61aba45156594 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,6 @@
         "socialiteproviders/twitch": "^5.0"
     },
     "require-dev": {
         "socialiteproviders/twitch": "^5.0"
     },
     "require-dev": {

-          "imanghafoori/laravel-microscope": "^1.0",

         "barryvdh/laravel-debugbar": "^3.2.8",
         "barryvdh/laravel-ide-helper": "^2.6.4",
         "fzaninotto/faker": "^1.4",
         "barryvdh/laravel-debugbar": "^3.2.8",
         "barryvdh/laravel-ide-helper": "^2.6.4",
         "fzaninotto/faker": "^1.4",


@@ -52,7 +51,10 @@
         ],
         "psr-4": {
             "BookStack\\": "app/"
         ],
         "psr-4": {
             "BookStack\\": "app/"

-        }
+        },
+               "files": [
+                       "app/helpers.php"
+               ]

     },
     "autoload-dev": {
         "psr-4": {
     },
     "autoload-dev": {
         "psr-4": {

diff --git a/phpunit.xml b/phpunit.xml
index 70f1c1f9c3ed341b39af5baa54e79af2de7a70ab..ad7c6f43a5d551eec767dadda32f047d64ded014 100644 (file)
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"

-         bootstrap="bootstrap/init.php"
+         bootstrap="vendor/autoload.php"

          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

diff --git a/public/index.php b/public/index.php
index 8205764728cdb1dc6bd8bdfb78f20ebec5525ac3..9d890e90a4ef4cd9ade7b25b434248c63766d3d0 100644 (file)
--- a/public/index.php
+++ b/public/index.php
@@ -11,15 +11,17 @@ define('LARAVEL_START', microtime(true));
 
 /*
 |--------------------------------------------------------------------------
 
 /*
 |--------------------------------------------------------------------------

-| Initialize The App
+| Register The Auto Loader

 |--------------------------------------------------------------------------
 |
 |--------------------------------------------------------------------------
 |

-| We need to get things going before we start up the app.
-| The init file loads everything in, in the correct order.
+| Composer provides a convenient, automatically generated class loader for
+| our application. We just need to utilize it! We'll simply require it
+| into the script here so that we don't have to worry about manual
+| loading any of our classes later on. It feels great to relax.

 |
 */
 
 |
 */
 

-require __DIR__.'/../bootstrap/init.php';
+require __DIR__.'/../vendor/autoload.php';

 
 /*
 |--------------------------------------------------------------------------
 
 /*
 |--------------------------------------------------------------------------