thinktomorrow / chief

src/Media/UploadMedia.php

Spacing +11 added lines, -11 removed lines

@@ -113,7 +113,7 @@ 
         if (isset(json_decode($file)->output)) {
             $image_name = json_decode($file)->output->name;
             $asset      = app(AddAsset::class)->add($model, json_decode($file)->output->image, $type, $locale, $this->sluggifyFilename($image_name));
-        } else {
+        }else {
             if ($file instanceof UploadedFile) {
                 $image_name = $file->getClientOriginalName();
                 $asset      = app(AddAsset::class)->add($model, $file, $type, $locale, $this->sluggifyFilename($image_name));
@@ -121,16 +121,16 @@ 
                 // New files are passed with their filename (instead of their id)
                 // For new files we will replace the filename with the id.
                 if (false !== ($key = array_search($image_name, $files_order))) {
-                    $files_order[$key] = (string) $asset->id;
+                    $files_order[$key] = (string)$asset->id;
                 }
-            } else {
-                $file   = Asset::find($file);
+            }else {
+                $file = Asset::find($file);
                 if ($file) {
                     if ($model->assetRelation()->where('asset_pivots.type', $type)->where('asset_pivots.locale', $locale)->get()->contains($file)) {
                         throw new DuplicateAssetException();
                     }
 
-                    $asset  = app(AddAsset::class)->add($model, $file, $type, $locale);
+                    $asset = app(AddAsset::class)->add($model, $file, $type, $locale);
                 }
             }
         }
@@ -142,9 +142,9 @@ 
      */
     private function sluggifyFilename($filename): string
     {
-        $extension = substr($filename, strrpos($filename, '.') + 1);
+        $extension = substr($filename, strrpos($filename, '.')+1);
         $filename  = substr($filename, 0, strrpos($filename, '.'));
-        $filename  = Str::slug($filename) . '.' . $extension;
+        $filename  = Str::slug($filename).'.'.$extension;
 
         return $filename;
     }
@@ -160,9 +160,9 @@ 
                 if ($file instanceof UploadedFile && !$file->isValid()) {
                     if ($file->getError() == UPLOAD_ERR_INI_SIZE) {
                         throw new FileTooBigException(
-                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' .
-                            'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' .
-                            'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB'
+                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '.
+                            'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '.
+                            'post_max_size: '.(int)(ini_get('post_max_size')).'MB'
                         );
                     }
                 }
@@ -177,7 +177,7 @@ 
             foreach ($files as $locale => $_files) {
                 foreach ($_files as $action => $file) {
                     if (!in_array($action, $actions)) {
-                        throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead ' . $action . ' is given.');
+                        throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead '.$action.' is given.');
                     }
                 }
             }

src/Pages/Console/GeneratePage.php

Spacing +11 added lines, -11 removed lines

@@ -31,8 +31,8 @@ 
 
         // Set required paths
         $this->dirs = ['base' => $this->settings['base_path'] ?? base_path()];
-        $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'] .'/'. config('thinktomorrow.chief.domain.path', 'src');
-        $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'] . '/resources/views';
+        $this->dirs['model'] = $this->settings['model_path'] ?? $this->dirs['base'].'/'.config('thinktomorrow.chief.domain.path', 'src');
+        $this->dirs['views'] = $this->settings['views_path'] ?? $this->dirs['base'].'/resources/views';
     }
 
     public function handle()
@@ -49,8 +49,8 @@ 
     private function publishModel()
     {
         $this->publishFile(
-            __DIR__ . '/stubs/model.php.stub',
-            $to = $this->dirs['model'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php',
+            __DIR__.'/stubs/model.php.stub',
+            $to = $this->dirs['model'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php',
             'model'
         );
 
@@ -60,8 +60,8 @@ 
     private function publishController()
     {
         $this->publishFile(
-            __DIR__ . '/stubs/controller.php.stub',
-            $to = $this->dirs['controller'] . '/' . ucfirst($this->plural) . '/' . ucfirst($this->singular) . '.php',
+            __DIR__.'/stubs/controller.php.stub',
+            $to = $this->dirs['controller'].'/'.ucfirst($this->plural).'/'.ucfirst($this->singular).'.php',
             'controller'
         );
     }
@@ -76,7 +76,7 @@ 
     protected function publishFile($from, $to, $type)
     {
         if ($this->filesystem->exists($to) && !$this->option('force')) {
-            if (!$this->confirm('File [' . $to . '] already exists? Overwrite this file?')) {
+            if (!$this->confirm('File ['.$to.'] already exists? Overwrite this file?')) {
                 return;
             }
         }
@@ -115,7 +115,7 @@ 
 
         $to = str_replace($this->dirs['base'], '', realpath($to));
 
-        $this->line('<info>Copied ' . $type . '</info> <comment>[' . $from . ']</comment> <info>To</info> <comment>[' . $to . ']</comment>');
+        $this->line('<info>Copied '.$type.'</info> <comment>['.$from.']</comment> <info>To</info> <comment>['.$to.']</comment>');
     }
 
     protected function replacePlaceholders($content)
@@ -139,7 +139,7 @@ 
 
         // We make an estimated guess based on the project name. At Think Tomorrow, we
         // have a src folder which is PSR-4 namespaced by the project name itself.
-        return str_replace('\\\\', '\\', ucfirst(config('thinktomorrow.chief.domain.namespace', 'App')).'\\'. ucfirst($this->plural));
+        return str_replace('\\\\', '\\', ucfirst(config('thinktomorrow.chief.domain.namespace', 'App')).'\\'.ucfirst($this->plural));
     }
 
     private function addToConfig($configKey, $value)
@@ -157,12 +157,12 @@ 
     {
         $content = file_get_contents($file);
 
-        if(strpos($key,'.') !== false)
+        if (strpos($key, '.') !== false)
         {
             $key = explode('.', $key);
 
             $content = preg_replace('/([\'|"]'.$key[0].'[\'|"][ ]*=>[ ]*\[[^\]]*\][ |,|\n]*[\'|"]'.$key[1].'[\'|"][ ]*=>[ ]*\[)([^\]]*|.*[\'|"])/', "$1".$value[0], $content);
-        }else{
+        }else {
             $content = preg_replace('/[\'|"]'.$key.'[\'|"] ?=> ?(\[[^\]]*\]|[\'|"].*[\'|"])/', var_export($value, true), $content);
         }
 

Braces +1 added lines, -1 removed lines

@@ -162,7 +162,7 @@
             $key = explode('.', $key);
 
             $content = preg_replace('/([\'|"]'.$key[0].'[\'|"][ ]*=>[ ]*\[[^\]]*\][ |,|\n]*[\'|"]'.$key[1].'[\'|"][ ]*=>[ ]*\[)([^\]]*|.*[\'|"])/', "$1".$value[0], $content);
-        }else{
+        } else{
             $content = preg_replace('/[\'|"]'.$key.'[\'|"] ?=> ?(\[[^\]]*\]|[\'|"].*[\'|"])/', var_export($value, true), $content);
         }