Distilleries / Laravel-Contentful-Utilities

src/Distilleries/Contentful/Commands/Generators/Definitions/BooleanDefinition.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
      */
     public function modelGetter()
     {
-        $stubPath = __DIR__ . '/stubs/boolean.stub';
+        $stubPath = __DIR__.'/stubs/boolean.stub';
 
         return self::getStub($stubPath, [
             'field' => $this->id(),
@@ -22,6 +22,6 @@ 
      */
     public function modelProperty()
     {
-        return ' * @property bool $' . $this->snakeId();
+        return ' * @property bool $'.$this->snakeId();
     }
 }

src/Distilleries/Contentful/Commands/Generators/AbstractGenerator.php

Spacing +6 added lines, -6 removed lines

@@ -38,7 +38,7 @@ 
      */
     protected function tableName($id)
     {
-        return DB::getTablePrefix() . Str::plural(Str::snake($id));
+        return DB::getTablePrefix().Str::plural(Str::snake($id));
     }
 
     /**
@@ -55,7 +55,7 @@ 
     {
         $content = file_get_contents($stubPath);
         foreach ($replacements as $key => $value) {
-            $content = str_replace('{{' . Str::upper($key) . '}}', $value, $content);
+            $content = str_replace('{{'.Str::upper($key).'}}', $value, $content);
         }
 
         file_put_contents($destPath, $content);
@@ -98,8 +98,8 @@ 
             ]],
         ];
 
-        $assetContentType['fields'] = array_map(function ($field) {
-            if (! isset($field['required'])) {
+        $assetContentType['fields'] = array_map(function($field) {
+            if (!isset($field['required'])) {
                 $field['required'] = true;
             }
             $field['disabled'] = false;
@@ -120,7 +120,7 @@ 
      */
     protected function fieldDefinition($table, $field): ?DefinitionInterface
     {
-        $className = '\Distilleries\Contentful\Commands\Generators\Definitions\\' . $field['type'] . 'Definition';
+        $className = '\Distilleries\Contentful\Commands\Generators\Definitions\\'.$field['type'].'Definition';
 
         if (class_exists($className)) {
             return new $className($table, $field);
@@ -137,6 +137,6 @@ 
      */
     protected function isFieldEnabled($field): bool
     {
-        return ! $field['disabled'] && ! $field['omitted'];
+        return !$field['disabled'] && !$field['omitted'];
     }
 }

src/Distilleries/Contentful/Commands/Generators/Models.php

Spacing +11 added lines, -11 removed lines

@@ -27,16 +27,16 @@ 
     {
         $contentTypes = $this->api->contentTypes();
 
-        if (! empty($contentTypes['items'])) {
+        if (!empty($contentTypes['items'])) {
             array_unshift($contentTypes['items'], $this->assetContentType());
 
             foreach ($contentTypes['items'] as $contentType) {
                 if ($contentType['sys']['id'] !== 'asset') {
-                    $this->info('Content-Type: ' . Str::upper($contentType['name']));
+                    $this->info('Content-Type: '.Str::upper($contentType['name']));
                     $file = $this->createMapper($contentType);
-                    $this->line('Mapper "' . $file . '" created');
+                    $this->line('Mapper "'.$file.'" created');
                     $file = $this->createModel($contentType);
-                    $this->line('Model "' . $file . '" created');
+                    $this->line('Model "'.$file.'" created');
                 }
             }
         }
@@ -54,8 +54,8 @@ 
         $table = $this->tableName($contentType['sys']['id']);
         $model = Str::studly(Str::singular($table));
 
-        $stubPath = __DIR__ . '/stubs/model.stub';
-        $destPath = rtrim(config('contentful.generator.model'), '/') . '/' . $model . '.php';
+        $stubPath = __DIR__.'/stubs/model.stub';
+        $destPath = rtrim(config('contentful.generator.model'), '/').'/'.$model.'.php';
 
         return static::writeStub($stubPath, $destPath, [
             'model' => $model,
@@ -76,8 +76,8 @@ 
         $table = $this->tableName($contentType['sys']['id']);
         $model = Str::studly(Str::singular($table));
 
-        $stubPath = __DIR__ . '/stubs/mapper.stub';
-        $destPath = rtrim(config('contentful.generator.mapper'), '/') . '/' . $model . 'Mapper.php';
+        $stubPath = __DIR__.'/stubs/mapper.stub';
+        $destPath = rtrim(config('contentful.generator.mapper'), '/').'/'.$model.'Mapper.php';
 
         return static::writeStub($stubPath, $destPath, [
             'model' => $model
@@ -102,11 +102,11 @@ 
             }
         }
 
-        $getters = rtrim(implode("\n", array_map(function ($getter) {
+        $getters = rtrim(implode("\n", array_map(function($getter) {
             return $getter;
         }, $getters)));
 
-        return ! empty($getters) ? "\n" . $getters : "\n\t\t//";
+        return !empty($getters) ? "\n".$getters : "\n\t\t//";
     }
 
     /**
@@ -127,6 +127,6 @@ 
             }
         }
 
-        return ! empty($properties) ? "\n" . implode("\n", $properties) : '';
+        return !empty($properties) ? "\n".implode("\n", $properties) : '';
     }
 }

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/Base/ContentfulModel.php

Spacing +16 added lines, -16 removed lines

@@ -45,14 +45,14 @@ 
     {
         // Override fillable
         foreach ($this->defaultFillable() as $defaultFillable) {
-            if (! in_array($defaultFillable, $this->fillable)) {
+            if (!in_array($defaultFillable, $this->fillable)) {
                 $this->fillable[] = $defaultFillable;
             }
         }
 
         // Override casts
         foreach ($this->defaultCasts() as $field => $type) {
-            if (! isset($this->casts[$field])) {
+            if (!isset($this->casts[$field])) {
                 $this->casts[$field] = $type;
             }
         }
@@ -117,7 +117,7 @@ 
      */
     protected function getAndSetPayloadContentfulAsset(string $payload, $link, $query = null): ?Asset
     {
-        if (! isset($this->attributes[$payload]) && isset($this->payload[$payload])) {
+        if (!isset($this->attributes[$payload]) && isset($this->payload[$payload])) {
             $this->attributes[$payload] = $this->contentfulAsset($link, $query);
             return $this->attributes[$payload];
         } else {
@@ -149,13 +149,13 @@ 
             ->where('locale', '=', $this->locale)
             ->where('country', '=', $this->country);
 
-        if (! empty($query)) {
+        if (!empty($query)) {
             $instance = call_user_func($query, $instance);
         }
 
         $asset = $instance->first();
 
-        return ! empty($asset) ? $asset : null;
+        return !empty($asset) ? $asset : null;
     }
 
     /**
@@ -168,7 +168,7 @@ 
      */
     protected function getAndSetPayloadContentfulEntries(string $payload, array $links, $query = null): Collection
     {
-        if (! isset($this->attributes[$payload]) && isset($this->payload[$payload])) {
+        if (!isset($this->attributes[$payload]) && isset($this->payload[$payload])) {
             $this->attributes[$payload] = $this->contentfulEntries($links, $query, $payload);
 
             return $this->attributes[$payload];
@@ -191,7 +191,7 @@ 
      */
     protected function getAndSetPayloadContentfulEntry(string $payload, array $links, $query = null): ?ContentfulModel
     {
-        if (! isset($this->attributes[$payload]) && isset($this->payload[$payload])) {
+        if (!isset($this->attributes[$payload]) && isset($this->payload[$payload])) {
             $this->attributes[$payload] = $this->contentfulEntry($links, $query, $payload);
 
             return $this->attributes[$payload];
@@ -240,12 +240,12 @@ 
         $entryIds = [];
         foreach ($links as $link) {
             $entryId = $this->contentfulLinkId($link);
-            if (! empty($entryId)) {
+            if (!empty($entryId)) {
                 $entryIds[] = $entryId;
             }
         }
 
-        if (! empty($entryIds)) {
+        if (!empty($entryIds)) {
             $relationships = EntryRelationship::select('related_contentful_id', 'related_contentful_type')
                 ->distinct()
                 ->locale($this->locale, $this->country)
@@ -262,20 +262,20 @@ 
                     $model = NamespaceResolver::model($relationship->related_contentful_type);
                 }
 
-                if (! empty($model)) {
+                if (!empty($model)) {
                     $instance = $model->query()
                         ->where('country', '=', $this->country)
                         ->where('locale', '=', $this->locale)
                         ->where('contentful_id', '=', $relationship->related_contentful_id);
 
-                    if (! empty($query)) {
+                    if (!empty($query)) {
                         $instance = call_user_func($query, $instance);
                     }
 
                     $instance = $instance->first();
                 }
 
-                if (! empty($instance)) {
+                if (!empty($instance)) {
                     $entries[] = $instance;
                 }
             }
@@ -299,7 +299,7 @@ 
             ->locale($this->locale, $this->country)
             ->where('related_contentful_id', '=', $contentfulId);
 
-        if (! empty($contentfulType)) {
+        if (!empty($contentfulType)) {
             $query = $query->where('source_contentful_type', '=', $contentfulType);
         }
 
@@ -311,12 +311,12 @@ 
                 $model = NamespaceResolver::model($relationship->related_contentful_type);
             }
 
-            $instance = ! empty($model) ? $model->query()
+            $instance = !empty($model) ? $model->query()
                 ->locale($this->locale, $this->country)
                 ->where('contentful_id', '=', $relationship->source_contentful_id)
                 ->first() : null;
 
-            if (! empty($instance)) {
+            if (!empty($instance)) {
                 $entries[] = $instance;
             }
         }
@@ -375,7 +375,7 @@ 
         $array = parent::toArray();
 
         foreach ($this->getMutatedAttributes() as $key) {
-            if (! array_key_exists($key, $array)) {
+            if (!array_key_exists($key, $array)) {
                 $array[$key] = $this->{$key};
             }
         }

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;
         }