From dccb9bccb1b7b40137e125a5283ec43e3fc0f0b5 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 1 Jan 2015 12:11:21 +0000 Subject: [PATCH 1/5] CS fixes --- app/CachetHQ/Cachet/Service/EmailService.php | 3 +++ .../Cachet/Support/ServiceProviders/RoutingServiceProvider.php | 1 + app/CachetHQ/Cachet/Transformers/IncidentTransformer.php | 1 + 3 files changed, 5 insertions(+) diff --git a/app/CachetHQ/Cachet/Service/EmailService.php b/app/CachetHQ/Cachet/Service/EmailService.php index acb13a95..fa4f90e7 100644 --- a/app/CachetHQ/Cachet/Service/EmailService.php +++ b/app/CachetHQ/Cachet/Service/EmailService.php @@ -8,13 +8,16 @@ class EmailService implements ServiceInterface public function register() { + // } public function unregister() { + // } public function fire($data) { + // } } diff --git a/app/CachetHQ/Cachet/Support/ServiceProviders/RoutingServiceProvider.php b/app/CachetHQ/Cachet/Support/ServiceProviders/RoutingServiceProvider.php index 20578640..79289c05 100644 --- a/app/CachetHQ/Cachet/Support/ServiceProviders/RoutingServiceProvider.php +++ b/app/CachetHQ/Cachet/Support/ServiceProviders/RoutingServiceProvider.php @@ -9,6 +9,7 @@ class RoutingServiceProvider extends ServiceProvider { public function register() { + // } public function boot() diff --git a/app/CachetHQ/Cachet/Transformers/IncidentTransformer.php b/app/CachetHQ/Cachet/Transformers/IncidentTransformer.php index 571c7c53..50bf7c82 100644 --- a/app/CachetHQ/Cachet/Transformers/IncidentTransformer.php +++ b/app/CachetHQ/Cachet/Transformers/IncidentTransformer.php @@ -10,6 +10,7 @@ class IncidentTransformer extends TransformerAbstract public function transform(Incident $incident) { $component = $incident->component; + if ($component) { $transformer = $component->getTransformer(); } From a14c28b287000b215911e1a1e8bdb7a7ed53b897 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 1 Jan 2015 12:22:59 +0000 Subject: [PATCH 2/5] Fix controller imports --- app/CachetHQ/Cachet/Controllers/Api/ComponentController.php | 2 +- app/CachetHQ/Cachet/Controllers/Api/IncidentController.php | 2 +- app/CachetHQ/Cachet/Controllers/Api/MetricController.php | 2 +- app/CachetHQ/Cachet/Controllers/Api/MetricPointController.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/CachetHQ/Cachet/Controllers/Api/ComponentController.php b/app/CachetHQ/Cachet/Controllers/Api/ComponentController.php index 9a94c77a..34f32894 100644 --- a/app/CachetHQ/Cachet/Controllers/Api/ComponentController.php +++ b/app/CachetHQ/Cachet/Controllers/Api/ComponentController.php @@ -5,7 +5,7 @@ namespace CachetHQ\Cachet\Controllers\Api; use CachetHQ\Cachet\Repositories\Component\ComponentRepository; use Dingo\Api\Routing\ControllerTrait; use Illuminate\Routing\Controller; -use Input; +use Illuminate\Support\Facades\Input; class ComponentController extends Controller { diff --git a/app/CachetHQ/Cachet/Controllers/Api/IncidentController.php b/app/CachetHQ/Cachet/Controllers/Api/IncidentController.php index 7b9653be..6670afb3 100644 --- a/app/CachetHQ/Cachet/Controllers/Api/IncidentController.php +++ b/app/CachetHQ/Cachet/Controllers/Api/IncidentController.php @@ -5,7 +5,7 @@ namespace CachetHQ\Cachet\Controllers\Api; use CachetHQ\Cachet\Repositories\Incident\IncidentRepository; use Dingo\Api\Routing\ControllerTrait; use Illuminate\Routing\Controller; -use Input; +use Illuminate\Support\Facades\Input; class IncidentController extends Controller { diff --git a/app/CachetHQ/Cachet/Controllers/Api/MetricController.php b/app/CachetHQ/Cachet/Controllers/Api/MetricController.php index 5edd184c..7360c124 100644 --- a/app/CachetHQ/Cachet/Controllers/Api/MetricController.php +++ b/app/CachetHQ/Cachet/Controllers/Api/MetricController.php @@ -5,7 +5,7 @@ namespace CachetHQ\Cachet\Controllers\Api; use CachetHQ\Cachet\Repositories\Metric\MetricRepository; use Dingo\Api\Routing\ControllerTrait; use Illuminate\Routing\Controller; -use Input; +use Illuminate\Support\Facades\Input; class MetricController extends Controller { diff --git a/app/CachetHQ/Cachet/Controllers/Api/MetricPointController.php b/app/CachetHQ/Cachet/Controllers/Api/MetricPointController.php index 0f5da8cc..ffc0d245 100644 --- a/app/CachetHQ/Cachet/Controllers/Api/MetricPointController.php +++ b/app/CachetHQ/Cachet/Controllers/Api/MetricPointController.php @@ -5,7 +5,7 @@ namespace CachetHQ\Cachet\Controllers\Api; use CachetHQ\Cachet\Repositories\MetricPoint\MetricPointRepository; use Dingo\Api\Routing\ControllerTrait; use Illuminate\Routing\Controller; -use Input; +use Illuminate\Support\Facades\Input; class MetricPointController extends Controller { From a4427080623f923bf76ab3cbbb9361c2cd983728 Mon Sep 17 00:00:00 2001 From: Graham Campbell Date: Thu, 1 Jan 2015 12:23:17 +0000 Subject: [PATCH 3/5] Cleanup models --- app/models/Component.php | 37 +++++++++------------ app/models/Incident.php | 6 ++-- app/models/IncidentTemplate.php | 8 ++--- app/models/Metric.php | 11 ++++--- app/models/MetricPoint.php | 4 ++- app/models/Service.php | 3 +- app/models/Setting.php | 12 +++---- app/models/Subscriber.php | 6 ++-- app/models/User.php | 12 +++---- app/models/WebHook.php | 58 +++++++++++++++------------------ app/models/WebHookResponse.php | 6 ++-- 11 files changed, 79 insertions(+), 84 deletions(-) diff --git a/app/models/Component.php b/app/models/Component.php index c63974fe..c3a3edd4 100644 --- a/app/models/Component.php +++ b/app/models/Component.php @@ -1,11 +1,14 @@ 'integer|required', @@ -14,20 +17,12 @@ class Component extends Eloquent implements \Dingo\Api\Transformer\Transformable 'link' => 'url', ]; - protected $fillable = [ - 'name', - 'description', - 'status', - 'user_id', - 'tags', - 'link', - 'order', - ]; + protected $fillable = ['name', 'description', 'status', 'user_id', 'tags', 'link', 'order']; /** * Lookup all of the incidents reported on the component. * - * @return Illuminate\Database\Eloquent\Relations + * @return \Illuminate\Database\Eloquent\Relations */ public function incidents() { @@ -37,10 +32,10 @@ class Component extends Eloquent implements \Dingo\Api\Transformer\Transformable /** * Finds all components by status. * - * @param Illuminate\Database\Eloquent\Builder $query - * @param int $status + * @param \Illuminate\Database\Eloquent\Builder $query + * @param int $status * - * @return Illuminate\Database\Eloquent\Builder + * @return \Illuminate\Database\Eloquent\Builder */ public function scopeStatus($query, $status) { @@ -50,10 +45,10 @@ class Component extends Eloquent implements \Dingo\Api\Transformer\Transformable /** * Finds all components which don't have the given status. * - * @param Illuminate\Database\Eloquent\Builder $query - * @param int $status + * @param \Illuminate\Database\Eloquent\Builder $query + * @param int $status * - * @return Illuminate\Database\Eloquent\Builder + * @return \Illuminate\Database\Eloquent\Builder */ public function scopeNotStatus($query, $status) { @@ -73,10 +68,10 @@ class Component extends Eloquent implements \Dingo\Api\Transformer\Transformable /** * Get the transformer instance. * - * @return ComponentTransformer + * @return \CachetHQ\Cachet\Transformers\ComponentTransformer */ public function getTransformer() { - return new CachetHQ\Cachet\Transformers\ComponentTransformer(); + return new ComponentTransformer(); } } diff --git a/app/models/Incident.php b/app/models/Incident.php index 86ffe0da..6af2b8dd 100644 --- a/app/models/Incident.php +++ b/app/models/Incident.php @@ -1,10 +1,12 @@ 'required', ]; - protected $fillable = [ - 'name', - 'template', - ]; + protected $fillable = ['name', 'template']; /** * Overrides the models boot method. diff --git a/app/models/Metric.php b/app/models/Metric.php index 7f83a570..739e04e3 100644 --- a/app/models/Metric.php +++ b/app/models/Metric.php @@ -1,8 +1,11 @@ first()->value; - } catch (\ErrorException $e) { + } catch (ErrorException $e) { // If we don't have a setting, check the env (fallback for original version) if ($checkEnv) { if (!($setting = getenv(strtoupper($settingName)))) { @@ -39,14 +41,12 @@ class Setting extends Eloquent * * @param string $setting * - * @throws Exception + * @throws \Exception * * @return void */ public static function unknownSettingException($setting) { - throw new \Exception( - sprintf('Unknown setting %s', $setting) - ); + throw new Exception(sprintf('Unknown setting %s', $setting)); } } diff --git a/app/models/Subscriber.php b/app/models/Subscriber.php index 4bb8f065..f30766d1 100644 --- a/app/models/Subscriber.php +++ b/app/models/Subscriber.php @@ -1,12 +1,12 @@ 'required|email', diff --git a/app/models/User.php b/app/models/User.php index b7b40ab7..9a6522bf 100644 --- a/app/models/User.php +++ b/app/models/User.php @@ -4,8 +4,10 @@ use Illuminate\Auth\Reminders\RemindableInterface; use Illuminate\Auth\Reminders\RemindableTrait; use Illuminate\Auth\UserInterface; use Illuminate\Auth\UserTrait; +use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Hash; -class User extends Eloquent implements UserInterface, RemindableInterface +class User extends Model implements UserInterface, RemindableInterface { use UserTrait, RemindableTrait; @@ -33,7 +35,7 @@ class User extends Eloquent implements UserInterface, RemindableInterface /** * Hash any password being inserted by default. * - * @param string @password + * @param string $password * * @return void */ @@ -51,10 +53,6 @@ class User extends Eloquent implements UserInterface, RemindableInterface */ public function getGravatarAttribute($size = 200) { - return sprintf( - 'https://www.gravatar.com/avatar/%s?size=%d', - md5($this->email), - $size - ); + return sprintf('https://www.gravatar.com/avatar/%s?size=%d', md5($this->email), $size); } } diff --git a/app/models/WebHook.php b/app/models/WebHook.php index 263e5911..159935b4 100644 --- a/app/models/WebHook.php +++ b/app/models/WebHook.php @@ -1,6 +1,10 @@ createRequest($this->requestMethod, $this->endpoint, [ 'headers' => [ 'X-Cachet-Event' => $eventType, @@ -64,7 +68,7 @@ class WebHook extends Eloquent try { $response = $client->send($request); - } catch (\GuzzleHttp\Exception\ClientException $e) { + } catch (ClientException $e) { // Do nothing with the exception, we want it. $response = $e->getResponse(); } @@ -72,14 +76,14 @@ class WebHook extends Eloquent $timeTaken = microtime(true) - $startTime; // Store the request - $hookResponse = new WebHookResponse(); - $hookResponse->web_hook_id = $this->id; - $hookResponse->response_code = $response->getStatusCode(); - $hookResponse->sent_headers = json_encode($request->getHeaders()); - $hookResponse->sent_body = json_encode($data); - $hookResponse->recv_headers = json_encode($response->getHeaders()); - $hookResponse->recv_body = json_encode($response->getBody()); - $hookResponse->time_taken = $timeTaken; + $hookResponse = new WebHookResponse(); + $hookResponse->web_hook_id = $this->id; + $hookResponse->response_code = $response->getStatusCode(); + $hookResponse->sent_headers = json_encode($request->getHeaders()); + $hookResponse->sent_body = json_encode($data); + $hookResponse->recv_headers = json_encode($response->getHeaders()); + $hookResponse->recv_body = json_encode($response->getBody()); + $hookResponse->time_taken = $timeTaken; $hookResponse->save(); return $hookResponse; @@ -88,7 +92,7 @@ class WebHook extends Eloquent /** * Returns a human readable request type name. * - * @throws Exception + * @throws \Exception * * @return string HEAD, GET, POST, DELETE, PATCH, PUT etc */ @@ -98,29 +102,19 @@ class WebHook extends Eloquent switch ($this->request_type) { case self::HEAD: - $requestMethod = 'HEAD'; - break; + return 'HEAD'; case self::GET: - $requestMethod = 'GET'; - break; + return 'GET'; case self::POST: - $requestMethod = 'POST'; - break; + return 'POST'; case self::PATCH: - $requestMethod = 'PATCH'; - break; + return 'PATCH'; case self::PUT: - $requestMethod = 'PUT'; - break; + return 'PUT'; case self::DELETE: - $requestMethod = 'DELETE'; - break; - + return 'DELETE'; default: throw new Exception('Unknown request type value: '.$this->request_type); - break; } - - return $requestMethod; } } diff --git a/app/models/WebHookResponse.php b/app/models/WebHookResponse.php index f21bad6c..e11e7f21 100644 --- a/app/models/WebHookResponse.php +++ b/app/models/WebHookResponse.php @@ -1,11 +1,13 @@ Date: Thu, 1 Jan 2015 12:25:21 +0000 Subject: [PATCH 4/5] Order imports correctly --- app/models/Subscriber.php | 2 +- app/models/WebHook.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/Subscriber.php b/app/models/Subscriber.php index f30766d1..66f53f90 100644 --- a/app/models/Subscriber.php +++ b/app/models/Subscriber.php @@ -1,7 +1,7 @@ Date: Thu, 1 Jan 2015 13:53:31 +0000 Subject: [PATCH 5/5] Cleanup migration files --- .../2014_11_16_224719_CreateIncidentsTable.php | 1 + .../2014_11_16_224937_CreateComponentsTable.php | 1 + .../2014_11_17_144232_CreateSettingsTable.php | 1 + .../2014_11_22_134023_CreateWebHooksTable.php | 1 + .../2014_11_22_134136_CreateWebHookResponsesTable.php | 1 + .../migrations/2014_11_24_153408_CreateUsersTable.php | 1 + .../2014_11_24_164650_CreateIncidentTemplatesTable.php | 1 + .../2014_11_25_111315_CreateMetricsTable.php | 1 + .../2014_11_25_111609_CreateMetricPointsTable.php | 1 + .../2014_11_25_114040_UserIdColumnForComponents.php | 1 + .../2014_11_25_114101_UserIdColumnForIncidents.php | 1 + .../2014_11_25_160545_CreateSubscribersTable.php | 1 + .../2014_11_26_164111_CreateServicesTable.php | 1 + ...121947_AlterTableIncidentsRenameComponentColumn.php | 1 + ...21410_AlterTableIncidentsRemoveDefaultComponent.php | 3 +++ .../2014_12_13_122009_create_session_table.php | 10 ++++++---- ...4_12_13_135117_AlterTableComponentsAddDeletedAt.php | 1 + ...12_30_150326_AlterTableComponentsAddMetaColumns.php | 1 + ...14_12_31_115936_AlterTableSettingsValueLongText.php | 2 ++ ...01_01_122720_AlterTableComponentsAddOrderColumn.php | 1 + 20 files changed, 28 insertions(+), 4 deletions(-) diff --git a/app/database/migrations/2014_11_16_224719_CreateIncidentsTable.php b/app/database/migrations/2014_11_16_224719_CreateIncidentsTable.php index f0804e96..f558fac1 100644 --- a/app/database/migrations/2014_11_16_224719_CreateIncidentsTable.php +++ b/app/database/migrations/2014_11_16_224719_CreateIncidentsTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateIncidentsTable extends Migration { diff --git a/app/database/migrations/2014_11_16_224937_CreateComponentsTable.php b/app/database/migrations/2014_11_16_224937_CreateComponentsTable.php index 1168edd6..369bd0e9 100644 --- a/app/database/migrations/2014_11_16_224937_CreateComponentsTable.php +++ b/app/database/migrations/2014_11_16_224937_CreateComponentsTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateComponentsTable extends Migration { diff --git a/app/database/migrations/2014_11_17_144232_CreateSettingsTable.php b/app/database/migrations/2014_11_17_144232_CreateSettingsTable.php index bfff94bd..2ea0c8a2 100644 --- a/app/database/migrations/2014_11_17_144232_CreateSettingsTable.php +++ b/app/database/migrations/2014_11_17_144232_CreateSettingsTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateSettingsTable extends Migration { diff --git a/app/database/migrations/2014_11_22_134023_CreateWebHooksTable.php b/app/database/migrations/2014_11_22_134023_CreateWebHooksTable.php index 5bd852c3..b911c39f 100644 --- a/app/database/migrations/2014_11_22_134023_CreateWebHooksTable.php +++ b/app/database/migrations/2014_11_22_134023_CreateWebHooksTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateWebHooksTable extends Migration { diff --git a/app/database/migrations/2014_11_22_134136_CreateWebHookResponsesTable.php b/app/database/migrations/2014_11_22_134136_CreateWebHookResponsesTable.php index 1830f9a6..51369739 100644 --- a/app/database/migrations/2014_11_22_134136_CreateWebHookResponsesTable.php +++ b/app/database/migrations/2014_11_22_134136_CreateWebHookResponsesTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateWebHookResponsesTable extends Migration { diff --git a/app/database/migrations/2014_11_24_153408_CreateUsersTable.php b/app/database/migrations/2014_11_24_153408_CreateUsersTable.php index 9cf75abd..3e0d04c0 100644 --- a/app/database/migrations/2014_11_24_153408_CreateUsersTable.php +++ b/app/database/migrations/2014_11_24_153408_CreateUsersTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateUsersTable extends Migration { diff --git a/app/database/migrations/2014_11_24_164650_CreateIncidentTemplatesTable.php b/app/database/migrations/2014_11_24_164650_CreateIncidentTemplatesTable.php index 8518fa50..c256f273 100644 --- a/app/database/migrations/2014_11_24_164650_CreateIncidentTemplatesTable.php +++ b/app/database/migrations/2014_11_24_164650_CreateIncidentTemplatesTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateIncidentTemplatesTable extends Migration { diff --git a/app/database/migrations/2014_11_25_111315_CreateMetricsTable.php b/app/database/migrations/2014_11_25_111315_CreateMetricsTable.php index 65bd2a4d..844abee9 100644 --- a/app/database/migrations/2014_11_25_111315_CreateMetricsTable.php +++ b/app/database/migrations/2014_11_25_111315_CreateMetricsTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateMetricsTable extends Migration { diff --git a/app/database/migrations/2014_11_25_111609_CreateMetricPointsTable.php b/app/database/migrations/2014_11_25_111609_CreateMetricPointsTable.php index c16e4a20..f92f2e71 100644 --- a/app/database/migrations/2014_11_25_111609_CreateMetricPointsTable.php +++ b/app/database/migrations/2014_11_25_111609_CreateMetricPointsTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateMetricPointsTable extends Migration { diff --git a/app/database/migrations/2014_11_25_114040_UserIdColumnForComponents.php b/app/database/migrations/2014_11_25_114040_UserIdColumnForComponents.php index d98fa73a..719a5a48 100644 --- a/app/database/migrations/2014_11_25_114040_UserIdColumnForComponents.php +++ b/app/database/migrations/2014_11_25_114040_UserIdColumnForComponents.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class UserIdColumnForComponents extends Migration { diff --git a/app/database/migrations/2014_11_25_114101_UserIdColumnForIncidents.php b/app/database/migrations/2014_11_25_114101_UserIdColumnForIncidents.php index 5ad9d6ff..f3dadefc 100644 --- a/app/database/migrations/2014_11_25_114101_UserIdColumnForIncidents.php +++ b/app/database/migrations/2014_11_25_114101_UserIdColumnForIncidents.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class UserIdColumnForIncidents extends Migration { diff --git a/app/database/migrations/2014_11_25_160545_CreateSubscribersTable.php b/app/database/migrations/2014_11_25_160545_CreateSubscribersTable.php index 49133189..6a915494 100644 --- a/app/database/migrations/2014_11_25_160545_CreateSubscribersTable.php +++ b/app/database/migrations/2014_11_25_160545_CreateSubscribersTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateSubscribersTable extends Migration { diff --git a/app/database/migrations/2014_11_26_164111_CreateServicesTable.php b/app/database/migrations/2014_11_26_164111_CreateServicesTable.php index 66dfcfca..b4a56121 100644 --- a/app/database/migrations/2014_11_26_164111_CreateServicesTable.php +++ b/app/database/migrations/2014_11_26_164111_CreateServicesTable.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class CreateServicesTable extends Migration { diff --git a/app/database/migrations/2014_12_01_121947_AlterTableIncidentsRenameComponentColumn.php b/app/database/migrations/2014_12_01_121947_AlterTableIncidentsRenameComponentColumn.php index f4d9c6dc..3e38090d 100644 --- a/app/database/migrations/2014_12_01_121947_AlterTableIncidentsRenameComponentColumn.php +++ b/app/database/migrations/2014_12_01_121947_AlterTableIncidentsRenameComponentColumn.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class AlterTableIncidentsRenameComponentColumn extends Migration { diff --git a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php index 7b67d1aa..739e969a 100644 --- a/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php +++ b/app/database/migrations/2014_12_13_121410_AlterTableIncidentsRemoveDefaultComponent.php @@ -2,6 +2,9 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Config; +use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Schema; class AlterTableIncidentsRemoveDefaultComponent extends Migration { diff --git a/app/database/migrations/2014_12_13_122009_create_session_table.php b/app/database/migrations/2014_12_13_122009_create_session_table.php index a09061cc..37c5b65e 100644 --- a/app/database/migrations/2014_12_13_122009_create_session_table.php +++ b/app/database/migrations/2014_12_13_122009_create_session_table.php @@ -1,6 +1,8 @@ string('id')->unique(); - $t->text('payload'); - $t->integer('last_activity'); + Schema::create('sessions', function (Blueprint $table) { + $table->string('id')->unique(); + $table->text('payload'); + $table->integer('last_activity'); }); } diff --git a/app/database/migrations/2014_12_13_135117_AlterTableComponentsAddDeletedAt.php b/app/database/migrations/2014_12_13_135117_AlterTableComponentsAddDeletedAt.php index 394c09aa..1b53c0ad 100644 --- a/app/database/migrations/2014_12_13_135117_AlterTableComponentsAddDeletedAt.php +++ b/app/database/migrations/2014_12_13_135117_AlterTableComponentsAddDeletedAt.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class AlterTableComponentsAddDeletedAt extends Migration { diff --git a/app/database/migrations/2014_12_30_150326_AlterTableComponentsAddMetaColumns.php b/app/database/migrations/2014_12_30_150326_AlterTableComponentsAddMetaColumns.php index 4c114efb..df78cb5f 100644 --- a/app/database/migrations/2014_12_30_150326_AlterTableComponentsAddMetaColumns.php +++ b/app/database/migrations/2014_12_30_150326_AlterTableComponentsAddMetaColumns.php @@ -2,6 +2,7 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; +use Illuminate\Support\Facades\Schema; class AlterTableComponentsAddMetaColumns extends Migration { diff --git a/app/database/migrations/2014_12_31_115936_AlterTableSettingsValueLongText.php b/app/database/migrations/2014_12_31_115936_AlterTableSettingsValueLongText.php index 6b4dbe68..88d19076 100644 --- a/app/database/migrations/2014_12_31_115936_AlterTableSettingsValueLongText.php +++ b/app/database/migrations/2014_12_31_115936_AlterTableSettingsValueLongText.php @@ -1,6 +1,8 @@