Skip to content

Commit

Permalink
Fixed heavy init breakages made in last commit
Browse files Browse the repository at this point in the history
  • Loading branch information
ssddanbrown committed Nov 19, 2017
1 parent ed88c62 commit 7668a99
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dist: trusty
sudo: false
language: php
php:
- 7.0.7
- 7.0.20
- 7.1.9

cache:
Expand Down
10 changes: 4 additions & 6 deletions artisan
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
25 changes: 25 additions & 0 deletions bootstrap/init.php
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 1 deletion phpunit.xml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
10 changes: 4 additions & 6 deletions public/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,15 @@

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

/*
|--------------------------------------------------------------------------
Expand Down

0 comments on commit 7668a99

Please sign in to comment.