diff --git a/app/Exceptions/Displayers/JsonValidationDisplayer.php b/app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php similarity index 96% rename from app/Exceptions/Displayers/JsonValidationDisplayer.php rename to app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php index 5c3ee86f..02fd20ad 100644 --- a/app/Exceptions/Displayers/JsonValidationDisplayer.php +++ b/app/Foundation/Exceptions/Displayers/JsonValidationDisplayer.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Exceptions\Displayers; +namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers; use AltThree\Validator\ValidationException; use Exception; diff --git a/app/Exceptions/Displayers/RedirectDisplayer.php b/app/Foundation/Exceptions/Displayers/RedirectDisplayer.php similarity index 97% rename from app/Exceptions/Displayers/RedirectDisplayer.php rename to app/Foundation/Exceptions/Displayers/RedirectDisplayer.php index f7b94206..147a2c97 100644 --- a/app/Exceptions/Displayers/RedirectDisplayer.php +++ b/app/Foundation/Exceptions/Displayers/RedirectDisplayer.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Exceptions\Displayers; +namespace CachetHQ\Cachet\Foundation\Exceptions\Displayers; use Exception; use GrahamCampbell\Exceptions\Displayers\DisplayerInterface; diff --git a/app/Exceptions/Filters/ApiFilter.php b/app/Foundation/Exceptions/Filters/ApiFilter.php similarity index 96% rename from app/Exceptions/Filters/ApiFilter.php rename to app/Foundation/Exceptions/Filters/ApiFilter.php index d0610699..447e6480 100644 --- a/app/Exceptions/Filters/ApiFilter.php +++ b/app/Foundation/Exceptions/Filters/ApiFilter.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Exceptions\Filters; +namespace CachetHQ\Cachet\Foundation\Exceptions\Filters; use Exception; use Illuminate\Http\Request; diff --git a/app/Exceptions/Transformers/ExceptionTransformer.php b/app/Foundation/Exceptions/Transformers/ExceptionTransformer.php similarity index 95% rename from app/Exceptions/Transformers/ExceptionTransformer.php rename to app/Foundation/Exceptions/Transformers/ExceptionTransformer.php index 2e4fb2b9..06776f45 100644 --- a/app/Exceptions/Transformers/ExceptionTransformer.php +++ b/app/Foundation/Exceptions/Transformers/ExceptionTransformer.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Exceptions\Transformers; +namespace CachetHQ\Cachet\Foundation\Exceptions\Transformers; use CachetHQ\Cachet\Exceptions\ExceptionInterface; use Exception; diff --git a/app/Providers/AppServiceProvider.php b/app/Foundation/Providers/AppServiceProvider.php similarity index 96% rename from app/Providers/AppServiceProvider.php rename to app/Foundation/Providers/AppServiceProvider.php index b6542bcb..4e1f8abc 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Foundation/Providers/AppServiceProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Providers; +namespace CachetHQ\Cachet\Foundation\Providers; use CachetHQ\Cachet\Dates\DateFactory; use Illuminate\Bus\Dispatcher; diff --git a/app/Providers/ComposerServiceProvider.php b/app/Foundation/Providers/ComposerServiceProvider.php similarity index 97% rename from app/Providers/ComposerServiceProvider.php rename to app/Foundation/Providers/ComposerServiceProvider.php index 54dcc96c..d30e6d13 100644 --- a/app/Providers/ComposerServiceProvider.php +++ b/app/Foundation/Providers/ComposerServiceProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Providers; +namespace CachetHQ\Cachet\Foundation\Providers; use CachetHQ\Cachet\Composers\AppComposer; use CachetHQ\Cachet\Composers\CurrentUserComposer; diff --git a/app/Providers/ConfigServiceProvider.php b/app/Foundation/Providers/ConfigServiceProvider.php similarity index 97% rename from app/Providers/ConfigServiceProvider.php rename to app/Foundation/Providers/ConfigServiceProvider.php index 49f4606f..5859f712 100644 --- a/app/Providers/ConfigServiceProvider.php +++ b/app/Foundation/Providers/ConfigServiceProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Providers; +namespace CachetHQ\Cachet\Foundation\Providers; use CachetHQ\Cachet\Config\Repository; use CachetHQ\Cachet\Facades\Setting; diff --git a/app/Providers/EventServiceProvider.php b/app/Foundation/Providers/EventServiceProvider.php similarity index 96% rename from app/Providers/EventServiceProvider.php rename to app/Foundation/Providers/EventServiceProvider.php index 502a1acf..19bc687a 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Foundation/Providers/EventServiceProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Providers; +namespace CachetHQ\Cachet\Foundation\Providers; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; diff --git a/app/Providers/GitHubServiceProvider.php b/app/Foundation/Providers/GitHubServiceProvider.php similarity index 94% rename from app/Providers/GitHubServiceProvider.php rename to app/Foundation/Providers/GitHubServiceProvider.php index 5a8da1cd..0bb80130 100644 --- a/app/Providers/GitHubServiceProvider.php +++ b/app/Foundation/Providers/GitHubServiceProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Providers; +namespace CachetHQ\Cachet\Foundation\Providers; use CachetHQ\Cachet\GitHub\Release; use Illuminate\Support\ServiceProvider; diff --git a/app/Providers/RepositoryServiceProvider.php b/app/Foundation/Providers/RepositoryServiceProvider.php similarity index 90% rename from app/Providers/RepositoryServiceProvider.php rename to app/Foundation/Providers/RepositoryServiceProvider.php index 1e71dd2b..01c796a4 100644 --- a/app/Providers/RepositoryServiceProvider.php +++ b/app/Foundation/Providers/RepositoryServiceProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Providers; +namespace CachetHQ\Cachet\Foundation\Providers; use CachetHQ\Cachet\Repositories\Metric\MetricRepository; use CachetHQ\Cachet\Repositories\Metric\MySqlRepository as MetricMySqlRepository; @@ -50,6 +50,6 @@ class RepositoryServiceProvider extends ServiceProvider return new MetricRepository($repository); }); - $this->app->alias('cachet.metricrepository', 'CachetHQ\Cachet\Repositories\Metric\MetricRepository'); + $this->app->alias('cachet.metricrepository', MetricRepository::class); } } diff --git a/app/Providers/RouteServiceProvider.php b/app/Foundation/Providers/RouteServiceProvider.php similarity index 97% rename from app/Providers/RouteServiceProvider.php rename to app/Foundation/Providers/RouteServiceProvider.php index 5fd691b1..6ad62b82 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Foundation/Providers/RouteServiceProvider.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Providers; +namespace CachetHQ\Cachet\Foundation\Providers; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; use Illuminate\Routing\Router; diff --git a/composer.json b/composer.json index deedb0be..416e1ad6 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "roumen/feed": "^2.9" }, "require-dev": { - "alt-three/testbench": "^1.0", + "alt-three/testbench": "^1.1", "filp/whoops": "^1.1", "fzaninotto/faker": "^1.5", "graham-campbell/testbench-core": "^1.1", diff --git a/composer.lock b/composer.lock index b3ad225a..e9c092b3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "d02e0141216bd2f17d2c97a5e7d0baab", - "content-hash": "2dd41f1dc4f63c1ffae8cb0fc62ebfb5", + "hash": "88ebd9e0385e7124bbc8a0fa4ac308b0", + "content-hash": "175a8a8dfa4cf51ba1f327401806d99e", "packages": [ { "name": "alt-three/emoji", @@ -3696,16 +3696,16 @@ "packages-dev": [ { "name": "alt-three/testbench", - "version": "v1.0.0", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/AltThree/TestBench.git", - "reference": "d3db224b22cc70fae5d7ce3d957d1a359648c92b" + "reference": "1fc2d7a725d2d85adc6a2dfba8975c37f701cb04" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/AltThree/TestBench/zipball/d3db224b22cc70fae5d7ce3d957d1a359648c92b", - "reference": "d3db224b22cc70fae5d7ce3d957d1a359648c92b", + "url": "https://api.github.com/repos/AltThree/TestBench/zipball/1fc2d7a725d2d85adc6a2dfba8975c37f701cb04", + "reference": "1fc2d7a725d2d85adc6a2dfba8975c37f701cb04", "shasum": "" }, "require": { @@ -3721,7 +3721,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -3753,7 +3753,7 @@ "TestBench", "app" ], - "time": "2015-12-06 11:51:01" + "time": "2015-12-07 21:57:27" }, { "name": "doctrine/instantiator", diff --git a/config/app.php b/config/app.php index d2432aea..0dd92df3 100644 --- a/config/app.php +++ b/config/app.php @@ -167,13 +167,13 @@ return [ /* * Application Service Providers... */ - 'CachetHQ\Cachet\Providers\AppServiceProvider', - 'CachetHQ\Cachet\Providers\ComposerServiceProvider', - 'CachetHQ\Cachet\Providers\ConfigServiceProvider', - 'CachetHQ\Cachet\Providers\EventServiceProvider', - 'CachetHQ\Cachet\Providers\GitHubServiceProvider', - 'CachetHQ\Cachet\Providers\RepositoryServiceProvider', - 'CachetHQ\Cachet\Providers\RouteServiceProvider', + 'CachetHQ\Cachet\Foundation\Providers\AppServiceProvider', + 'CachetHQ\Cachet\Foundation\Providers\ComposerServiceProvider', + 'CachetHQ\Cachet\Foundation\Providers\ConfigServiceProvider', + 'CachetHQ\Cachet\Foundation\Providers\EventServiceProvider', + 'CachetHQ\Cachet\Foundation\Providers\GitHubServiceProvider', + 'CachetHQ\Cachet\Foundation\Providers\RepositoryServiceProvider', + 'CachetHQ\Cachet\Foundation\Providers\RouteServiceProvider', ]), diff --git a/config/exceptions.php b/config/exceptions.php index 11064dd6..06760e33 100644 --- a/config/exceptions.php +++ b/config/exceptions.php @@ -27,7 +27,7 @@ return [ 'transformers' => [ 'GrahamCampbell\Exceptions\Transformers\CsrfTransformer', - 'CachetHQ\Cachet\Exceptions\Transformers\ExceptionTransformer', + 'CachetHQ\Cachet\Foundation\Exceptions\Transformers\ExceptionTransformer', ], /* @@ -45,8 +45,8 @@ return [ */ 'displayers' => [ - 'CachetHQ\Cachet\Exceptions\Displayers\JsonValidationDisplayer', - 'CachetHQ\Cachet\Exceptions\Displayers\RedirectDisplayer', + 'CachetHQ\Cachet\Foundation\Exceptions\Displayers\JsonValidationDisplayer', + 'CachetHQ\Cachet\Foundation\Exceptions\Displayers\RedirectDisplayer', 'GrahamCampbell\Exceptions\Displayers\DebugDisplayer', 'GrahamCampbell\Exceptions\Displayers\HtmlDisplayer', 'GrahamCampbell\Exceptions\Displayers\JsonDisplayer', @@ -70,7 +70,7 @@ return [ 'GrahamCampbell\Exceptions\Filters\VerboseFilter', 'GrahamCampbell\Exceptions\Filters\CanDisplayFilter', 'GrahamCampbell\Exceptions\Filters\ContentTypeFilter', - 'CachetHQ\Cachet\Exceptions\Filters\ApiFilter', + 'CachetHQ\Cachet\Foundation\Exceptions\Filters\ApiFilter', ], /*