Skip to content
This repository was archived by the owner on Sep 30, 2020. It is now read-only.

Commit 3311edf

Browse files
FernandoZueetFernandoZueet
committed
- Correção de bug que não atualizava o novo nome da extensão do arquivo na função setSaveAs
1 parent 2292a1c commit 3311edf

File tree

11 files changed

+42
-45
lines changed

11 files changed

+42
-45
lines changed

‎Core.php‎

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -422,15 +422,32 @@ public function validExecute(array $arrayExecutes)
422422
//execute functions validates
423423
$this->setClassExecutes($arrayExecutes);
424424
$countArray = [];
425+
$contFile = -1;
426+
$contClass = -1;
425427
foreach ($this->getFile() as $ifile) {
428+
$contFile++; //count file
429+
$contClass = -1;
426430
foreach ($this->getClassExecutes() as $vld) {
427-
if (array_key_exists($vld->getDirectory(), $countArray)) { //Equal directory count
431+
432+
$contClass++; //count class
433+
434+
//Equal directory count
435+
if (array_key_exists($vld->getDirectory(), $countArray)) {
428436
$countArray[$vld->getDirectory()]++;
429437
} else {
430438
$countArray[$vld->getDirectory()] = 1;
431439
}
432-
$this->setFileActive($ifile); //set file active container
433-
$vld->valid($this); //valid class executes
440+
441+
//update name extension save as
442+
if ($vld->getSaveAs()) {
443+
$ifile = $this->getFileClass()->updateFile($this, $contFile, 'new_name', pathinfo($vld->getDirectory().'/'.$ifile['new_name'], PATHINFO_FILENAME).'.'.$vld->getSaveAs())[$contFile];
444+
}
445+
446+
//set file active container
447+
$this->setFileActive($ifile);
448+
449+
//valid class executes
450+
$vld->valid($this);
434451
}
435452
}
436453

@@ -467,11 +484,15 @@ public function execute() : bool
467484
$contFile++; //count file
468485
$contClass = -1;
469486
foreach ($this->getClassExecutes() as $vld) {
487+
470488
$contClass++; //count class
489+
471490
if ($contClass >= 1 && $this->getUnionExecutes()) { //union executes functions
472491
$ifile = $this->getFileClass()->updateFile($this, $contFile, 'tmp_name', $vld->getDirectory().'/'.$ifile['new_name'])[$contFile];
473492
}
493+
474494
$this->setFileActive($ifile); //set file active container
495+
475496
if ($vld->execute($this)) { //execute functions
476497
$return++; //count success
477498
};

‎File.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ public function updateFile(Core $container, int $pos, string $indice, $newValue)
239239
{
240240
$file = $container->getFile();
241241
$file[$pos][$indice] = $newValue;
242+
$container->setFile($file);
242243
return $file;
243244
}
244245

‎Tests/UploadTest.php‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ public function TestUploadSimples()
2626
$filesInput['name'][0] = 'upload_teste.webp';
2727
$filesInput['size'][0] = '81123';
2828
$filesInput['type'][0] = 'image/webp';
29+
30+
// $filesInput['tmp_name'][1] = 'C:\upload_teste2.webp';
31+
// $filesInput['name'][1] = 'upload_teste.webp';
32+
// $filesInput['size'][1] = '81123';
33+
// $filesInput['type'][1] = 'image/webp';
2934

3035
//---------------------------------------------------------
3136

@@ -53,7 +58,7 @@ public function TestUploadSimples()
5358
* ->setHeight(100) - height (int)
5459
*/
5560
$resize = new \Upload\ResizeImage();
56-
$resize->setDirectory('C:\upload')->setPorc(95)->setWidth(300)->setHeight(300);
61+
$resize->setDirectory('C:\upload')->setSaveAs('jpg')->setPorc(95)->setWidth(300)->setHeight(300);
5762

5863
//---------------------------------------------------------
5964

@@ -67,7 +72,7 @@ public function TestUploadSimples()
6772
* ->validExecute([$upload2, $upload]) - array classes execute functions
6873
*/
6974
$core = new \Upload\Core();
70-
$core->setMessage(new \Upload\Langs\PtBr())->setFile($filesInput ?? [])->setUploadMultiple(true)
75+
$core->setMessage(new \Upload\Langs\PtBr())->setFile($filesInput ?? [])->setUploadMultiple(false)
7176
->setObjValids([$validaJpg, $validaPng])
7277
->validExecute([$resize]);
7378

@@ -84,6 +89,8 @@ public function TestUploadSimples()
8489

8590
//---------------------------------------------------------
8691

92+
var_dump($core->getFile());
93+
8794
/**
8895
* execute functions
8996
*

‎Upload/CropImage.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,7 @@ public function execute(Core $container) : bool
229229
$file = $container->getFileActive();
230230

231231
//directory final
232-
if ($this->getSaveAs()) {
233-
$directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
234-
} else {
235-
$directory = $this->getDirectory().'/'.$file['new_name'];
236-
}
232+
$directory = $this->getDirectory().'/'.$file['new_name'];
237233

238234
//id image resource
239235
$image = $imggd->imgCreateFrom($file, $file['tmp_name']);

‎Upload/FilterImage.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,7 @@ public function execute(Core $container) : bool
249249
$file = $container->getFileActive();
250250

251251
//directory final
252-
if ($this->getSaveAs()) {
253-
$directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
254-
} else {
255-
$directory = $this->getDirectory().'/'.$file['new_name'];
256-
}
252+
$directory = $this->getDirectory().'/'.$file['new_name'];
257253

258254
//id image resource
259255
$image = $imggd->imgCreateFrom($file, $file['tmp_name']);

‎Upload/FlipImage.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,7 @@ public function execute(Core $container) : bool
138138
$file = $container->getFileActive();
139139

140140
//directory final
141-
if ($this->getSaveAs()) {
142-
$directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
143-
} else {
144-
$directory = $this->getDirectory().'/'.$file['new_name'];
145-
}
141+
$directory = $this->getDirectory().'/'.$file['new_name'];
146142

147143
//id image resource
148144
$image = $imggd->imgCreateFrom($file, $file['tmp_name']);

‎Upload/GamaCorrectImage.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,7 @@ public function execute(Core $container) : bool
161161
$file = $container->getFileActive();
162162

163163
//directory final
164-
if ($this->getSaveAs()) {
165-
$directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
166-
} else {
167-
$directory = $this->getDirectory().'/'.$file['new_name'];
168-
}
164+
$directory = $this->getDirectory().'/'.$file['new_name'];
169165

170166
//id image resource
171167
$image = $imggd->imgCreateFrom($file, $file['tmp_name']);

‎Upload/ResizeImage.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,7 @@ public function execute(Core $container) : bool
171171
$file = $container->getFileActive();
172172

173173
//directory final
174-
if ($this->getSaveAs()) {
175-
$directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
176-
}else{
177-
$directory = $this->getDirectory().'/'.$file['new_name'];
178-
}
174+
$directory = $this->getDirectory().'/'.$file['new_name'];
179175

180176
//id image resource
181177
$image = $imggd->imgCreateFrom($file, $file['tmp_name']);

‎Upload/RotateImage.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,7 @@ public function execute(Core $container) : bool
137137
$file = $container->getFileActive();
138138

139139
//directory final
140-
if ($this->getSaveAs()) {
141-
$directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
142-
} else {
143-
$directory = $this->getDirectory().'/'.$file['new_name'];
144-
}
140+
$directory = $this->getDirectory().'/'.$file['new_name'];
145141

146142
//id image resource
147143
$image = $imggd->imgCreateFrom($file, $file['tmp_name']);

‎Upload/TextImage.php‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,7 @@ public function execute(Core $container) : bool
317317
$file = $container->getFileActive();
318318

319319
//directory final
320-
if ($this->getSaveAs()) {
321-
$directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
322-
} else {
323-
$directory = $this->getDirectory().'/'.$file['new_name'];
324-
}
320+
$directory = $this->getDirectory().'/'.$file['new_name'];
325321

326322
//id image resource
327323
$image = $imggd->imgCreateFrom($file, $file['tmp_name']);

0 commit comments

Comments
 (0)