github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-22 12:55:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed heavy init breakages made in last commit

Browse Source
This commit is contained in:
Dan Brown 2017-11-19 18:31:24 +00:00
parent ed88c623d6
commit 7668a999a2
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
5 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -2,7 +2,7 @@ dist: trusty
sudo: false
language: php
php:
- 7.0.7
- 7.0.20
- 7.1.9
cache:

10
artisan
View File

@ -5,17 +5,15 @@ define('LARAVEL_START', microtime(true));
/*
|--------------------------------------------------------------------------
| Register The Auto Loader
| Initialize The App
|--------------------------------------------------------------------------
|
| 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.
| We need to get things going before we start up the app.
| The init file loads everything in, in the correct order.
|
*/
require __DIR__.'/vendor/autoload.php';
require __DIR__.'/bootstrap/init.php';
$app = require_once __DIR__.'/bootstrap/app.php';

25
bootstrap/init.php Normal file
View File

@ -0,0 +1,25 @@
<?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';

2
phpunit.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit backupGlobals="false"
backupStaticAttributes="false"
bootstrap="bootstrap/autoload.php"
bootstrap="bootstrap/init.php"
colors="true"
convertErrorsToExceptions="true"
convertNoticesToExceptions="true"

10
public/index.php
View File

@ -11,17 +11,15 @@ define('LARAVEL_START', microtime(true));
/*
|--------------------------------------------------------------------------
| Register The Auto Loader
| Initialize The App
|--------------------------------------------------------------------------
|
| 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.
| We need to get things going before we start up the app.
| The init file loads everything in, in the correct order.
|
*/
require __DIR__.'/../vendor/autoload.php';
require __DIR__.'/../bootstrap/init.php';
/*
|--------------------------------------------------------------------------