Distilleries / Laravel-Contentful-Utilities

src/Distilleries/Contentful/Repositories/AssetsRepository.php

Spacing +4 added lines, -6 removed lines

@@ -60,7 +60,7 @@ 
     {
         $locales = [];
 
-        if (isset($asset['fields']) && ! empty($asset['fields'])) {
+        if (isset($asset['fields']) && !empty($asset['fields'])) {
             $firstField = Arr::first($asset['fields']);
             $locales = array_keys($firstField);
         }
@@ -80,7 +80,7 @@ 
         $country = Locale::getCountry($locale);
         $iso = Locale::getLocale($locale);
 
-        if (! Locale::canBeSave($country, $iso)) {
+        if (!Locale::canBeSave($country, $iso)) {
             return null;
         }
 
@@ -165,10 +165,8 @@ 
      */
     protected function getFieldValue(array $fields, string $field, string $locale, string $fallbackLocale, $default, string $secondFallback = null)
     {
-        return ! empty($fields[$field][$locale]) ?
-            $fields[$field][$locale] :
-            (! empty($fields[$field][$fallbackLocale]) ? $fields[$field][$fallbackLocale] :
-                (! empty($secondFallback) && ! empty($fields[$field][$secondFallback]) ? $fields[$field][$secondFallback] : $default)
+        return !empty($fields[$field][$locale]) ?
+            $fields[$field][$locale] : (!empty($fields[$field][$fallbackLocale]) ? $fields[$field][$fallbackLocale] : (!empty($secondFallback) && !empty($fields[$field][$secondFallback]) ? $fields[$field][$secondFallback] : $default)
             );
     }
 }

src/Distilleries/Contentful/Repositories/EntriesRepository.php

Spacing +14 added lines, -14 removed lines

@@ -25,14 +25,14 @@ 
     {
         $modelPath = config('contentful.generator.model');
 
-        foreach (glob($modelPath . '/*.php') as $file) {
+        foreach (glob($modelPath.'/*.php') as $file) {
             $modelInstance = NamespaceResolver::model(str_replace(
                 [$modelPath, '.php', '/'],
                 ['', '', '\\'],
                 $file
             ));
 
-            if (! empty($modelInstance) && $modelInstance instanceof ContentfulModel) {
+            if (!empty($modelInstance) && $modelInstance instanceof ContentfulModel) {
                 $modelInstance->query()->truncate();
             }
         }
@@ -58,9 +58,9 @@ 
         foreach ($localeEntries as $localeEntry) {
             $model = $this->upsertLocale($entry, $localeEntry);
 
-            if (! empty($model)) {
+            if (!empty($model)) {
                 if (isset($localeEntry['relationships'])) {
-                    $this->handleRelationships($localeEntry['locale'],$localeEntry['country'], $localeEntry['contentful_id'], $this->entryContentType($entry), $localeEntry['relationships']);
+                    $this->handleRelationships($localeEntry['locale'], $localeEntry['country'], $localeEntry['contentful_id'], $this->entryContentType($entry), $localeEntry['relationships']);
                     unset($localeEntry['relationships']);
                 }
             } else {
@@ -110,11 +110,11 @@ 
      */
     private function entryMapper(array $entry): ContentfulMapper
     {
-        $class = Str::studly($this->entryContentType($entry)) . 'Mapper';
+        $class = Str::studly($this->entryContentType($entry)).'Mapper';
         $mapperClass = NamespaceResolver::mapper($class);
 
-        if (empty($mapperClass) && ! ($mapperClass instanceof ContentfulMapper)) {
-            throw new Exception('Unknown mapper: ' . $class);
+        if (empty($mapperClass) && !($mapperClass instanceof ContentfulMapper)) {
+            throw new Exception('Unknown mapper: '.$class);
         }
 
         return new $mapperClass;
@@ -133,7 +133,7 @@ 
         $modelClass = NamespaceResolver::modelClass($model);
 
         if (empty($modelClass)) {
-            throw new Exception('Unknown model: ' . $model);
+            throw new Exception('Unknown model: '.$model);
         }
 
         return new $modelClass;
@@ -164,8 +164,8 @@ 
 
         $order = 1;
         foreach ($relationships as $relationship) {
-            if (! isset($relationship['id']) || ! isset($relationship['type'])) {
-                throw new Exception('Relationships malformed! (' . print_r($relationship, true) . ')');
+            if (!isset($relationship['id']) || !isset($relationship['type'])) {
+                throw new Exception('Relationships malformed! ('.print_r($relationship, true).')');
             }
 
             DB::table('entry_relationships')->insert([
@@ -212,18 +212,18 @@ 
     private function upsertLocale(array $entry, array $data): ?ContentfulModel
     {
         $model = $this->entryModel($entry);
-        if ((method_exists($model, 'bootNotNullSlug') && empty($data['slug'])) || ! Locale::canBeSave($data['country'], $data['locale'])) {
+        if ((method_exists($model, 'bootNotNullSlug') && empty($data['slug'])) || !Locale::canBeSave($data['country'], $data['locale'])) {
             // Remove instance if slug is empty
             $instance = $this->instanceQueryBuilder($model, $data)->first();
-            if (! empty($instance)) {
+            if (!empty($instance)) {
                 $instance->delete();
             }
 
             return null;
         }
 
-        if (! isset($data['payload'])) {
-            throw new Exception('Mapper for model ' . class_basename($model) . ' must set a "payload" key');
+        if (!isset($data['payload'])) {
+            throw new Exception('Mapper for model '.class_basename($model).' must set a "payload" key');
         }
 
         $instance = $this->instanceQueryBuilder($model, $data)->first();

src/Distilleries/Contentful/Models/Base/ContentfulMapper.php

Spacing +11 added lines, -11 removed lines

@@ -51,10 +51,10 @@ 
             $data['country'] = Locale::getCountry($locale->code);
             $data['locale'] = Locale::getLocale($locale->code);
 
-            if (! isset($data['payload'])) {
+            if (!isset($data['payload'])) {
                 $data['payload'] = $this->mapPayload($entry, $locale->code);
             }
-            if (! isset($data['relationships'])) {
+            if (!isset($data['relationships'])) {
                 $data['relationships'] = $this->mapRelationships($data['payload']);
             }
             if (isset($data['slug']) && Str::contains($data['slug'], 'untitled-')) {
@@ -84,16 +84,16 @@ 
         $dontFallback = config('contentful.payload_fields_not_fallback', []);
 
         $fallbackLocale = Locale::fallback($locale);
-        $fallbackSecondLevel = ! empty($fallbackLocale) ? Locale::fallback($fallbackLocale) : null;
+        $fallbackSecondLevel = !empty($fallbackLocale) ? Locale::fallback($fallbackLocale) : null;
 
         foreach ($entry['fields'] as $field => $localesData) {
             if (isset($localesData[$locale])) {
                 $payload[$field] = $localesData[$locale];
             } else {
-                if (! in_array($field, $dontFallback) && isset($localesData[$fallbackLocale]) && ($this->levelFallBack($field) === 'all')) {
+                if (!in_array($field, $dontFallback) && isset($localesData[$fallbackLocale]) && ($this->levelFallBack($field) === 'all')) {
                     $payload[$field] = $localesData[$fallbackLocale];
                 } else {
-                    if (! empty($fallbackSecondLevel) && ! in_array($field, $dontFallback) && isset($localesData[$fallbackSecondLevel]) && ($this->levelFallBack($field) === 'all')) {
+                    if (!empty($fallbackSecondLevel) && !in_array($field, $dontFallback) && isset($localesData[$fallbackSecondLevel]) && ($this->levelFallBack($field) === 'all')) {
                         $payload[$field] = $localesData[$fallbackSecondLevel];
                     } else {
                         $payload[$field] = null;
@@ -137,7 +137,7 @@ 
             if (is_array($value)) {
                 if ($this->isLink($value)) {
                     try {
-                        $relationships[] = $this->relationshipSignature($value,$field);
+                        $relationships[] = $this->relationshipSignature($value, $field);
                     } catch (Exception $e) {
                         //
                     }
@@ -145,7 +145,7 @@ 
                     foreach ($value as $entry) {
                         if ($this->isLink($entry)) {
                             try {
-                                $relationships[] = $this->relationshipSignature($entry,$field);
+                                $relationships[] = $this->relationshipSignature($entry, $field);
                             } catch (Exception $e) {
                                 //
                             }
@@ -184,7 +184,7 @@ 
             }
         }
 
-        throw new Exception('Invalid field signature... ' . PHP_EOL . print_r($localeField, true));
+        throw new Exception('Invalid field signature... '.PHP_EOL.print_r($localeField, true));
     }
 
     /**
@@ -220,13 +220,13 @@ 
                     'content_type' => 'single_entry',
                 ]);
 
-                if (! empty($entry) && ! empty($entry['sys']['contentType']) && ! empty($entry['sys']['contentType']['sys'])) {
+                if (!empty($entry) && !empty($entry['sys']['contentType']) && !empty($entry['sys']['contentType']['sys'])) {
                     $this->upsertEntryType($entry, $entry['sys']['contentType']['sys']['id']);
 
                     return $entry['sys']['contentType']['sys']['id'];
                 }
             } catch (Exception $e) {
-                throw new Exception('Unknown content-type from synced entry: ' . $contentfulId);
+                throw new Exception('Unknown content-type from synced entry: '.$contentfulId);
             }
         }
 
@@ -247,7 +247,7 @@ 
     {
         $locales = [];
 
-        if (isset($entry['fields']) && ! empty($entry['fields'])) {
+        if (isset($entry['fields']) && !empty($entry['fields'])) {
             $firstField = Arr::first($entry['fields']);
             $locales = array_keys($firstField);
         }

src/Distilleries/Contentful/Models/Traits/Localable.php

Spacing +4 added lines, -4 removed lines

@@ -19,11 +19,11 @@
      */
     public function scopeLocale($query, ?string $locale = '', ?string $country = ''): Builder
     {
-        $locale = ! empty($locale) ? $locale : Locale::getAppOrDefaultLocale();
-        $country = ! empty($country) ? $country : Locale::getAppOrDefaultCountry();
+        $locale = !empty($locale) ? $locale : Locale::getAppOrDefaultLocale();
+        $country = !empty($country) ? $country : Locale::getAppOrDefaultCountry();
 
         return $query
-            ->whereRaw('LOWER(' . $this->getTable() . '.country) LIKE LOWER("' . $country . '")')
-            ->whereRaw('LOWER(' . $this->getTable() . '.locale) LIKE LOWER("' . $locale . '")');
+            ->whereRaw('LOWER('.$this->getTable().'.country) LIKE LOWER("'.$country.'")')
+            ->whereRaw('LOWER('.$this->getTable().'.locale) LIKE LOWER("'.$locale.'")');
     }
 }

src/Distilleries/Contentful/Models/EntryRelationship.php

Spacing +2 added lines, -2 removed lines

@@ -59,8 +59,8 @@
      */
     public function getRelatedEntry()
     {
-        $localModel = rtrim(config('contentful.namespaces.model'), '\\') . '\\' . ucfirst($this->source_contentful_type);
-        if (! class_exists($localModel)) {
+        $localModel = rtrim(config('contentful.namespaces.model'), '\\').'\\'.ucfirst($this->source_contentful_type);
+        if (!class_exists($localModel)) {
             return null;
         }
 

src/Distilleries/Contentful/Models/Locale.php

Spacing +12 added lines, -12 removed lines

@@ -61,7 +61,7 @@ 
 
         if ($default === null) {
             $default = static::select('locale')->where('is_default', '=', true)->first();
-            $default = ! empty($default) ? $default->locale : config('contentful.default_locale');
+            $default = !empty($default) ? $default->locale : config('contentful.default_locale');
 
             // Cache is cleaned in Console\Commands\SyncLocales (run at least daily)
             Cache::forever('locale_default', $default);
@@ -102,7 +102,7 @@ 
 
         if ($default === null) {
             $default = static::select('country')->where('is_default', '=', true)->first();
-            $default = ! empty($default) ? $default->country : config('contentful.default_country');
+            $default = !empty($default) ? $default->country : config('contentful.default_country');
 
             // Cache is cleaned in Console\Commands\SyncLocales (run at least daily)
             Cache::forever('country_default', $default);
@@ -119,13 +119,13 @@ 
      */
     public static function fallback(string $code): string
     {
-        $fallback = Cache::get('locale_fallback_' . $code);
+        $fallback = Cache::get('locale_fallback_'.$code);
 
         if ($fallback === null) {
             $locale = static::select('fallback_code')->where('code', '=', $code)->first();
-            $fallback = (! empty($locale) && ! empty($locale->fallback_code)) ? $locale->fallback_code : '';
+            $fallback = (!empty($locale) && !empty($locale->fallback_code)) ? $locale->fallback_code : '';
 
-            Cache::put('locale_fallback_' . $code, $fallback, 5);
+            Cache::put('locale_fallback_'.$code, $fallback, 5);
         }
 
         return $fallback;
@@ -140,7 +140,7 @@ 
      */
     public static function canBeSave(string $country, string $locale): bool
     {
-        return ! in_array($country . '_' . $locale, static::_getLocalesDisabled());
+        return !in_array($country.'_'.$locale, static::_getLocalesDisabled());
     }
 
     /**
@@ -150,7 +150,7 @@ 
      */
     protected static function _getLocalesDisabled(): array
     {
-        $locales =config('contentful.use_preview')?config('contentful.locales_not_flatten_preview', ''):config('contentful.locales_not_flatten', '');
+        $locales = config('contentful.use_preview') ?config('contentful.locales_not_flatten_preview', '') : config('contentful.locales_not_flatten', '');
 
         return explode(',', $locales);
     }
@@ -162,7 +162,7 @@ 
      */
     public function isEnabled(): bool
     {
-        return ! in_array($this->country . '_' . $this->locale, static::_getLocalesDisabled());
+        return !in_array($this->country.'_'.$this->locale, static::_getLocalesDisabled());
     }
 
     /**
@@ -215,12 +215,12 @@ 
      */
     public static function getAcceptedLanguages(Request $request = null)
     {
-        $request = ! empty($request) ? $request : request();
+        $request = !empty($request) ? $request : request();
 
         $languages = $request->server('HTTP_ACCEPT_LANGUAGE');
-        if (! empty($languages)) {
+        if (!empty($languages)) {
             preg_match_all('/(\W|^)([a-z]{2})([^a-z]|$)/six', $languages, $locales, PREG_PATTERN_ORDER);
-            if (! empty($locales) && ! empty($locales[2])) {
+            if (!empty($locales) && !empty($locales[2])) {
                 return $locales[2];
             }
         }
@@ -238,7 +238,7 @@ 
     {
         $country = static::defaultCountry();
         $locales = static::getAcceptedLanguages($request);
-        $locale = ! empty($locales) ? $locales[0] : config('app.fallback_locale');
+        $locale = !empty($locales) ? $locales[0] : config('app.fallback_locale');
 
         $localeModel = (new static)
             ->where('country', $country)

src/Distilleries/Contentful/Webhook/AssetHandler.php

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     public function handle(string $action, array $payload, bool $isPreview)
     {
         $actionMethods = ['create', 'archive', 'unarchive', 'publish', 'unpublish', 'delete'];
-        $actionMethods = ! empty($isPreview) ? array_merge($actionMethods, ['save', 'auto_save']) : $actionMethods;
+        $actionMethods = !empty($isPreview) ? array_merge($actionMethods, ['save', 'auto_save']) : $actionMethods;
 
         if (method_exists($this, $action) && in_array($action, $actionMethods)) {
             $this->$action($payload);

src/Distilleries/Contentful/Api/BaseApi.php

Spacing +4 added lines, -4 removed lines

@@ -46,7 +46,7 @@ 
         $this->client = $client;
 
         $this->config = config('contentful', []);
-        $this->config = ! is_array($this->config) ? (array)$this->config : $this->config;
+        $this->config = !is_array($this->config) ? (array) $this->config : $this->config;
     }
 
     /**
@@ -62,13 +62,13 @@ 
         // Mandatory to make sure we have the last version modified by the scripts
         $this->config['use_preview'] = config('contentful.use_preview');
 
-        if ((isset($this->config['use_preview']) && $this->config['use_preview'] == true) && ! empty($this->previewBaseUrl)) {
+        if ((isset($this->config['use_preview']) && $this->config['use_preview'] == true) && !empty($this->previewBaseUrl)) {
             $baseUrl = rtrim($this->previewBaseUrl, '/');
         }
 
-        $environment = (isset($this->config['use_environment']) && $this->config['use_environment'] == true) ? '/environments/' . $this->config['environment'] . '/' : '/';
+        $environment = (isset($this->config['use_environment']) && $this->config['use_environment'] == true) ? '/environments/'.$this->config['environment'].'/' : '/';
 
-        return $baseUrl . '/spaces/' . $this->config['space_id'] . $environment . trim($endpoint, '/');
+        return $baseUrl.'/spaces/'.$this->config['space_id'].$environment.trim($endpoint, '/');
     }
 
     /**

src/Distilleries/Contentful/Api/Management/Api.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
      */
     public function contentTypeEditorInterface(string $contentTypeId): array
     {
-        $response = $this->client->request('GET', $this->url('content_types/' . $contentTypeId . '/editor_interface'), [
+        $response = $this->client->request('GET', $this->url('content_types/'.$contentTypeId.'/editor_interface'), [
             RequestOptions::HEADERS => $this->headers(),
         ]);
 
@@ -74,7 +74,7 @@ 
         $filters = [];
         $filters['content_type'] = $contentType;
         foreach ($fields as $field => $value) {
-            $filters['fields.' . $field] = $value;
+            $filters['fields.'.$field] = $value;
         }
 
         $response = $this->client->request('GET', $this->url('entries'), [
@@ -110,7 +110,7 @@ 
      */
     public function publishEntry(string $entryId, int $version = 1): array
     {
-        $response = $this->client->request('PUT', $this->url('entries/' . $entryId . '/published'), [
+        $response = $this->client->request('PUT', $this->url('entries/'.$entryId.'/published'), [
             RequestOptions::HEADERS => $this->headers([
                 'X-Contentful-Version' => $version,
             ]),
@@ -124,7 +124,7 @@ 
      */
     public function unpublishEntry(string $entryId): array
     {
-        $response = $this->client->request('DELETE', $this->url('entries/' . $entryId . '/published'), [
+        $response = $this->client->request('DELETE', $this->url('entries/'.$entryId.'/published'), [
             RequestOptions::HEADERS => $this->headers(),
         ]);
 
@@ -136,7 +136,7 @@ 
      */
     public function deleteEntry(string $entryId): bool
     {
-        $response = $this->client->request('DELETE', $this->url('entries/' . $entryId), [
+        $response = $this->client->request('DELETE', $this->url('entries/'.$entryId), [
             RequestOptions::HEADERS => $this->headers(),
         ]);
 
@@ -181,7 +181,7 @@ 
      */
     public function processAsset(string $assetId, string $locale, int $version = 1)
     {
-        $this->client->request('PUT', $this->url('environments/master/assets/' . $assetId . '/files/' . $locale . '/process'), [
+        $this->client->request('PUT', $this->url('environments/master/assets/'.$assetId.'/files/'.$locale.'/process'), [
             RequestOptions::HEADERS => $this->headers([
                 'X-Contentful-Version' => $version,
             ]),
@@ -193,7 +193,7 @@ 
      */
     public function publishAsset(string $assetId, int $version = 1): array
     {
-        $response = $this->client->request('PUT', $this->url('assets/' . $assetId . '/published'), [
+        $response = $this->client->request('PUT', $this->url('assets/'.$assetId.'/published'), [
             RequestOptions::HEADERS => $this->headers([
                 'X-Contentful-Version' => $version,
             ]),
@@ -207,7 +207,7 @@ 
      */
     public function unpublishAsset(string $assetId): array
     {
-        $response = $this->client->request('DELETE', $this->url('assets/' . $assetId . '/published'), [
+        $response = $this->client->request('DELETE', $this->url('assets/'.$assetId.'/published'), [
             RequestOptions::HEADERS => $this->headers(),
         ]);
 
@@ -219,7 +219,7 @@ 
      */
     public function deleteAsset(string $assetId): bool
     {
-        $response = $this->client->request('DELETE', $this->url('assets/' . $assetId), [
+        $response = $this->client->request('DELETE', $this->url('assets/'.$assetId), [
             RequestOptions::HEADERS => $this->headers(),
         ]);
 
@@ -240,7 +240,7 @@ 
     {
         return array_merge([
             'Content-Type' => 'application/vnd.contentful.management.v1+json',
-            'Authorization' => 'Bearer ' . $this->config['tokens']['management'],
+            'Authorization' => 'Bearer '.$this->config['tokens']['management'],
         ], $headers);
     }
 }