Skip to content
This repository was archived by the owner on Dec 11, 2020. It is now read-only.

Commit 3ad685a

Browse files
committed
Merge branch '5.3'
2 parents 82341e3 + 99624f4 commit 3ad685a

19 files changed

+7
-466
lines changed

TODO.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"type": "project",
77
"require": {
88
"php": ">=5.6.4",
9-
"laravel/framework": "5.3.*"
9+
"laravel/framework": "5.3.*",
10+
"lucid-arch/laravel-foundation": "5.3.*"
1011
},
1112
"require-dev": {
1213
"fzaninotto/faker": "~1.4",

config/app.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
Framework\Providers\EventServiceProvider::class,
179179
Framework\Providers\RouteServiceProvider::class,
180180

181-
App\Foundation\Providers\ServiceProvider::class,
181+
App\Foundation\ServiceProvider::class,
182182
Lucid\Console\LucidServiceProvider::class,
183183
],
184184

src/Domains/Http/Jobs/RespondWithJsonErrorJob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Trellis\Domains\Http\Jobs;
3+
namespace App\Domains\Http\Jobs;
44

55
use Illuminate\Routing\ResponseFactory;
66

src/Domains/Http/Jobs/RespondWithJsonJob.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace App\Domains\Http\Jobs;
44

5-
use App\Foundation\Job;
5+
use Lucid\Foundation\Job;
66
use Illuminate\Routing\ResponseFactory;
77

88
class RespondWithJsonJob extends Job

src/Foundation/Feature.php

Lines changed: 0 additions & 65 deletions
This file was deleted.

src/Foundation/Http/Controller.php

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Foundation/InvalidInputException.php

Lines changed: 0 additions & 26 deletions
This file was deleted.

src/Foundation/Job.php

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/Foundation/MarshalTrait.php

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)