Skip to content
This repository was archived by the owner on Feb 23, 2021. It is now read-only.

Commit 71f6f85

Browse files
committed
Upgrade to Laravel 5.1
1 parent 2ceab15 commit 71f6f85

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

bootstrap/autoload.php

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?php
22

3+
//FIXME Laravel 5.1 出現 Maximum function nesting level of '100' reached, aborting! 的暫時解法
4+
//來源:http://stackoverflow.com/questions/30803342
5+
ini_set('xdebug.max_nesting_level', 120);
6+
37
define('LARAVEL_START', microtime(true));
48

59
/*
@@ -14,7 +18,7 @@
1418
|
1519
*/
1620

17-
require __DIR__.'/../vendor/autoload.php';
21+
require __DIR__ . '/../vendor/autoload.php';
1822

1923
/*
2024
|--------------------------------------------------------------------------
@@ -27,9 +31,8 @@
2731
|
2832
*/
2933

30-
$compiledPath = __DIR__.'/../storage/framework/compiled.php';
34+
$compiledPath = __DIR__ . '/cache/compiled.php';
3135

32-
if (file_exists($compiledPath))
33-
{
36+
if (file_exists($compiledPath)) {
3437
require $compiledPath;
3538
}

bootstrap/cache/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.gitignore

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"license": "MIT",
99
"type": "project",
1010
"require": {
11-
"laravel/framework": "5.0.*",
12-
"illuminate/html": "5.*",
11+
"laravel/framework": "5.1.*",
12+
"laravelcollective/html": "~5.0",
1313
"doctrine/dbal": "~2.4",
1414
"guzzlehttp/guzzle": "~5.2",
1515
"fzaninotto/faker": "1.5.*@dev",

config/app.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
'Illuminate\Translation\TranslationServiceProvider',
136136
'Illuminate\Validation\ValidationServiceProvider',
137137
'Illuminate\View\ViewServiceProvider',
138-
'Illuminate\Html\HtmlServiceProvider',
138+
'Collective\Html\HtmlServiceProvider',
139139
'Conner\Tagging\TaggingServiceProvider',
140140
'AlfredoRamos\ParsedownExtra\ParsedownExtraServiceProvider',
141141
'Rap2hpoutre\LaravelLogViewer\LaravelLogViewerServiceProvider',
@@ -197,8 +197,8 @@
197197
'URL' => 'Illuminate\Support\Facades\URL',
198198
'Validator' => 'Illuminate\Support\Facades\Validator',
199199
'View' => 'Illuminate\Support\Facades\View',
200-
'HTML' => 'Illuminate\Html\HtmlFacade',
201-
'Form' => 'Illuminate\Html\FormFacade',
200+
'HTML' => 'Collective\Html\HtmlFacade',
201+
'Form' => 'Collective\Html\FormFacade',
202202
'Markdown' => 'AlfredoRamos\ParsedownExtra\Facades\ParsedownExtra',
203203
'Excel' => 'Maatwebsite\Excel\Facades\Excel',
204204
'Carbon' => 'Carbon\Carbon',

0 commit comments

Comments
 (0)