area17 / twill

src/Repositories/Behaviors/HandleRepeaters.php

Spacing +5 added lines, -5 removed lines

@@ -15,7 +15,7 @@ 
         $relationRepository = $this->getModelRepository($relation, $model);
 
         if (!$keepExisting) {
-            $object->$relation()->each(function ($repeaterElement) {
+            $object->$relation()->each(function($repeaterElement) {
                 $repeaterElement->forceDelete();
             });
         }
@@ -112,8 +112,8 @@ 
 
             if (isset($relatedItemFormFields['medias'])) {
                 if (config('twill.media_library.translated_form_fields', false)) {
-                    Collection::make($relatedItemFormFields['medias'])->each(function ($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) {
-                        $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function ($medias, $role) use ($locale, $relation, $relationItem) {
+                    Collection::make($relatedItemFormFields['medias'])->each(function($rolesWithMedias, $locale) use (&$repeatersMedias, $relation, $relationItem) {
+                        $repeatersMedias[] = Collection::make($rolesWithMedias)->mapWithKeys(function($medias, $role) use ($locale, $relation, $relationItem) {
                             return [
                                 "blocks[$relation-$relationItem->id][$role][$locale]" => $medias,
                             ];
@@ -127,8 +127,8 @@ 
             }
 
             if (isset($relatedItemFormFields['files'])) {
-                Collection::make($relatedItemFormFields['files'])->each(function ($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) {
-                    $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function ($files, $role) use ($locale, $relation, $relationItem) {
+                Collection::make($relatedItemFormFields['files'])->each(function($rolesWithFiles, $locale) use (&$repeatersFiles, $relation, $relationItem) {
+                    $repeatersFiles[] = Collection::make($rolesWithFiles)->mapWithKeys(function($files, $role) use ($locale, $relation, $relationItem) {
                         return [
                             "blocks[$relation-$relationItem->id][$role][$locale]" => $files,
                         ];

src/Repositories/Behaviors/HandleTranslations.php

Spacing +4 added lines, -4 removed lines

@@ -23,12 +23,12 @@ 
 
             $submittedLanguages = Collection::make($fields['languages'] ?? []);
 
-            $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function ($language) {
+            $atLeastOneLanguageIsPublished = $submittedLanguages->contains(function($language) {
                 return $language['published'];
             });
 
             foreach ($locales as $index => $locale) {
-                $submittedLanguage = Arr::first($submittedLanguages->filter(function ($lang) use ($locale) {
+                $submittedLanguage = Arr::first($submittedLanguages->filter(function($lang) use ($locale) {
                     return $lang['value'] == $locale;
                 }));
 
@@ -38,7 +38,7 @@ 
 
                 $fields[$locale] = [
                     'active' => $activeField,
-                ] + $attributes->mapWithKeys(function ($attribute) use (&$fields, $locale, $localesCount, $index) {
+                ] + $attributes->mapWithKeys(function($attribute) use (&$fields, $locale, $localesCount, $index) {
                     $attributeValue = $fields[$attribute] ?? null;
 
                     // if we are at the last locale,
@@ -79,7 +79,7 @@ 
     {
         if (property_exists($this->model, 'translatedAttributes')) {
             $attributes = $this->model->translatedAttributes;
-            $query->whereHas('translations', function ($q) use ($scopes, $attributes) {
+            $query->whereHas('translations', function($q) use ($scopes, $attributes) {
                 foreach ($attributes as $attribute) {
                     if (isset($scopes[$attribute]) && is_string($scopes[$attribute])) {
                         $q->where($attribute, 'like', '%' . $scopes[$attribute] . '%');

src/Repositories/Behaviors/HandleMedias.php

Spacing +3 added lines, -3 removed lines

@@ -23,7 +23,7 @@ 
         $mediasCollection = Collection::make();
         $mediasFromFields = $this->getMedias($fields);
 
-        $mediasFromFields->each(function ($media) use ($object, $mediasCollection) {
+        $mediasFromFields->each(function($media) use ($object, $mediasCollection) {
             $newMedia = Media::withTrashed()->find(is_array($media['id']) ? Arr::first($media['id']) : $media['id']);
             $pivot = $newMedia->newPivot($object, Arr::except($media, ['id']), 'mediables', true);
             $newMedia->setRelation('pivot', $pivot);
@@ -48,7 +48,7 @@ 
 
         $object->medias()->sync([]);
 
-        $this->getMedias($fields)->each(function ($media) use ($object) {
+        $this->getMedias($fields)->each(function($media) use ($object) {
             $object->medias()->attach($media['id'], Arr::except($media, ['id']));
         });
     }
@@ -77,7 +77,7 @@ 
                 if (in_array($role, array_keys($this->model->mediasParams ?? []))
                     || in_array($role, array_keys(config('twill.block_editor.crops', [])))
                     || in_array($role, array_keys(config('twill.settings.crops', [])))) {
-                    Collection::make($mediasForRole)->each(function ($media) use (&$medias, $role, $locale) {
+                    Collection::make($mediasForRole)->each(function($media) use (&$medias, $role, $locale) {
                         $customMetadatas = $media['metadatas']['custom'] ?? [];
                         if (isset($media['crops']) && !empty($media['crops'])) {
                             foreach ($media['crops'] as $cropName => $cropData) {

src/Repositories/Behaviors/HandleSlugs.php

Spacing +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
         }
 
         if (!$item && config('translatable.use_property_fallback', false)) {
-            $item = (clone $query)->orWhere(function ($query) {
+            $item = (clone $query)->orWhere(function($query) {
                 return $query->withActiveTranslations(config('translatable.fallback_locale'));
             })->forFallbackLocaleSlug($slug)->first();
 

src/Repositories/Behaviors/HandleFiles.php

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
         $filesCollection = Collection::make();
         $filesFromFields = $this->getFiles($fields);
 
-        $filesFromFields->each(function ($file) use ($object, $filesCollection) {
+        $filesFromFields->each(function($file) use ($object, $filesCollection) {
             $newFile = File::withTrashed()->find($file['id']);
             $pivot = $newFile->newPivot($object, Arr::except($file, ['id']), 'fileables', true);
             $newFile->setRelation('pivot', $pivot);
@@ -48,7 +48,7 @@ 
 
         $object->files()->sync([]);
 
-        $this->getFiles($fields)->each(function ($file) use ($object) {
+        $this->getFiles($fields)->each(function($file) use ($object) {
             $object->files()->attach($file['id'], Arr::except($file, ['id']));
         });
     }
@@ -74,7 +74,7 @@ 
                 if (in_array($role, $this->model->filesParams ?? [])
                     || in_array($role, config('twill.block_editor.files', []))) {
 
-                    Collection::make($filesForRole)->each(function ($file) use (&$files, $role, $locale) {
+                    Collection::make($filesForRole)->each(function($file) use (&$files, $role, $locale) {
                         $files->push([
                             'id' => $file['id'],
                             'role' => $role,
@@ -99,7 +99,7 @@ 
         if ($object->has('files')) {
             foreach ($object->files->groupBy('pivot.role') as $role => $filesByRole) {
                 foreach ($filesByRole->groupBy('pivot.locale') as $locale => $filesByLocale) {
-                    $fields['files'][$locale][$role] = $filesByLocale->map(function ($file) {
+                    $fields['files'][$locale][$role] = $filesByLocale->map(function($file) {
                         return $file->toCmsArray();
                     });
                 }

src/Repositories/ModuleRepository.php

Spacing +18 added lines, -18 removed lines

@@ -178,7 +178,7 @@ 
 
         foreach ($fields as $field) {
             if (in_array($field, $translatedAttributes)) {
-                $query->orWhereHas('translations', function ($q) use ($field, $search) {
+                $query->orWhereHas('translations', function($q) use ($field, $search) {
                     $q->where($field, $this->getLikeOperator(), "%{$search}%");
                 });
             } else {
@@ -205,7 +205,7 @@ 
      */
     public function create($fields)
     {
-        return DB::transaction(function () use ($fields) {
+        return DB::transaction(function() use ($fields) {
             $original_fields = $fields;
 
             $fields = $this->prepareFieldsBeforeCreate($fields);
@@ -260,7 +260,7 @@ 
      */
     public function update($id, $fields)
     {
-        DB::transaction(function () use ($id, $fields) {
+        DB::transaction(function() use ($id, $fields) {
             $object = $this->model->findOrFail($id);
 
             $this->beforeSave($object, $fields);
@@ -283,7 +283,7 @@ 
      */
     public function updateBasic($id, $values, $scopes = [])
     {
-        return DB::transaction(function () use ($id, $values, $scopes) {
+        return DB::transaction(function() use ($id, $values, $scopes) {
             // apply scopes if no id provided
             if (is_null($id)) {
                 $query = $this->model->query();
@@ -294,7 +294,7 @@ 
 
                 $query->update($values);
 
-                $query->get()->each(function ($object) use ($values) {
+                $query->get()->each(function($object) use ($values) {
                     $this->afterUpdateBasic($object, $values);
                 });
 
@@ -306,7 +306,7 @@ 
                 $query = $this->model->whereIn('id', $id);
                 $query->update($values);
 
-                $query->get()->each(function ($object) use ($values) {
+                $query->get()->each(function($object) use ($values) {
                     $this->afterUpdateBasic($object, $values);
                 });
 
@@ -329,7 +329,7 @@ 
      */
     public function setNewOrder($ids)
     {
-        DB::transaction(function () use ($ids) {
+        DB::transaction(function() use ($ids) {
             $this->model->setNewOrder($ids);
         }, 3);
     }
@@ -340,7 +340,7 @@ 
      */
     public function delete($id)
     {
-        return DB::transaction(function () use ($id) {
+        return DB::transaction(function() use ($id) {
             if (($object = $this->model->find($id)) === null) {
                 return false;
             }
@@ -360,9 +360,9 @@ 
      */
     public function bulkDelete($ids)
     {
-        return DB::transaction(function () use ($ids) {
+        return DB::transaction(function() use ($ids) {
             try {
-                Collection::make($ids)->each(function ($id) {
+                Collection::make($ids)->each(function($id) {
                     $this->delete($id);
                 });
             } catch (\Exception $e) {
@@ -380,7 +380,7 @@ 
      */
     public function restore($id)
     {
-        return DB::transaction(function () use ($id) {
+        return DB::transaction(function() use ($id) {
             if (($object = $this->model->withTrashed()->find($id)) != null) {
                 $object->restore();
                 $this->afterRestore($object);
@@ -397,14 +397,14 @@ 
      */
     public function bulkRestore($ids)
     {
-        return DB::transaction(function () use ($ids) {
+        return DB::transaction(function() use ($ids) {
             try {
                 $query = $this->model->withTrashed()->whereIn('id', $ids);
                 $objects = $query->get();
 
                 $query->restore();
 
-                $objects->each(function ($object) {
+                $objects->each(function($object) {
                     $this->afterRestore($object);
                 });
             } catch (\Exception $e) {
@@ -664,7 +664,7 @@ 
      */
     public function getFormFieldsForBrowser($object, $relation, $routePrefix = null, $titleKey = 'title', $moduleName = null)
     {
-        return $object->$relation->map(function ($relatedElement) use ($titleKey, $routePrefix, $relation, $moduleName) {
+        return $object->$relation->map(function($relatedElement) use ($titleKey, $routePrefix, $relation, $moduleName) {
             return [
                 'id' => $relatedElement->id,
                 'name' => $relatedElement->titleInBrowser ?? $relatedElement->$titleKey,
@@ -683,7 +683,7 @@ 
      */
     public function getFormFieldsForRelatedBrowser($object, $relation)
     {
-        return $object->getRelated($relation)->map(function ($relatedElement) {
+        return $object->getRelated($relation)->map(function($relatedElement) {
             return ($relatedElement != null) ? [
                 'id' => $relatedElement->id,
                 'name' => $relatedElement->titleInBrowser ?? $relatedElement->title,
@@ -693,7 +693,7 @@ 
             ]) + (classHasTrait($relatedElement, HasMedias::class) ? [
                 'thumbnail' => $relatedElement->defaultCmsImage(['w' => 100, 'h' => 100]),
             ] : []) : [];
-        })->reject(function ($item) {
+        })->reject(function($item) {
             return empty($item);
         })->values()->toArray();
     }
@@ -788,7 +788,7 @@ 
     {
         if (isset($scopes[$scopeField])) {
             $id = $scopes[$scopeField];
-            $query->whereHas($scopeRelation, function ($query) use ($id, $scopeField) {
+            $query->whereHas($scopeRelation, function($query) use ($id, $scopeField) {
                 $query->where($scopeField, $id);
             });
             unset($scopes[$scopeField]);
@@ -819,7 +819,7 @@ 
     {
 
         if (isset($scopes[$scopeField]) && is_string($scopes[$scopeField])) {
-            $query->where(function ($query) use (&$scopes, $scopeField, $orFields) {
+            $query->where(function($query) use (&$scopes, $scopeField, $orFields) {
                 foreach ($orFields as $field) {
                     $query->orWhere($field, $this->getLikeOperator(), '%' . $scopes[$scopeField] . '%');
                     unset($scopes[$field]);

migrations/change_locale_column_in_twill_fileables.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
     public function up()
     {
         if (Schema::hasTable('fileables') && Schema::hasColumn('fileables', 'locale')) {
-            Schema::table('fileables', function (Blueprint $table) {
+            Schema::table('fileables', function(Blueprint $table) {
                 $table->string('locale', 7)->change();
             });
         }
@@ -17,7 +17,7 @@ 
     public function down()
     {
         if (Schema::hasTable('fileables') && Schema::hasColumn('fileables', 'locale')) {
-            Schema::table('fileables', function (Blueprint $table) {
+            Schema::table('fileables', function(Blueprint $table) {
                 $table->string('locale', 6)->change();
             });
         }

migrations/create_related_table.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('related', function (Blueprint $table) {
+        Schema::create('related', function(Blueprint $table) {
             $table->integer('subject_id')->nullable()->unsigned();
             $table->string('subject_type', 255);
             $table->integer('related_id')->nullable()->unsigned();

migrations/create_twill_users_tables.php

Spacing +2 added lines, -2 removed lines

@@ -16,7 +16,7 @@ 
         $twillUsersTable = config('twill.users_table', 'twill_users');
 
         if (!Schema::hasTable($twillUsersTable)) {
-            Schema::create($twillUsersTable, function (Blueprint $table) {
+            Schema::create($twillUsersTable, function(Blueprint $table) {
                 createDefaultTableFields($table);
                 $table->string('name');
                 $table->string('email')->unique();
@@ -31,7 +31,7 @@ 
         $twillPasswordResetsTable = config('twill.password_resets_table', 'twill_password_resets');
 
         if (!Schema::hasTable($twillPasswordResetsTable)) {
-            Schema::create($twillPasswordResetsTable, function (Blueprint $table) {
+            Schema::create($twillPasswordResetsTable, function(Blueprint $table) {
                 $table->string('email')->index();
                 $table->string('token')->index();
                 $table->timestamp('created_at')->nullable();