From 27847b68142f4e35ac2b50d6ef48bb0b30996c4e Mon Sep 17 00:00:00 2001 From: James Brooks Date: Mon, 30 Jan 2017 13:30:45 +0000 Subject: [PATCH] Move DateFactory into Services namespace --- .../Commands/Incident/ReportIncidentCommandHandler.php | 6 +++--- .../Commands/Incident/UpdateIncidentCommandHandler.php | 6 +++--- .../Commands/Metric/AddMetricPointCommandHandler.php | 6 +++--- .../Commands/Metric/UpdateMetricPointCommandHandler.php | 6 +++--- .../Commands/Schedule/CreateScheduleCommandHandler.php | 6 +++--- .../Commands/Schedule/UpdateScheduleCommandHandler.php | 6 +++--- app/Composers/AppComposer.php | 6 +++--- app/Composers/Modules/StickiedComposer.php | 2 +- app/Foundation/Providers/AppServiceProvider.php | 2 +- app/Foundation/Providers/RepositoryServiceProvider.php | 2 +- app/Http/Controllers/StatusPageController.php | 2 +- app/Presenters/ComponentPresenter.php | 2 +- app/Presenters/IncidentPresenter.php | 6 +++--- app/Presenters/IncidentUpdatePresenter.php | 2 +- app/Presenters/SchedulePresenter.php | 6 +++--- app/Presenters/SubscriberPresenter.php | 2 +- app/Presenters/Traits/TimestampsTrait.php | 2 +- app/Repositories/Metric/MetricRepository.php | 6 +++--- app/{ => Services}/Dates/DateFactory.php | 2 +- tests/Foundation/Providers/AppServiceProviderTest.php | 3 ++- 20 files changed, 41 insertions(+), 40 deletions(-) rename app/{ => Services}/Dates/DateFactory.php (98%) diff --git a/app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php b/app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php index 100ad8bf..47d5595c 100644 --- a/app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php +++ b/app/Bus/Handlers/Commands/Incident/ReportIncidentCommandHandler.php @@ -15,7 +15,7 @@ use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand; use CachetHQ\Cachet\Bus\Commands\Incident\ReportIncidentCommand; use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasReportedEvent; use CachetHQ\Cachet\Bus\Exceptions\Incident\InvalidIncidentTimestampException; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\Incident; use CachetHQ\Cachet\Models\IncidentTemplate; @@ -33,14 +33,14 @@ class ReportIncidentCommandHandler /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; /** * Create a new report incident command handler instance. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * * @return void */ diff --git a/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php b/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php index 75088f86..942f0200 100644 --- a/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php +++ b/app/Bus/Handlers/Commands/Incident/UpdateIncidentCommandHandler.php @@ -15,7 +15,7 @@ use CachetHQ\Cachet\Bus\Commands\Component\UpdateComponentCommand; use CachetHQ\Cachet\Bus\Commands\Incident\UpdateIncidentCommand; use CachetHQ\Cachet\Bus\Events\Incident\IncidentWasUpdatedEvent; use CachetHQ\Cachet\Bus\Exceptions\Incident\InvalidIncidentTimestampException; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\Incident; use CachetHQ\Cachet\Models\IncidentTemplate; @@ -32,14 +32,14 @@ class UpdateIncidentCommandHandler /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; /** * Create a new update incident command handler instance. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * * @return void */ diff --git a/app/Bus/Handlers/Commands/Metric/AddMetricPointCommandHandler.php b/app/Bus/Handlers/Commands/Metric/AddMetricPointCommandHandler.php index ce34b149..4ad9d6d3 100644 --- a/app/Bus/Handlers/Commands/Metric/AddMetricPointCommandHandler.php +++ b/app/Bus/Handlers/Commands/Metric/AddMetricPointCommandHandler.php @@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Metric; use CachetHQ\Cachet\Bus\Commands\Metric\AddMetricPointCommand; use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasAddedEvent; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\MetricPoint; use Carbon\Carbon; @@ -22,14 +22,14 @@ class AddMetricPointCommandHandler /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; /** * Create a new add metric point command handler instance. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * * @return void */ diff --git a/app/Bus/Handlers/Commands/Metric/UpdateMetricPointCommandHandler.php b/app/Bus/Handlers/Commands/Metric/UpdateMetricPointCommandHandler.php index aec34b63..b75e5b1d 100644 --- a/app/Bus/Handlers/Commands/Metric/UpdateMetricPointCommandHandler.php +++ b/app/Bus/Handlers/Commands/Metric/UpdateMetricPointCommandHandler.php @@ -13,21 +13,21 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Metric; use CachetHQ\Cachet\Bus\Commands\Metric\UpdateMetricPointCommand; use CachetHQ\Cachet\Bus\Events\Metric\MetricPointWasUpdatedEvent; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; class UpdateMetricPointCommandHandler { /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; /** * Create a new update metric point command handler instance. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * * @return void */ diff --git a/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php b/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php index 0f684d27..a1f010bf 100644 --- a/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php +++ b/app/Bus/Handlers/Commands/Schedule/CreateScheduleCommandHandler.php @@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Schedule; use CachetHQ\Cachet\Bus\Commands\Schedule\CreateScheduleCommand; use CachetHQ\Cachet\Bus\Events\Schedule\ScheduleWasCreatedEvent; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\Schedule; /** @@ -26,14 +26,14 @@ class CreateScheduleCommandHandler /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; /** * Create a new update schedule command handler instance. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * * @return void */ diff --git a/app/Bus/Handlers/Commands/Schedule/UpdateScheduleCommandHandler.php b/app/Bus/Handlers/Commands/Schedule/UpdateScheduleCommandHandler.php index ae9889ae..af4bc2e1 100644 --- a/app/Bus/Handlers/Commands/Schedule/UpdateScheduleCommandHandler.php +++ b/app/Bus/Handlers/Commands/Schedule/UpdateScheduleCommandHandler.php @@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Bus\Handlers\Commands\Schedule; use CachetHQ\Cachet\Bus\Commands\Schedule\UpdateScheduleCommand; use CachetHQ\Cachet\Bus\Events\Schedule\ScheduleWasUpdatedEvent; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\Schedule; /** @@ -26,14 +26,14 @@ class UpdateScheduleCommandHandler /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; /** * Create a new update schedule command handler instance. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * * @return void */ diff --git a/app/Composers/AppComposer.php b/app/Composers/AppComposer.php index 00a6523b..a2a136ac 100644 --- a/app/Composers/AppComposer.php +++ b/app/Composers/AppComposer.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Composers; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use GrahamCampbell\Markdown\Facades\Markdown; use Illuminate\Contracts\Config\Repository; use Illuminate\Contracts\View\View; @@ -27,7 +27,7 @@ class AppComposer /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; @@ -41,7 +41,7 @@ class AppComposer /** * Create a new app composer instance. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * @param \Illuminate\Contracts\Config\Repository $config * * @return void diff --git a/app/Composers/Modules/StickiedComposer.php b/app/Composers/Modules/StickiedComposer.php index 948abbcc..f1ea85a0 100644 --- a/app/Composers/Modules/StickiedComposer.php +++ b/app/Composers/Modules/StickiedComposer.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Composers\Modules; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\Incident; use Illuminate\Contracts\View\View; diff --git a/app/Foundation/Providers/AppServiceProvider.php b/app/Foundation/Providers/AppServiceProvider.php index 0c93d6ed..77bf2906 100644 --- a/app/Foundation/Providers/AppServiceProvider.php +++ b/app/Foundation/Providers/AppServiceProvider.php @@ -13,7 +13,7 @@ namespace CachetHQ\Cachet\Foundation\Providers; use AltThree\Bus\Dispatcher; use CachetHQ\Cachet\Bus\Middleware\UseDatabaseTransactions; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use Illuminate\Support\ServiceProvider; use Illuminate\Support\Str; diff --git a/app/Foundation/Providers/RepositoryServiceProvider.php b/app/Foundation/Providers/RepositoryServiceProvider.php index 539ab586..6fdb2732 100644 --- a/app/Foundation/Providers/RepositoryServiceProvider.php +++ b/app/Foundation/Providers/RepositoryServiceProvider.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Foundation\Providers; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Repositories\Metric\MetricRepository; use CachetHQ\Cachet\Repositories\Metric\MySqlRepository; use CachetHQ\Cachet\Repositories\Metric\PgSqlRepository; diff --git a/app/Http/Controllers/StatusPageController.php b/app/Http/Controllers/StatusPageController.php index a73b6420..8097c65f 100644 --- a/app/Http/Controllers/StatusPageController.php +++ b/app/Http/Controllers/StatusPageController.php @@ -12,7 +12,7 @@ namespace CachetHQ\Cachet\Http\Controllers; use AltThree\Badger\Facades\Badger; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Http\Controllers\Api\AbstractApiController; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\Incident; diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php index 6bae6460..c03ee241 100644 --- a/app/Presenters/ComponentPresenter.php +++ b/app/Presenters/ComponentPresenter.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Presenters; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait; use Illuminate\Contracts\Support\Arrayable; use McCool\LaravelAutoPresenter\BasePresenter; diff --git a/app/Presenters/IncidentPresenter.php b/app/Presenters/IncidentPresenter.php index 5676368b..28d9331b 100644 --- a/app/Presenters/IncidentPresenter.php +++ b/app/Presenters/IncidentPresenter.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Presenters; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\Incident; use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait; use GrahamCampbell\Markdown\Facades\Markdown; @@ -25,7 +25,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; @@ -45,7 +45,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable /** * Create a new presenter. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * @param \CachetHQ\Cachet\Models\Incident $resource * * @return void diff --git a/app/Presenters/IncidentUpdatePresenter.php b/app/Presenters/IncidentUpdatePresenter.php index 88029e42..de32371c 100644 --- a/app/Presenters/IncidentUpdatePresenter.php +++ b/app/Presenters/IncidentUpdatePresenter.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Presenters; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait; use GrahamCampbell\Markdown\Facades\Markdown; use Illuminate\Contracts\Support\Arrayable; diff --git a/app/Presenters/SchedulePresenter.php b/app/Presenters/SchedulePresenter.php index ad6a559d..f58a25df 100644 --- a/app/Presenters/SchedulePresenter.php +++ b/app/Presenters/SchedulePresenter.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Presenters; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\Schedule; use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait; use GrahamCampbell\Markdown\Facades\Markdown; @@ -30,14 +30,14 @@ class SchedulePresenter extends BasePresenter implements Arrayable /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; /** * Create a new presenter. * - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * @param \CachetHQ\Cachet\Models\Schedule $resource * * @return void diff --git a/app/Presenters/SubscriberPresenter.php b/app/Presenters/SubscriberPresenter.php index 72795b3a..a6c2c829 100644 --- a/app/Presenters/SubscriberPresenter.php +++ b/app/Presenters/SubscriberPresenter.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Presenters; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Presenters\Traits\TimestampsTrait; use Illuminate\Contracts\Support\Arrayable; use McCool\LaravelAutoPresenter\BasePresenter; diff --git a/app/Presenters/Traits/TimestampsTrait.php b/app/Presenters/Traits/TimestampsTrait.php index 56553e21..8642ac7a 100644 --- a/app/Presenters/Traits/TimestampsTrait.php +++ b/app/Presenters/Traits/TimestampsTrait.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Presenters\Traits; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use Illuminate\Support\Facades\Config; /** diff --git a/app/Repositories/Metric/MetricRepository.php b/app/Repositories/Metric/MetricRepository.php index 7da85f28..f136f57c 100644 --- a/app/Repositories/Metric/MetricRepository.php +++ b/app/Repositories/Metric/MetricRepository.php @@ -11,7 +11,7 @@ namespace CachetHQ\Cachet\Repositories\Metric; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Cachet\Models\Metric; use DateInterval; @@ -32,7 +32,7 @@ class MetricRepository /** * The date factory instance. * - * @var \CachetHQ\Cachet\Dates\DateFactory + * @var \CachetHQ\Cachet\Services\Dates\DateFactory */ protected $dates; @@ -40,7 +40,7 @@ class MetricRepository * Create a new metric repository class. * * @param \CachetHQ\Cachet\Repositories\Metric\MetricInterface $repository - * @param \CachetHQ\Cachet\Dates\DateFactory $dates + * @param \CachetHQ\Cachet\Services\Dates\DateFactory $dates * * @return void */ diff --git a/app/Dates/DateFactory.php b/app/Services/Dates/DateFactory.php similarity index 98% rename from app/Dates/DateFactory.php rename to app/Services/Dates/DateFactory.php index 59c39786..3cb725e8 100644 --- a/app/Dates/DateFactory.php +++ b/app/Services/Dates/DateFactory.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -namespace CachetHQ\Cachet\Dates; +namespace CachetHQ\Cachet\Services\Dates; use Carbon\Carbon; use DateTimeZone; diff --git a/tests/Foundation/Providers/AppServiceProviderTest.php b/tests/Foundation/Providers/AppServiceProviderTest.php index ed931ff8..f3147cf1 100644 --- a/tests/Foundation/Providers/AppServiceProviderTest.php +++ b/tests/Foundation/Providers/AppServiceProviderTest.php @@ -12,13 +12,14 @@ namespace CachetHQ\Tests\Cachet\Foundation\Providers; use AltThree\TestBench\ServiceProviderTrait; -use CachetHQ\Cachet\Dates\DateFactory; +use CachetHQ\Cachet\Services\Dates\DateFactory; use CachetHQ\Tests\Cachet\AbstractTestCase; /** * This is the app service provider test class. * * @author Graham Campbell + * @author James Brooks */ class AppServiceProviderTest extends AbstractTestCase {