| @@ -34,7 +34,7 @@ discard block | ||
| 34 | 34 | */ | 
| 35 | 35 | public function byKey($key, $section = null) | 
| 36 | 36 |      { | 
| 37 | -        return $this->model->when($section, function ($query) use ($section) { | |
| 37 | +        return $this->model->when($section, function($query) use ($section) { | |
| 38 | 38 |              $query->where('section', $section); | 
| 39 | 39 |          })->where('key', $key)->exists() ? $this->model->where('key', $key)->with('translations')->first()->value : null; | 
| 40 | 40 | } | 
| @@ -45,15 +45,15 @@ discard block | ||
| 45 | 45 | */ | 
| 46 | 46 | public function getFormFields($section = null) | 
| 47 | 47 |      { | 
| 48 | -        $settings = $this->model->when($section, function ($query) use ($section) { | |
| 48 | +        $settings = $this->model->when($section, function($query) use ($section) { | |
| 49 | 49 |              $query->where('section', $section); | 
| 50 | 50 |          })->with('translations', 'medias')->get(); | 
| 51 | 51 | |
| 52 | -        $medias = $settings->mapWithKeys(function ($setting) { | |
| 52 | +        $medias = $settings->mapWithKeys(function($setting) { | |
| 53 | 53 | return [$setting->key => parent::getFormFields($setting)['medias'][$setting->key] ?? null]; | 
| 54 | 54 | })->filter()->toArray(); | 
| 55 | 55 | |
| 56 | -        return $settings->mapWithKeys(function ($setting) { | |
| 56 | +        return $settings->mapWithKeys(function($setting) { | |
| 57 | 57 | $settingValue = []; | 
| 58 | 58 | |
| 59 | 59 |              foreach ($setting->translations as $translation) { | 
| @@ -101,7 +101,7 @@ discard block | ||
| 101 | 101 | $this->updateOrCreate($section + ['key' => $role], $section + [ | 
| 102 | 102 | 'key' => $role, | 
| 103 | 103 | 'medias' => [ | 
| 104 | -                    $role => Collection::make($settingsFields['medias'][$role])->map(function ($media) { | |
| 104 | +                    $role => Collection::make($settingsFields['medias'][$role])->map(function($media) { | |
| 105 | 105 | return json_decode($media, true); | 
| 106 | 106 | })->values()->filter()->toArray(), | 
| 107 | 107 | ], | 
| @@ -62,7 +62,7 @@ | ||
| 62 | 62 | */ | 
| 63 | 63 | public function filter($query, array $scopes = []) | 
| 64 | 64 |      { | 
| 65 | -        $query->when(isset($scopes['role']), function ($query) use ($scopes) { | |
| 65 | +        $query->when(isset($scopes['role']), function($query) use ($scopes) { | |
| 66 | 66 |              $query->where('role', $scopes['role']); | 
| 67 | 67 | }); | 
| 68 | 68 |          $query->where('role', '<>', 'SUPERADMIN'); | 
| @@ -23,7 +23,7 @@ discard block | ||
| 23 | 23 | $filesCollection = Collection::make(); | 
| 24 | 24 | $filesFromFields = $this->getFiles($fields); | 
| 25 | 25 | |
| 26 | -        $filesFromFields->each(function ($file) use ($object, $filesCollection) { | |
| 26 | +        $filesFromFields->each(function($file) use ($object, $filesCollection) { | |
| 27 | 27 | $newFile = File::withTrashed()->find($file['id']); | 
| 28 | 28 | $pivot = $newFile->newPivot($object, Arr::except($file, ['id']), 'fileables', true); | 
| 29 | 29 |              $newFile->setRelation('pivot', $pivot); | 
| @@ -48,7 +48,7 @@ discard block | ||
| 48 | 48 | |
| 49 | 49 | $object->files()->sync([]); | 
| 50 | 50 | |
| 51 | -        $this->getFiles($fields)->each(function ($file) use ($object) { | |
| 51 | +        $this->getFiles($fields)->each(function($file) use ($object) { | |
| 52 | 52 | $object->files()->attach($file['id'], Arr::except($file, ['id'])); | 
| 53 | 53 | }); | 
| 54 | 54 | } | 
| @@ -74,7 +74,7 @@ discard block | ||
| 74 | 74 | if (in_array($role, $this->model->filesParams ?? []) | 
| 75 | 75 |                      || in_array($role, config('twill.block_editor.files', []))) { | 
| 76 | 76 | |
| 77 | -                    Collection::make($filesForRole)->each(function ($file) use (&$files, $role, $locale) { | |
| 77 | +                    Collection::make($filesForRole)->each(function($file) use (&$files, $role, $locale) { | |
| 78 | 78 | $files->push([ | 
| 79 | 79 | 'id' => $file['id'], | 
| 80 | 80 | 'role' => $role, | 
| @@ -99,7 +99,7 @@ discard block | ||
| 99 | 99 |          if ($object->has('files')) { | 
| 100 | 100 |              foreach ($object->files->groupBy('pivot.role') as $role => $filesByRole) { | 
| 101 | 101 |                  foreach ($filesByRole->groupBy('pivot.locale') as $locale => $filesByLocale) { | 
| 102 | -                    $fields['files'][$locale][$role] = $filesByLocale->map(function ($file) { | |
| 102 | +                    $fields['files'][$locale][$role] = $filesByLocale->map(function($file) { | |
| 103 | 103 | return $file->toCmsArray(); | 
| 104 | 104 | }); | 
| 105 | 105 | } | 
| @@ -33,7 +33,7 @@ discard block | ||
| 33 | 33 |          try { | 
| 34 | 34 |              $blobUri = $request->input('bloburi'); | 
| 35 | 35 |              $method = $request->input('_method'); | 
| 36 | - $permissions = '' ; | |
| 36 | + $permissions = ''; | |
| 37 | 37 |              if (strtolower($method) === 'put') { | 
| 38 | 38 | $permissions = 'w'; | 
| 39 | 39 |              } else if (strtolower($method) === 'delete') { | 
| @@ -48,7 +48,7 @@ discard block | ||
| 48 | 48 |              $now = new DateTime("now", new DateTimeZone("UTC")); | 
| 49 | 49 |              $expire = $now->modify('+15 min'); | 
| 50 | 50 | |
| 51 | -            $path = $this->config->get('filesystems.disks.' . $disk .'.container') . str_replace(azureEndpoint($disk), '', $blobUri); | |
| 51 | +            $path = $this->config->get('filesystems.disks.' . $disk . '.container') . str_replace(azureEndpoint($disk), '', $blobUri); | |
| 52 | 52 |              $sasUrl = $blobUri . '?' . $this->blobSharedAccessSignatureHelper->generateBlobServiceSharedAccessSignatureToken('b', $path, $permissions, $expire); | 
| 53 | 53 | return $listener->uploadIsSigned($sasUrl, false); | 
| 54 | 54 |          } catch (\Exception $e) { | 
| @@ -19,7 +19,7 @@ discard block | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | ||
| 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 | } | 
| @@ -51,13 +51,13 @@ | ||
| 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 | ]; | 
| @@ -51,13 +51,13 @@ | ||
| 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 | ]; | 
| @@ -102,7 +102,7 @@ | ||
| 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 | |
| @@ -23,12 +23,12 @@ discard block | ||
| 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 | ||
| 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 | ||
| 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] . '%'); |