Completed
Pull Request — master (#532)
by Quentin
24:53 queued 19:46
created
src/Models/Behaviors/HasTranslation.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
         if (method_exists($query->getModel(), 'translations')) {
20 20
             $locale = $locale == null ? app()->getLocale() : $locale;
21 21
 
22
-            $query->whereHas('translations', function ($query) use ($locale) {
22
+            $query->whereHas('translations', function($query) use ($locale) {
23 23
                 $query->whereActive(true);
24 24
                 $query->whereLocale($locale);
25 25
 
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
                 }
29 29
             });
30 30
 
31
-            return $query->with(['translations' => function ($query) use ($locale) {
31
+            return $query->with(['translations' => function($query) use ($locale) {
32 32
                 $query->whereActive(true);
33 33
                 $query->whereLocale($locale);
34 34
 
@@ -48,14 +48,14 @@  discard block
 block discarded – undo
48 48
         $locale = $locale == null ? app()->getLocale() : $locale;
49 49
 
50 50
         return $query
51
-            ->join($translationTable, function (JoinClause $join) use ($translationTable, $localeKey, $table, $keyName) {
51
+            ->join($translationTable, function(JoinClause $join) use ($translationTable, $localeKey, $table, $keyName) {
52 52
                 $join
53
-                    ->on($translationTable.'.'.$this->getRelationKey(), '=', $table.'.'.$keyName)
54
-                    ->where($translationTable.'.'.$localeKey, $this->locale());
53
+                    ->on($translationTable . '.' . $this->getRelationKey(), '=', $table . '.' . $keyName)
54
+                    ->where($translationTable . '.' . $localeKey, $this->locale());
55 55
             })
56
-            ->where($translationTable.'.'.$this->getLocaleKey(), $locale)
57
-            ->orderBy($translationTable.'.'.$orderField, $orderType)
58
-            ->select($table.'.*')
56
+            ->where($translationTable . '.' . $this->getLocaleKey(), $locale)
57
+            ->orderBy($translationTable . '.' . $orderField, $orderType)
58
+            ->select($table . '.*')
59 59
             ->with('translations');
60 60
     }
61 61
 
@@ -91,14 +91,14 @@  discard block
 block discarded – undo
91 91
 
92 92
     public function getActiveLanguages()
93 93
     {
94
-        return $this->translations->map(function ($translation) {
94
+        return $this->translations->map(function($translation) {
95 95
             return [
96 96
                 'shortlabel' => strtoupper($translation->locale),
97 97
                 'label' => getLanguageLabelFromLocaleCode($translation->locale),
98 98
                 'value' => $translation->locale,
99 99
                 'published' => $translation->active ?? false,
100 100
             ];
101
-        })->sortBy(function ($translation) {
101
+        })->sortBy(function($translation) {
102 102
             $localesOrdered = config('translatable.locales');
103 103
             return array_search($translation['value'], $localesOrdered);
104 104
         })->values();
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 
107 107
     public function translatedAttribute($key)
108 108
     {
109
-        return $this->translations->mapWithKeys(function ($translation) use ($key) {
109
+        return $this->translations->mapWithKeys(function($translation) use ($key) {
110 110
             return [$translation->locale => $this->translate($translation->locale)->$key];
111 111
         });
112 112
     }
Please login to merge, or discard this patch.
src/Http/ViewComposers/MediasUploaderConfig.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,13 +51,13 @@
 block discarded – undo
51 51
         // anonymous functions are used to let configuration dictate
52 52
         // the execution of the appropriate implementation
53 53
         $endpointByType = [
54
-            'local' => function () {
54
+            'local' => function() {
55 55
                 return $this->urlGenerator->route('admin.media-library.medias.store');
56 56
             },
57
-            's3' => function () use ($libraryDisk) {
57
+            's3' => function() use ($libraryDisk) {
58 58
                 return s3Endpoint($libraryDisk);
59 59
             },
60
-            'azure' => function () use ($libraryDisk) {
60
+            'azure' => function() use ($libraryDisk) {
61 61
                 return azureEndpoint($libraryDisk);
62 62
             },
63 63
         ];
Please login to merge, or discard this patch.
src/Http/ViewComposers/FilesUploaderConfig.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -51,13 +51,13 @@
 block discarded – undo
51 51
         // anonymous functions are used to let configuration dictate
52 52
         // the execution of the appropriate implementation
53 53
         $endpointByType = [
54
-            'local' => function () {
54
+            'local' => function() {
55 55
                 return $this->urlGenerator->route('admin.file-library.files.store');
56 56
             },
57
-            's3' => function () use ($libraryDisk) {
57
+            's3' => function() use ($libraryDisk) {
58 58
                 return s3Endpoint($libraryDisk);
59 59
             },
60
-            'azure' => function () use ($libraryDisk) {
60
+            'azure' => function() use ($libraryDisk) {
61 61
                 return azureEndpoint($libraryDisk);
62 62
             },
63 63
         ];
Please login to merge, or discard this patch.
src/Commands/ModuleMake.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
             'hasFiles',
103 103
             'hasPosition',
104 104
             'hasRevisions',
105
-        ])->filter(function ($enabled) {
105
+        ])->filter(function($enabled) {
106 106
             return $enabled;
107 107
         });
108 108
 
Please login to merge, or discard this patch.
src/ValidationServiceProvider.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -16,23 +16,23 @@
 block discarded – undo
16 16
      */
17 17
     public function boot()
18 18
     {
19
-        Validator::extend('absolute_or_relative_url', function ($attribute, $value, $parameters, $validator) {
19
+        Validator::extend('absolute_or_relative_url', function($attribute, $value, $parameters, $validator) {
20 20
             return Str::startsWith($value, '/') || Validator::make([$attribute => $value], [$attribute => 'url'])->passes();
21 21
         }, 'The :attribute should be a valid url (absolute or relative)');
22 22
 
23
-        Validator::extend('relative_or_secure_url', function ($attribute, $value, $parameters) {
23
+        Validator::extend('relative_or_secure_url', function($attribute, $value, $parameters) {
24 24
             return Str::startsWith($value, '/') || filter_var($value, FILTER_VALIDATE_URL) !== false && Str::startsWith($value, 'https');
25 25
         }, 'The :attribute should be a valid url (relative or https)');
26 26
 
27
-        Validator::extend('web_color', function ($attribute, $value, $parameters, $validator) {
27
+        Validator::extend('web_color', function($attribute, $value, $parameters, $validator) {
28 28
             return preg_match('/^([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i', $value);
29 29
         });
30 30
 
31
-        Validator::extend('phone_number', function ($attribute, $value, $parameters) {
31
+        Validator::extend('phone_number', function($attribute, $value, $parameters) {
32 32
             return preg_match("/^[+]?[0-9\-\ ]*$/", $value);
33 33
         });
34 34
 
35
-        Validator::extend('validBlocks', function ($attribute, $value, $parameters, $validator) {
35
+        Validator::extend('validBlocks', function($attribute, $value, $parameters, $validator) {
36 36
             foreach ($value as $block) {
37 37
                 $cmsBlock = $this->app->make(BlockRepository::class)->buildFromCmsArray($block, false);
38 38
 
Please login to merge, or discard this patch.
src/Repositories/Behaviors/HandleTranslations.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -23,12 +23,12 @@  discard block
 block discarded – undo
23 23
 
24 24
             $submittedLanguages = Collection::make($fields['languages'] ?? []);
25 25
 
26
-            $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function ($language) {
26
+            $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function($language) {
27 27
                 return $language['published'];
28 28
             });
29 29
 
30 30
             foreach ($locales as $index => $locale) {
31
-                $submittedLanguage = Arr::first($submittedLanguages->filter(function ($lang) use ($locale) {
31
+                $submittedLanguage = Arr::first($submittedLanguages->filter(function($lang) use ($locale) {
32 32
                     return $lang['value'] == $locale;
33 33
                 }));
34 34
 
@@ -38,7 +38,7 @@  discard block
 block discarded – undo
38 38
 
39 39
                 $fields[$locale] = [
40 40
                     'active' => $activeField,
41
-                ] + $attributes->mapWithKeys(function ($attribute) use (&$fields, $locale, $localesCount, $index) {
41
+                ] + $attributes->mapWithKeys(function($attribute) use (&$fields, $locale, $localesCount, $index) {
42 42
                     $attributeValue = $fields[$attribute] ?? null;
43 43
 
44 44
                     // if we are at the last locale,
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
     {
80 80
         if ($this->model->isTranslatable()) {
81 81
             $attributes = $this->model->translatedAttributes;
82
-            $query->whereHas('translations', function ($q) use ($scopes, $attributes) {
82
+            $query->whereHas('translations', function($q) use ($scopes, $attributes) {
83 83
                 foreach ($attributes as $attribute) {
84 84
                     if (isset($scopes[$attribute]) && is_string($scopes[$attribute])) {
85 85
                         $q->where($attribute, 'like', '%' . $scopes[$attribute] . '%');
Please login to merge, or discard this patch.
src/Models/Model.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -34,12 +34,12 @@  discard block
 block discarded – undo
34 34
     public function scopeVisible($query)
35 35
     {
36 36
         if ($this->isFillable('publish_start_date')) {
37
-            $query->where(function ($query) {
37
+            $query->where(function($query) {
38 38
                 $query->whereNull('publish_start_date')->orWhere('publish_start_date', '<=', Carbon::now());
39 39
             });
40 40
 
41 41
             if ($this->isFillable('publish_end_date')) {
42
-                $query->where(function ($query) {
42
+                $query->where(function($query) {
43 43
                     $query->whereNull('publish_end_date')->orWhere('publish_end_date', '>=', Carbon::now());
44 44
                 });
45 45
             }
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
         // Use the list of translatable attributes on our base model
75 75
         if (
76 76
             blank($fillable) &&
77
-            Str::contains($class= get_class($this), 'Models\Translations') &&
77
+            Str::contains($class = get_class($this), 'Models\Translations') &&
78 78
             property_exists($class, 'baseModuleModel')
79 79
         ) {
80 80
             $fillable = (new $this->baseModuleModel)->getTranslatedAttributes();
Please login to merge, or discard this patch.
src/Repositories/Behaviors/HandleMedias.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
         $mediasCollection = Collection::make();
24 24
         $mediasFromFields = $this->getMedias($fields);
25 25
 
26
-        $mediasFromFields->each(function ($media) use ($object, $mediasCollection) {
26
+        $mediasFromFields->each(function($media) use ($object, $mediasCollection) {
27 27
             $newMedia = Media::withTrashed()->find(is_array($media['id']) ? Arr::first($media['id']) : $media['id']);
28 28
             $pivot = $newMedia->newPivot($object, Arr::except($media, ['id']), config('twill.mediables_table', 'twill_mediables'), true);
29 29
             $newMedia->setRelation('pivot', $pivot);
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 
49 49
         $object->medias()->sync([]);
50 50
 
51
-        $this->getMedias($fields)->each(function ($media) use ($object) {
51
+        $this->getMedias($fields)->each(function($media) use ($object) {
52 52
             $object->medias()->attach($media['id'], Arr::except($media, ['id']));
53 53
         });
54 54
     }
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
                 if (in_array($role, array_keys($this->model->mediasParams ?? []))
78 78
                     || in_array($role, array_keys(config('twill.block_editor.crops', [])))
79 79
                     || in_array($role, array_keys(config('twill.settings.crops', [])))) {
80
-                    Collection::make($mediasForRole)->each(function ($media) use (&$medias, $role, $locale) {
80
+                    Collection::make($mediasForRole)->each(function($media) use (&$medias, $role, $locale) {
81 81
                         $customMetadatas = $media['metadatas']['custom'] ?? [];
82 82
                         if (isset($media['crops']) && !empty($media['crops'])) {
83 83
                             foreach ($media['crops'] as $cropName => $cropData) {
Please login to merge, or discard this patch.
src/Repositories/BlockRepository.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
         if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
46 46
             $relatedItems = Collection::make();
47 47
 
48
-            Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($object, &$relatedItems) {
49
-                Collection::make($items)->each(function ($item) use ($browserName, &$relatedItems) {
48
+            Collection::make($fields['browsers'])->each(function($items, $browserName) use ($object, &$relatedItems) {
49
+                Collection::make($items)->each(function($item) use ($browserName, &$relatedItems) {
50 50
                     try {
51 51
                         $repository = $this->getModelRepository($item['endpointType'] ?? $browserName);
52 52
                         $relatedItems->push((object) [
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
     {
75 75
         if (Schema::hasTable(config('twill.related_table', 'twill_related'))) {
76 76
             if (isset($fields['browsers'])) {
77
-                Collection::make($fields['browsers'])->each(function ($items, $browserName) use ($object) {
77
+                Collection::make($fields['browsers'])->each(function($items, $browserName) use ($object) {
78 78
                     $object->saveRelated($items, $browserName);
79 79
                 });
80 80
             }
@@ -102,14 +102,14 @@  discard block
 block discarded – undo
102 102
     {
103 103
         $blocksFromConfig = $this->config->get('twill.block_editor.' . ($repeater ? 'repeaters' : 'blocks'));
104 104
 
105
-        $block['type'] = Collection::make($blocksFromConfig)->search(function ($blockConfig) use ($block) {
105
+        $block['type'] = Collection::make($blocksFromConfig)->search(function($blockConfig) use ($block) {
106 106
             return $blockConfig['component'] === $block['type'];
107 107
         });
108 108
 
109 109
         $block['content'] = empty($block['content']) ? new \stdClass : (object) $block['content'];
110 110
 
111 111
         if ($block['browsers']) {
112
-            $browsers = Collection::make($block['browsers'])->map(function ($items) {
112
+            $browsers = Collection::make($block['browsers'])->map(function($items) {
113 113
                 return Collection::make($items)->pluck('id');
114 114
             })->toArray();
115 115
 
Please login to merge, or discard this patch.