Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tweak how autoloaders are called. adjust phpunit bootstrap.

This commit is contained in:
Taylor Otwell 2013-01-23 23:33:47 -06:00
parent d19398614b
commit 9d3c3ea038
4 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
artisan
View File

@ -3,7 +3,7 @@
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Register The Composer Auto Loader | Register The Auto Loader
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Composer provides a convenient, automatically generated class loader | Composer provides a convenient, automatically generated class loader
@ -13,23 +13,7 @@
| |
*/ */
require __DIR__.'/vendor/autoload.php'; require __DIR__.'/bootstrap/autoload.php';
/*
|--------------------------------------------------------------------------
| Register The Workbench Loaders
|--------------------------------------------------------------------------
|
| The Laravel workbench provides a convenient place to develop packages
| when working locally. However we will need to load in the Composer
| auto-load files for the packages so that these can be used here.
|
*/
if (is_dir($workbench = __DIR__.'/workbench'))
{
Illuminate\Workbench\Starter::start($workbench);
}
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------

31
bootstrap/autoload.php Normal file
View File

@ -0,0 +1,31 @@
<?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';
/*
|--------------------------------------------------------------------------
| Register The Workbench Loaders
|--------------------------------------------------------------------------
|
| The Laravel workbench provides a convenient place to develop packages
| when working locally. However we will need to load in the Composer
| auto-load files for the packages so that these can be used here.
|
*/
if (is_dir($workbench = __DIR__.'/../workbench'))
{
Illuminate\Workbench\Starter::start($workbench);
}

2
phpunit.xml
View File

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

20
public/index.php
View File

@ -10,7 +10,7 @@
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Register The Composer Auto Loader | Register The Auto Loader
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Composer provides a convenient, automatically generated class loader | Composer provides a convenient, automatically generated class loader
@ -20,23 +20,7 @@
| |
*/ */
require __DIR__.'/../vendor/autoload.php'; require __DIR__.'/../bootstrap/autoload.php';
/*
|--------------------------------------------------------------------------
| Register The Workbench Loaders
|--------------------------------------------------------------------------
|
| The Laravel workbench provides a convenient place to develop packages
| when working locally. However we will need to load in the Composer
| auto-load files for the packages so that these can be used here.
|
*/
if (is_dir($workbench = __DIR__.'/../workbench'))
{
Illuminate\Workbench\Starter::start($workbench);
}
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------