@@ -32,7 +32,7 @@ |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | // If the form is not valid display a notification |
35 | - if (! $this->isValid()) { |
|
35 | + if (!$this->isValid()) { |
|
36 | 36 | ucnotify(uctrans('notification.form.not_valid', $module), 'error'); |
37 | 37 | } |
38 | 38 |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | $this->registerTranslations(); |
28 | 28 | $this->registerPublishing(); |
29 | 29 | |
30 | - $this->loadViewsFrom(__DIR__ . '/../../resources/views', 'uccello'); |
|
30 | + $this->loadViewsFrom(__DIR__.'/../../resources/views', 'uccello'); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | /** |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | private function registerMigrations() |
39 | 39 | { |
40 | 40 | if ($this->app->runningInConsole()) { |
41 | - $this->loadMigrationsFrom(__DIR__ . '/../../database/migrations'); |
|
41 | + $this->loadMigrationsFrom(__DIR__.'/../../database/migrations'); |
|
42 | 42 | } |
43 | 43 | } |
44 | 44 | |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | */ |
50 | 50 | private function registerTranslations() |
51 | 51 | { |
52 | - $this->loadTranslationsFrom(__DIR__ . '/../../resources/lang', 'uccello'); |
|
52 | + $this->loadTranslationsFrom(__DIR__.'/../../resources/lang', 'uccello'); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | /** |
@@ -62,18 +62,18 @@ discard block |
||
62 | 62 | if ($this->app->runningInConsole()) { |
63 | 63 | // Publish assets |
64 | 64 | $this->publishes([ |
65 | - __DIR__ . '/../../public' => public_path('vendor/uccello/uccello'), |
|
66 | - __DIR__ . '/../../public/images/vendor' => public_path('images/vendor') |
|
65 | + __DIR__.'/../../public' => public_path('vendor/uccello/uccello'), |
|
66 | + __DIR__.'/../../public/images/vendor' => public_path('images/vendor') |
|
67 | 67 | ], 'uccello-assets'); |
68 | 68 | |
69 | 69 | // Config |
70 | 70 | $this->publishes([ |
71 | - __DIR__ . '/../../config/uccello.php' => config_path('uccello.php'), |
|
71 | + __DIR__.'/../../config/uccello.php' => config_path('uccello.php'), |
|
72 | 72 | ], 'uccello-config'); |
73 | 73 | |
74 | 74 | // Views |
75 | 75 | $this->publishes([ |
76 | - __DIR__ . '/../../resources/views' => resource_path('views/vendor/uccello') |
|
76 | + __DIR__.'/../../resources/views' => resource_path('views/vendor/uccello') |
|
77 | 77 | ], 'uccello-views'); |
78 | 78 | } |
79 | 79 | } |
@@ -98,12 +98,12 @@ discard block |
||
98 | 98 | { |
99 | 99 | // Config |
100 | 100 | $this->mergeConfigFrom( |
101 | - __DIR__ . '/../../config/uccello.php', |
|
101 | + __DIR__.'/../../config/uccello.php', |
|
102 | 102 | 'uccello' |
103 | 103 | ); |
104 | 104 | |
105 | 105 | // Helper |
106 | - App::bind('uccello', function () { |
|
106 | + App::bind('uccello', function() { |
|
107 | 107 | return new \Uccello\Core\Helpers\Uccello; |
108 | 108 | }); |
109 | 109 |
@@ -83,7 +83,7 @@ |
||
83 | 83 | * @param mixed $message |
84 | 84 | * @return void |
85 | 85 | */ |
86 | - function uclog($message, $type='info') |
|
86 | + function uclog($message, $type = 'info') |
|
87 | 87 | { |
88 | 88 | Log::$type($message); |
89 | 89 | } |
@@ -55,13 +55,13 @@ |
||
55 | 55 | public function handle() |
56 | 56 | { |
57 | 57 | $this->comment('Executing make:auth...'); |
58 | - $this->callSilent('make:auth', ['--force' => true]); |
|
58 | + $this->callSilent('make:auth', [ '--force' => true ]); |
|
59 | 59 | |
60 | 60 | $this->comment('Publishing Uccello Assets...'); |
61 | - $this->callSilent('vendor:publish', ['--tag' => 'uccello-assets']); |
|
61 | + $this->callSilent('vendor:publish', [ '--tag' => 'uccello-assets' ]); |
|
62 | 62 | |
63 | 63 | $this->comment('Publishing Uccello Configuration...'); |
64 | - $this->callSilent('vendor:publish', ['--tag' => 'uccello-config']); |
|
64 | + $this->callSilent('vendor:publish', [ '--tag' => 'uccello-config' ]); |
|
65 | 65 | |
66 | 66 | |
67 | 67 | $this->comment('Copying User Model...'); |
@@ -120,8 +120,8 @@ |
||
120 | 120 | */ |
121 | 121 | public function addConditionToSearchQuery(Builder $query, Field $field, $value) : Builder |
122 | 122 | { |
123 | - $query->where(function ($query) use($field, $value) { |
|
124 | - foreach ((array) $value as $_value) { |
|
123 | + $query->where(function($query) use($field, $value) { |
|
124 | + foreach ((array)$value as $_value) { |
|
125 | 125 | // Replace me by connected user's id |
126 | 126 | if ($_value === 'me') { |
127 | 127 | $_value = auth()->id(); |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | ]; |
57 | 57 | |
58 | 58 | // We want the field displays the datetime in the good format |
59 | - $options['value'] = $this->getFormattedValueToDisplay($field, $record); |
|
59 | + $options[ 'value' ] = $this->getFormattedValueToDisplay($field, $record); |
|
60 | 60 | |
61 | 61 | return $options; |
62 | 62 | } |
@@ -105,10 +105,10 @@ discard block |
||
105 | 105 | */ |
106 | 106 | public function addConditionToSearchQuery(Builder $query, Field $field, $value) : Builder |
107 | 107 | { |
108 | - $query->where(function ($query) use($field, $value) { |
|
108 | + $query->where(function($query) use($field, $value) { |
|
109 | 109 | $values = explode(',', $value); // Start Date, End Date |
110 | - $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.datetime'), trim($values[0])); |
|
111 | - $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.datetime'), trim($values[1])); |
|
110 | + $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.datetime'), trim($values[ 0 ])); |
|
111 | + $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.datetime'), trim($values[ 1 ])); |
|
112 | 112 | $query->whereBetween($field->column, [ $dateStart, $dateEnd ])->get(); |
113 | 113 | }); |
114 | 114 |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | ]; |
44 | 44 | |
45 | 45 | // We want the field displays the date in the good format |
46 | - $options['value'] = $this->getFormattedValueToDisplay($field, $record); |
|
46 | + $options[ 'value' ] = $this->getFormattedValueToDisplay($field, $record); |
|
47 | 47 | |
48 | 48 | return $options; |
49 | 49 | } |
@@ -92,10 +92,10 @@ discard block |
||
92 | 92 | */ |
93 | 93 | public function addConditionToSearchQuery(Builder $query, Field $field, $value) : Builder |
94 | 94 | { |
95 | - $query->where(function ($query) use($field, $value) { |
|
95 | + $query->where(function($query) use($field, $value) { |
|
96 | 96 | $values = explode(',', $value); // Start Date, End Date |
97 | - $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[0])); |
|
98 | - $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[1])); |
|
97 | + $dateStart = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[ 0 ])); |
|
98 | + $dateEnd = \Carbon\Carbon::createFromFormat(config('uccello.format.php.date'), trim($values[ 1 ])); |
|
99 | 99 | $query->whereBetween($field->column, [ $dateStart, $dateEnd ])->get(); |
100 | 100 | }); |
101 | 101 |
@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public function up() |
15 | 15 | { |
16 | - Schema::create($this->tablePrefix.'entities', function (Blueprint $table) { |
|
16 | + Schema::create($this->tablePrefix.'entities', function(Blueprint $table) { |
|
17 | 17 | $table->uuid('id')->primary(); |
18 | 18 | $table->unsignedInteger('module_id'); |
19 | 19 | $table->unsignedInteger('record_id'); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | ]); |
47 | 47 | |
48 | 48 | Entity::create([ |
49 | - 'id' => (string) Str::uuid(), |
|
49 | + 'id' => (string)Str::uuid(), |
|
50 | 50 | 'module_id' => ucmodule('domain')->id, |
51 | 51 | 'record_id' => $domain->getKey(), |
52 | 52 | ]); |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | ]); |
62 | 62 | |
63 | 63 | Entity::create([ |
64 | - 'id' => (string) Str::uuid(), |
|
64 | + 'id' => (string)Str::uuid(), |
|
65 | 65 | 'module_id' => ucmodule('profile')->id, |
66 | 66 | 'record_id' => $profile->getKey(), |
67 | 67 | ]); |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | $role->profiles()->attach($profile); |
92 | 92 | |
93 | 93 | Entity::create([ |
94 | - 'id' => (string) Str::uuid(), |
|
94 | + 'id' => (string)Str::uuid(), |
|
95 | 95 | 'module_id' => ucmodule('role')->id, |
96 | 96 | 'record_id' => $role->getKey(), |
97 | 97 | ]); |