Distilleries / Laravel-Contentful-Utilities

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

Spacing +9 added lines, -9 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;
@@ -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/Scopes/ValidatedScope.php

Spacing +4 added lines, -4 removed lines

@@ -19,10 +19,10 @@ 
     public function apply(Builder $builder, Model $model)
     {
         $builder
-            ->where(function ($query) use ($model) {
+            ->where(function($query) use ($model) {
                 $query
-                    ->whereNull($model->getTable() . '.validated_at')
-                    ->orWhere($model->getTable() . '.validated_at', '>=', Carbon::now()->format('Y-m-d H:i:s'));
+                    ->whereNull($model->getTable().'.validated_at')
+                    ->orWhere($model->getTable().'.validated_at', '>=', Carbon::now()->format('Y-m-d H:i:s'));
             });
 
         $this->extend($builder);
@@ -36,7 +36,7 @@ 
      */
     public function extend(Builder $builder)
     {
-        $builder->macro('withoutValidated', function (Builder $builder) {
+        $builder->macro('withoutValidated', function(Builder $builder) {
             return $builder->withoutGlobalScope($this);
         });
     }

src/Distilleries/Contentful/Webhook/EntryHandler.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/Repositories/AssetsRepository.php

Spacing +5 added lines, -7 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,11 +165,9 @@ 
      */
     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 +13 added lines, -13 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,7 +58,7 @@ 
         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']);
                     unset($localeEntry['relationships']);
@@ -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/Commands/Sync/Traits/SyncTrait.php

Spacing +17 added lines, -17 removed lines

@@ -29,11 +29,11 @@ 
      */
     protected function dumpSync(bool $isPreview, string $connector = 'mysql'): string
     {
-        $path = storage_path('dumps/' . date('YmdHis') . '_sync' . ($isPreview ? '_preview' : '') . '.sql');
-        $this->warn('Dump "' . basename($path) . '"...');
+        $path = storage_path('dumps/'.date('YmdHis').'_sync'.($isPreview ? '_preview' : '').'.sql');
+        $this->warn('Dump "'.basename($path).'"...');
 
         $dirName = dirname($path);
-        if (! is_dir($dirName)) {
+        if (!is_dir($dirName)) {
             mkdir($dirName, 0777, true);
         }
 
@@ -55,12 +55,12 @@ 
 
         $command = sprintf(
             $exec,
-            addcslashes(config('database.connections.' . $connector . '.password'), "'"),
-            config('database.connections.' . $connector . '.charset'),
-            config('database.connections.' . $connector . '.database'),
-            config('database.connections.' . $connector . '.username'),
-            config('database.connections.' . $connector . '.host'),
-            config('database.connections.' . $connector . '.port'),
+            addcslashes(config('database.connections.'.$connector.'.password'), "'"),
+            config('database.connections.'.$connector.'.charset'),
+            config('database.connections.'.$connector.'.database'),
+            config('database.connections.'.$connector.'.username'),
+            config('database.connections.'.$connector.'.host'),
+            config('database.connections.'.$connector.'.port'),
             $path
         );
         exec($command);
@@ -68,9 +68,9 @@ 
 
     protected function getConnector(bool $isPreview, string $connector = 'mysql'): string
     {
-        $compiledConnector = $connector . ($isPreview ? '_preview' : '');
+        $compiledConnector = $connector.($isPreview ? '_preview' : '');
 
-        if (empty(config('database.connections.' . $compiledConnector . '.username'))) {
+        if (empty(config('database.connections.'.$compiledConnector.'.username'))) {
             $compiledConnector = $connector;
         }
 
@@ -93,7 +93,7 @@ 
             'database.default' => $compiledConnector,
         ]);
 
-        $this->warn('Put into "' . $compiledConnector . '" database...');
+        $this->warn('Put into "'.$compiledConnector.'" database...');
         $this->putSql($path, $compiledConnector);
     }
 
@@ -110,11 +110,11 @@ 
 
         $command = sprintf(
             $exec,
-            addcslashes(config('database.connections.' . $connector . '.password'), "'"),
-            config('database.connections.' . $connector . '.username'),
-            config('database.connections.' . $connector . '.host'),
-            config('database.connections.' . $connector . '.port'),
-            config('database.connections.' . $connector . '.database'),
+            addcslashes(config('database.connections.'.$connector.'.password'), "'"),
+            config('database.connections.'.$connector.'.username'),
+            config('database.connections.'.$connector.'.host'),
+            config('database.connections.'.$connector.'.port'),
+            config('database.connections.'.$connector.'.database'),
             $path
         );