Completed
Pull Request — fix/image-sorting (#290)
by Philippe
22:58 queued 13:06
created
src/Media/UploadMedia.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
         if (is_string($file)) {
112 112
             $image_name = json_decode($file)->output->name;
113 113
             $asset      = $this->addAsset(json_decode($file)->output->image, $type, $locale, $image_name, $model);
114
-        } else {
114
+        }else {
115 115
             $image_name = $file->getClientOriginalName();
116 116
             $asset      = $this->addAsset($file, $type, $locale, $image_name, $model);
117 117
         }
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
         // New files are passed with their filename (instead of their id)
120 120
         // For new files we will replace the filename with the id.
121 121
         if (false !== ($key = array_search($image_name, $files_order))) {
122
-            $files_order[$key] = (string) $asset->id;
122
+            $files_order[$key] = (string)$asset->id;
123 123
         }
124 124
     }
125 125
 
@@ -134,7 +134,7 @@  discard block
 block discarded – undo
134 134
 
135 135
         if (is_string($file)) {
136 136
             $asset = AssetUploader::uploadFromBase64($file, $filename);
137
-        } else {
137
+        }else {
138 138
             $asset = AssetUploader::upload($file, $filename);
139 139
         }
140 140
 
@@ -151,9 +151,9 @@  discard block
 block discarded – undo
151 151
      */
152 152
     private function sluggifyFilename($filename): string
153 153
     {
154
-        $extension = substr($filename, strrpos($filename, '.') + 1);
154
+        $extension = substr($filename, strrpos($filename, '.')+1);
155 155
         $filename  = substr($filename, 0, strrpos($filename, '.'));
156
-        $filename  = str_slug($filename) . '.' . $extension;
156
+        $filename  = str_slug($filename).'.'.$extension;
157 157
 
158 158
         return $filename;
159 159
     }
@@ -169,9 +169,9 @@  discard block
 block discarded – undo
169 169
                 if ($file instanceof UploadedFile && !$file->isValid()) {
170 170
                     if ($file->getError() == UPLOAD_ERR_INI_SIZE) {
171 171
                         throw new FileTooBigException(
172
-                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. ' .
173
-                            'upload_max_filesize: ' . (int)ini_get('upload_max_filesize') . 'MB, ' .
174
-                            'post_max_size: ' . (int)(ini_get('post_max_size')) . 'MB'
172
+                            'Cannot upload file because it exceeded the allowed upload_max_filesize: upload_max_filesize is smaller than post size. '.
173
+                            'upload_max_filesize: '.(int)ini_get('upload_max_filesize').'MB, '.
174
+                            'post_max_size: '.(int)(ini_get('post_max_size')).'MB'
175 175
                         );
176 176
                     }
177 177
                 }
@@ -185,16 +185,16 @@  discard block
 block discarded – undo
185 185
         foreach ($files_by_type as $type => $files) {
186 186
             foreach ($files as $locale => $_files) {
187 187
                 if (!in_array($locale, config('translatable.locales'))) {
188
-                    throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale [' . implode(',', config('translatable.locales', [])). ']. Instead [' . $locale . '] is given.');
188
+                    throw new \InvalidArgumentException('Corrupt file payload. key is expected to be a valid locale ['.implode(',', config('translatable.locales', [])).']. Instead ['.$locale.'] is given.');
189 189
                 }
190 190
 
191 191
                 if (!is_array($_files)) {
192
-                    throw new \InvalidArgumentException('A valid files entry should be an array of files, key with either [new, replace or delete]. Instead a ' . gettype($_files) . ' is given.');
192
+                    throw new \InvalidArgumentException('A valid files entry should be an array of files, key with either [new, replace or delete]. Instead a '.gettype($_files).' is given.');
193 193
                 }
194 194
 
195 195
                 foreach ($_files as $action => $file) {
196 196
                     if (!in_array($action, $actions)) {
197
-                        throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead ' . $action . ' is given.');
197
+                        throw new \InvalidArgumentException('A valid files entry should have a key of either ['.implode(',', $actions).']. Instead '.$action.' is given.');
198 198
                     }
199 199
                 }
200 200
             }
Please login to merge, or discard this patch.
src/Fields/Types/MediaField.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-declare(strict_types = 1);
3
+declare(strict_types=1);
4 4
 
5 5
 namespace Thinktomorrow\Chief\Fields\Types;
6 6
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
             return $this;
41 41
         }
42 42
 
43
-        return 'files['. ($this->values['name'] ?? $this->key()).']';
43
+        return 'files['.($this->values['name'] ?? $this->key()).']';
44 44
     }
45 45
 
46 46
     public function sluggifyName()
Please login to merge, or discard this patch.