area17 / twill

src/Services/MediaLibrary/Local.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
     public function getRawUrl($id)
     {
-        return '/'.$id;
+        return '/' . $id;
     }
 
     public function getDimensions($id)

src/Services/Uploader/SignS3Upload.php

Spacing +5 added lines, -5 removed lines

@@ -16,8 +16,8 @@ 
         $policyJson = json_encode($policyObject);
         $policyHeaders = $policyObject['headers'] ?? null;
 
-        $this->bucket = config('filesystems.disks.'.$disk.'.bucket');
-        $this->secret = config('filesystems.disks.'.$disk.'.secret');
+        $this->bucket = config('filesystems.disks.' . $disk . '.bucket');
+        $this->secret = config('filesystems.disks.' . $disk . '.secret');
         $this->endpoint = s3Endpoint($disk);
 
         if ($policyHeaders) {
@@ -78,7 +78,7 @@ 
         $pattern = "/.+\/(.+)\\/(.+)\/s3\/aws4_request/";
         preg_match($pattern, $credentialCondition, $matches);
 
-        $dateKey = hash_hmac('sha256', $matches[1], 'AWS4'.$this->secret, true);
+        $dateKey = hash_hmac('sha256', $matches[1], 'AWS4' . $this->secret, true);
         $dateRegionKey = hash_hmac('sha256', $matches[2], $dateKey, true);
         $dateRegionServiceKey = hash_hmac('sha256', 's3', $dateRegionKey, true);
         $signingKey = hash_hmac('sha256', 'aws4_request', $dateRegionServiceKey, true);
@@ -108,8 +108,8 @@ 
         $pattern = "/.+\\n.+\\n(\\d+)\/(.+)\/s3\/aws4_request\\n(.+)/s";
         preg_match($pattern, $policyHeaders, $matches);
         $hashedCanonicalRequest = hash('sha256', $matches[3]);
-        $stringToSign = preg_replace("/^(.+)\/s3\/aws4_request\\n.+$/s", '$1/s3/aws4_request'."\n".$hashedCanonicalRequest, $policyHeaders);
-        $dateKey = hash_hmac('sha256', $matches[1], 'AWS4'.$this->secret, true);
+        $stringToSign = preg_replace("/^(.+)\/s3\/aws4_request\\n.+$/s", '$1/s3/aws4_request' . "\n" . $hashedCanonicalRequest, $policyHeaders);
+        $dateKey = hash_hmac('sha256', $matches[1], 'AWS4' . $this->secret, true);
         $dateRegionKey = hash_hmac('sha256', $matches[2], $dateKey, true);
         $dateRegionServiceKey = hash_hmac('sha256', 's3', $dateRegionKey, true);
         $signingKey = hash_hmac('sha256', 'aws4_request', $dateRegionServiceKey, true);

src/ValidationServiceProvider.php

Spacing +7 added lines, -7 removed lines

@@ -10,27 +10,27 @@ 
 {
     public function boot()
     {
-        Validator::extend('absolute_or_relative_url', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('absolute_or_relative_url', function($attribute, $value, $parameters, $validator) {
             return starts_with($value, '/') || Validator::make([$attribute => $value], [$attribute => 'url'])->passes();
         }, 'The :attribute should be a valid url (absolute or relative)');
 
-        Validator::extend('relative_or_secure_url', function ($attribute, $value, $parameters) {
+        Validator::extend('relative_or_secure_url', function($attribute, $value, $parameters) {
             return starts_with($value, '/') || filter_var($value, FILTER_VALIDATE_URL) !== false && starts_with($value, 'https');
         }, 'The :attribute should be a valid url (relative or https)');
 
-        Validator::extend('web_color', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('web_color', function($attribute, $value, $parameters, $validator) {
             return preg_match('/^([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/i', $value);
         });
 
-        Validator::extend('phone_number', function ($attribute, $value, $parameters) {
+        Validator::extend('phone_number', function($attribute, $value, $parameters) {
             return preg_match("/^[+]?[0-9\-\ ]*$/", $value);
         });
 
-        Validator::extend('validBlocks', function ($attribute, $value, $parameters, $validator) {
+        Validator::extend('validBlocks', function($attribute, $value, $parameters, $validator) {
             foreach ($value as $block) {
                 $cmsBlock = app(BlockRepository::class)->buildFromCmsArray($block, false);
 
-                $rules = config('cms-toolkit.block_editor.blocks.'.$cmsBlock['type'].'.rules') ?? [];
+                $rules = config('cms-toolkit.block_editor.blocks.' . $cmsBlock['type'] . '.rules') ?? [];
 
                 unset($cmsBlock['content']);
 
@@ -43,7 +43,7 @@ 
                 }
 
                 if (!empty($blockMessages ?? [])) {
-                    $validator->errors()->add('block.'.$block['id'], implode('<br>', $blockMessages));
+                    $validator->errors()->add('block.' . $block['id'], implode('<br>', $blockMessages));
                 }
 
                 $blockMessages = [];

src/TwillServiceProvider.php

Spacing +42 added lines, -42 removed lines

@@ -70,7 +70,7 @@ 
             'blocks' => Block::class,
         ]);
 
-        config(['twill.version' => trim(file_get_contents(__DIR__.'/../VERSION'))]);
+        config(['twill.version' => trim(file_get_contents(__DIR__ . '/../VERSION'))]);
     }
 
     public function provides()
@@ -93,13 +93,13 @@ 
         }
 
         if (config('twill.enabled.media-library')) {
-            $this->app->singleton('imageService', function () {
+            $this->app->singleton('imageService', function() {
                 return $this->app->make(config('twill.media_library.image_service'));
             });
         }
 
         if (config('twill.enabled.file-library')) {
-            $this->app->singleton('fileService', function () {
+            $this->app->singleton('fileService', function() {
                 return $this->app->make(config('twill.file_library.file_service'));
             });
         }
@@ -127,9 +127,9 @@ 
     private function publishConfigs()
     {
         if (config('twill.enabled.users-management')) {
-            config(['auth.providers.users' => require __DIR__.'/../config/auth.php']);
+            config(['auth.providers.users' => require __DIR__ . '/../config/auth.php']);
             config(['mail.markdown.paths' => array_merge(
-                [__DIR__.'/../views/emails'],
+                [__DIR__ . '/../views/emails'],
                 config('mail.markdown.paths')
             )]);
         }
@@ -139,23 +139,23 @@ 
 
         config(['analytics.service_account_credentials_json' => config('twill.dashboard.analytics.service_account_credentials_json', storage_path('app/analytics/service-account-credentials.json'))]);
 
-        $this->publishes([__DIR__.'/../config/twill-publish.php' => config_path('twill.php')], 'config');
-        $this->publishes([__DIR__.'/../config/twill-navigation.php' => config_path('twill-navigation.php')], 'config');
+        $this->publishes([__DIR__ . '/../config/twill-publish.php' => config_path('twill.php')], 'config');
+        $this->publishes([__DIR__ . '/../config/twill-navigation.php' => config_path('twill-navigation.php')], 'config');
     }
 
     private function mergeConfigs()
     {
-        $this->mergeConfigFrom(__DIR__.'/../config/twill.php', 'twill');
-        $this->mergeConfigFrom(__DIR__.'/../config/disks.php', 'filesystems.disks');
-        $this->mergeConfigFrom(__DIR__.'/../config/frontend.php', 'twill.frontend');
-        $this->mergeConfigFrom(__DIR__.'/../config/debug.php', 'twill.debug');
-        $this->mergeConfigFrom(__DIR__.'/../config/seo.php', 'twill.seo');
-        $this->mergeConfigFrom(__DIR__.'/../config/blocks.php', 'twill.block_editor');
-        $this->mergeConfigFrom(__DIR__.'/../config/enabled.php', 'twill.enabled');
-        $this->mergeConfigFrom(__DIR__.'/../config/imgix.php', 'twill.imgix');
-        $this->mergeConfigFrom(__DIR__.'/../config/media-library.php', 'twill.media_library');
-        $this->mergeConfigFrom(__DIR__.'/../config/file-library.php', 'twill.file_library');
-        $this->mergeConfigFrom(__DIR__.'/../config/cloudfront.php', 'services');
+        $this->mergeConfigFrom(__DIR__ . '/../config/twill.php', 'twill');
+        $this->mergeConfigFrom(__DIR__ . '/../config/disks.php', 'filesystems.disks');
+        $this->mergeConfigFrom(__DIR__ . '/../config/frontend.php', 'twill.frontend');
+        $this->mergeConfigFrom(__DIR__ . '/../config/debug.php', 'twill.debug');
+        $this->mergeConfigFrom(__DIR__ . '/../config/seo.php', 'twill.seo');
+        $this->mergeConfigFrom(__DIR__ . '/../config/blocks.php', 'twill.block_editor');
+        $this->mergeConfigFrom(__DIR__ . '/../config/enabled.php', 'twill.enabled');
+        $this->mergeConfigFrom(__DIR__ . '/../config/imgix.php', 'twill.imgix');
+        $this->mergeConfigFrom(__DIR__ . '/../config/media-library.php', 'twill.media_library');
+        $this->mergeConfigFrom(__DIR__ . '/../config/file-library.php', 'twill.file_library');
+        $this->mergeConfigFrom(__DIR__ . '/../config/cloudfront.php', 'services');
     }
 
     private function publishMigrations()
@@ -175,7 +175,7 @@ 
             }
 
             foreach ($optionalMigrations as $migration => $feature) {
-                if (config('twill.enabled.'.$feature)) {
+                if (config('twill.enabled.' . $feature)) {
                     $this->publishMigration($migration);
                 }
             }
@@ -187,14 +187,14 @@ 
         if (!class_exists($migration)) {
             $timestamp = date('Y_m_d_His', time());
             $this->publishes([
-                __DIR__.'/../migrations/'.snake_case($migration).'.php' => database_path('migrations/'.$timestamp.'_'.snake_case($migration).'.php'),
+                __DIR__ . '/../migrations/' . snake_case($migration) . '.php' => database_path('migrations/' . $timestamp . '_' . snake_case($migration) . '.php'),
             ], 'migrations');
         }
     }
 
     private function registerAndPublishViews()
     {
-        $viewPath = __DIR__.'/../views';
+        $viewPath = __DIR__ . '/../views';
 
         $this->loadViewsFrom($viewPath, 'twill');
         $this->publishes([$viewPath => resource_path('views/vendor/twill')], 'views');
@@ -213,30 +213,30 @@ 
 
     private function requireHelpers()
     {
-        require_once __DIR__.'/Helpers/routes_helpers.php';
-        require_once __DIR__.'/Helpers/i18n_helpers.php';
-        require_once __DIR__.'/Helpers/media_library_helpers.php';
-        require_once __DIR__.'/Helpers/frontend_helpers.php';
-        require_once __DIR__.'/Helpers/migrations_helpers.php';
-        require_once __DIR__.'/Helpers/helpers.php';
+        require_once __DIR__ . '/Helpers/routes_helpers.php';
+        require_once __DIR__ . '/Helpers/i18n_helpers.php';
+        require_once __DIR__ . '/Helpers/media_library_helpers.php';
+        require_once __DIR__ . '/Helpers/frontend_helpers.php';
+        require_once __DIR__ . '/Helpers/migrations_helpers.php';
+        require_once __DIR__ . '/Helpers/helpers.php';
     }
 
     private function publishPublicAssets()
     {
-        $this->publishes([__DIR__.'/../assets' => public_path('assets')], 'assets');
+        $this->publishes([__DIR__ . '/../assets' => public_path('assets')], 'assets');
     }
 
     private function includeView($view, $expression)
     {
         list($name) = str_getcsv($expression, ',', '\'');
 
-        $partialNamespace = view()->exists('admin.'.$view.$name) ? 'admin.' : 'twill::';
+        $partialNamespace = view()->exists('admin.' . $view . $name) ? 'admin.' : 'twill::';
 
-        $view = $partialNamespace.$view.$name;
+        $view = $partialNamespace . $view . $name;
 
         $expression = explode(',', $expression);
         array_shift($expression);
-        $expression = '('.implode(',', $expression).')';
+        $expression = '(' . implode(',', $expression) . ')';
         if ($expression === '()') {
             $expression = '([])';
         }
@@ -248,20 +248,20 @@ 
     {
         $blade = $this->app['view']->getEngineResolver()->resolve('blade')->getCompiler();
 
-        $blade->directive('dd', function ($param) {
+        $blade->directive('dd', function($param) {
             return "<?php dd({$param}); ?>";
         });
 
-        $blade->directive('dumpData', function ($data) {
+        $blade->directive('dumpData', function($data) {
             return sprintf("<?php (new Illuminate\Support\Debug\Dumper)->dump(%s); exit; ?>",
                 null != $data ? $data : 'get_defined_vars()');
         });
 
-        $blade->directive('formField', function ($expression) use ($blade) {
+        $blade->directive('formField', function($expression) use ($blade) {
             return $this->includeView('partials.form._', $expression);
         });
 
-        $blade->directive('partialView', function ($expression) use ($blade) {
+        $blade->directive('partialView', function($expression) use ($blade) {
             $expressionAsArray = str_getcsv($expression, ',', '\'');
 
             list($moduleName, $viewName) = $expressionAsArray;
@@ -270,7 +270,7 @@ 
             $viewModule = "'admin.'.$moduleName.'.{$viewName}'";
             $viewApplication = "'admin.partials.{$viewName}'";
             $viewModuleTwill = "'twill::'.$moduleName.'.{$viewName}'";
-            $view = $partialNamespace.'.'.$viewName;
+            $view = $partialNamespace . '.' . $viewName;
 
             if (!isset($moduleName) || is_null($moduleName)) {
                 $viewModule = $viewApplication;
@@ -278,7 +278,7 @@ 
 
             $expression = explode(',', $expression);
             $expression = array_slice($expression, 2);
-            $expression = '('.implode(',', $expression).')';
+            $expression = '(' . implode(',', $expression) . ')';
             if ($expression === '()') {
                 $expression = '([])';
             }
@@ -296,14 +296,14 @@ 
             ?>";
         });
 
-        $blade->directive('pushonce', function ($expression) {
+        $blade->directive('pushonce', function($expression) {
             list($pushName, $pushSub) = explode(':', trim(substr($expression, 1, -1)));
-            $key = '__pushonce_'.$pushName.'_'.str_replace('-', '_', $pushSub);
+            $key = '__pushonce_' . $pushName . '_' . str_replace('-', '_', $pushSub);
 
             return "<?php if(! isset(\$__env->{$key})): \$__env->{$key} = 1; \$__env->startPush('{$pushName}'); ?>";
         });
 
-        $blade->directive('endpushonce', function () {
+        $blade->directive('endpushonce', function() {
             return '<?php $__env->stopPush(); endif; ?>';
         });
     }
@@ -324,7 +324,7 @@ 
 
         View::composer('twill::partials.navigation.*', ActiveNavigation::class);
 
-        View::composer(['admin.*', 'templates.*', 'twill::*'], function ($view) {
+        View::composer(['admin.*', 'templates.*', 'twill::*'], function($view) {
             $with = array_merge([
                 'renderForBlocks' => false,
                 'renderForModal'  => false,
@@ -336,7 +336,7 @@ 
 
     private function registerAndPublishTranslations()
     {
-        $translationPath = __DIR__.'/../lang';
+        $translationPath = __DIR__ . '/../lang';
 
         $this->loadTranslationsFrom($translationPath, 'twill');
         $this->publishes([$translationPath => resource_path('lang/vendor/twill')], 'translations');

src/Helpers/media_library_helpers.php

Spacing +2 added lines, -2 removed lines

@@ -5,7 +5,7 @@ 
     {
         $scheme = config("filesystems.disks.{$disk}.use_https") ? 'https://' : '';
 
-        return $scheme.config("filesystems.disks.{$disk}.bucket").'.'.Storage::disk($disk)->getAdapter()->getClient()->getEndpoint()->getHost();
+        return $scheme . config("filesystems.disks.{$disk}.bucket") . '.' . Storage::disk($disk)->getAdapter()->getClient()->getEndpoint()->getHost();
     }
 }
 
@@ -18,7 +18,7 @@ 
             $bytes /= 1024;
         }
 
-        return round($bytes, 2).' '.$units[$i];
+        return round($bytes, 2) . ' ' . $units[$i];
     }
 }
 

src/Helpers/frontend_helpers.php

Spacing +8 added lines, -8 removed lines

@@ -5,19 +5,19 @@ 
     {
         if (!app()->environment('local', 'development')) {
             try {
-                $manifest = Cache::rememberForever('rev-manifest', function () {
+                $manifest = Cache::rememberForever('rev-manifest', function() {
                     return json_decode(file_get_contents(config('twill.frontend.rev_manifest_path')), true);
                 });
 
                 if (isset($manifest[$file])) {
-                    return (rtrim(config('twill.frontend.dist_assets_path'), '/').'/').$manifest[$file];
+                    return (rtrim(config('twill.frontend.dist_assets_path'), '/') . '/') . $manifest[$file];
                 }
             } catch (\Exception $e) {
-                return '/'.$file;
+                return '/' . $file;
             }
         }
 
-        return (rtrim(config('twill.frontend.dev_assets_path'), '/').'/').$file;
+        return (rtrim(config('twill.frontend.dev_assets_path'), '/') . '/') . $file;
     }
 }
 
@@ -27,11 +27,11 @@ 
      */
     function icon($name, $opts = [])
     {
-        $title = isset($opts['title']) ? ' title="'.htmlentities($opts['title'], ENT_QUOTES, 'UTF-8').'" ' : '';
-        $role = isset($opts['role']) ? ' role="'.htmlentities($opts['role'], ENT_QUOTES, 'UTF-8').'" ' : ' role="presentation" ';
+        $title = isset($opts['title']) ? ' title="' . htmlentities($opts['title'], ENT_QUOTES, 'UTF-8') . '" ' : '';
+        $role = isset($opts['role']) ? ' role="' . htmlentities($opts['role'], ENT_QUOTES, 'UTF-8') . '" ' : ' role="presentation" ';
         $css_class = isset($opts['css_class']) ? htmlentities($opts['css_class'], ENT_QUOTES, 'UTF-8') : '';
-        $svg_link = config('twill.frontend.svg_sprites_use_hash_only') ? "#icon--$name" : revAsset(config('twill.frontend.svg_sprites_path'))."#icon--$name";
+        $svg_link = config('twill.frontend.svg_sprites_use_hash_only') ? "#icon--$name" : revAsset(config('twill.frontend.svg_sprites_path')) . "#icon--$name";
 
-        return "<svg class=\"icon--$name $css_class\" $title $role><use xlink:href=\"".$svg_link.'"></use></svg>';
+        return "<svg class=\"icon--$name $css_class\" $title $role><use xlink:href=\"" . $svg_link . '"></use></svg>';
     }
 }

src/Helpers/migrations_helpers.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         $table->foreign("{$table1NameSingular}_id")->references('id')->on($table1NamePlural)->onDelete('cascade');
         $table->integer("{$table2NameSingular}_id")->unsigned();
         $table->foreign("{$table2NameSingular}_id")->references('id')->on($table2NamePlural)->onDelete('cascade');
-        $table->index(["{$table2NameSingular}_id", "{$table1NameSingular}_id"], "idx_{$table1NameSingular}_{$table2NameSingular}_".str_random(5));
+        $table->index(["{$table2NameSingular}_id", "{$table1NameSingular}_id"], "idx_{$table1NameSingular}_{$table2NameSingular}_" . str_random(5));
     }
 }
 

src/Helpers/routes_helpers.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 if (!function_exists('moduleRoute')) {
     function moduleRoute($moduleName, $prefix, $action, $parameters = [], $absolute = true)
     {
-        $routeName = 'admin.'.($prefix ? $prefix.'.' : '').camel_case($moduleName).'.'.$action;
+        $routeName = 'admin.' . ($prefix ? $prefix . '.' : '') . camel_case($moduleName) . '.' . $action;
 
         return route($routeName, $parameters, $absolute);
     }

src/Helpers/i18n_helpers.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
     {
         $manageMultipleLanguages = count(getLocales()) > 1;
         if ($manageMultipleLanguages && $translate) {
-            $allLanguages = collect(config('translatable.locales'))->map(function ($locale, $index) use ($form_fields) {
+            $allLanguages = collect(config('translatable.locales'))->map(function($locale, $index) use ($form_fields) {
                 return [
                     'shortlabel' => strtoupper($locale),
                     'label'      => getLanguageLabelFromLocaleCode($locale),