github
/
flarum
mirror of https://github.com/flarum/flarum
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update dependencies, use Studio for managing core subdirectory.

pull/7/head
Franz Liedke 2015-04-01 12:22:28 +02:00
parent 91050da115
commit 0d5f949297
4 changed files with 184 additions and 1158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/autoload.php
View File

@ -16,8 +16,6 @@ define('LARAVEL_START', microtime(true));
require __DIR__.'/../vendor/autoload.php'; require __DIR__.'/../vendor/autoload.php';
require __DIR__.'/../flarum/core/vendor/autoload.php';
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Include The Compiled Class File | Include The Compiled Class File
@ -29,7 +27,7 @@ require __DIR__.'/../flarum/core/vendor/autoload.php';
| |
*/ */
$compiledPath = __DIR__.'/../storage/framework/compiled.php'; $compiledPath = __DIR__.'/../vendor/compiled.php';
if (file_exists($compiledPath)) if (file_exists($compiledPath))
{ {

3
composer.json
View File

@ -7,6 +7,9 @@
"require": { "require": {
"laravel/framework": "5.0.*" "laravel/framework": "5.0.*"
}, },
"require-dev": {
"franzl/studio": "1.0.x@dev"
},
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"App\\": "app/" "App\\": "app/"

1330
composer.lock generated
View File

File diff suppressed because it is too large Load Diff

5
studio.json Normal file
View File

@ -0,0 +1,5 @@
{
"packages": {
"flarum/core": "core"
}
}