Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Re-aligned init files with Laravel default

Browse Source 
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.
This commit is contained in:
Dan Brown 2020-10-31 23:05:48 +00:00
parent 474770af51
commit 82e671a06d
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
6 changed files with 23 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/helpers.php
View File

@ -7,9 +7,6 @@ use BookStack\Settings\SettingService;
/**
* Get the path to a versioned file.
*
* @param string $file
* @return 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.
* @return 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
{
@ -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.
* @param string $permission
* @param string|null $entityClass
* @return 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.
* @param string $key
* @param $default
* @return bool|string|SettingService
*/
function setting(string $key = null, $default = false)
{
$settingService = resolve(SettingService::class);
if (is_null($key)) {
return $settingService;
}
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');
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.
* @param $name
* @param array $attrs
* @return mixed
*/
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');
if ($themeIconPath && file_exists($themeIconPath)) {
$iconPath = $themeIconPath;
} else if (!file_exists($iconPath)) {

10
artisan
View File

@ -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';

25
bootstrap/init.php
View File

@ -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';

6
composer.json
View File

@ -35,7 +35,6 @@
"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",
@ -52,7 +51,10 @@
],
"psr-4": {
"BookStack\\": "app/"
}
},
"files": [
"app/helpers.php"
]
},
"autoload-dev": {
"psr-4": {

2
phpunit.xml
View File

@ -1,7 +1,7 @@
<?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"

10
public/index.php
View File

@ -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';
/*
|--------------------------------------------------------------------------