- Correção de bug que não atualizava o novo nome da extensão do arqui…

…vo na função setSaveAs
FernandoZueet · Jan 16, 2018 · 3311edf · 3311edf
1 parent 2292a1c
commit 3311edf
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 45 deletions.
diff --git a/Core.php b/Core.php
@@ -422,15 +422,32 @@ public function validExecute(array $arrayExecutes)
         //execute functions validates
         $this->setClassExecutes($arrayExecutes);
         $countArray = [];
+        $contFile  = -1;
+        $contClass = -1;
         foreach ($this->getFile() as $ifile) {
+            $contFile++; //count file
+            $contClass = -1;
             foreach ($this->getClassExecutes() as $vld) {
-                if (array_key_exists($vld->getDirectory(), $countArray)) { //Equal directory count
+
+                $contClass++; //count class
+
+                //Equal directory count
+                if (array_key_exists($vld->getDirectory(), $countArray)) { 
                     $countArray[$vld->getDirectory()]++;
                 } else {
                     $countArray[$vld->getDirectory()] = 1;
                 }
-                $this->setFileActive($ifile); //set file active container
-                $vld->valid($this); //valid class executes
+
+                //update name extension save as
+                if ($vld->getSaveAs()) {
+                    $ifile = $this->getFileClass()->updateFile($this, $contFile, 'new_name', pathinfo($vld->getDirectory().'/'.$ifile['new_name'], PATHINFO_FILENAME).'.'.$vld->getSaveAs())[$contFile];
+                }
+
+                //set file active container
+                $this->setFileActive($ifile); 
+
+                //valid class executes
+                $vld->valid($this); 
             }
         }
 
@@ -467,11 +484,15 @@ public function execute() : bool
             $contFile++; //count file
             $contClass = -1;
             foreach ($this->getClassExecutes() as $vld) {
+
                 $contClass++; //count class
+
                 if ($contClass >= 1 && $this->getUnionExecutes()) { //union executes functions
                     $ifile = $this->getFileClass()->updateFile($this, $contFile, 'tmp_name', $vld->getDirectory().'/'.$ifile['new_name'])[$contFile];
                 }
+
                 $this->setFileActive($ifile); //set file active container
+
                 if ($vld->execute($this)) { //execute functions
                     $return++; //count success
                 };

diff --git a/File.php b/File.php
@@ -239,6 +239,7 @@ public function updateFile(Core $container, int $pos, string $indice, $newValue)
     {
         $file = $container->getFile();
         $file[$pos][$indice] = $newValue;
+        $container->setFile($file);
         return $file;
     }
 

diff --git a/Tests/UploadTest.php b/Tests/UploadTest.php
@@ -26,6 +26,11 @@ public function TestUploadSimples()
         $filesInput['name'][0] = 'upload_teste.webp';
         $filesInput['size'][0] = '81123';
         $filesInput['type'][0] = 'image/webp';
+
+        // $filesInput['tmp_name'][1] = 'C:\upload_teste2.webp';
+        // $filesInput['name'][1] = 'upload_teste.webp';
+        // $filesInput['size'][1] = '81123';
+        // $filesInput['type'][1] = 'image/webp';
 
         //---------------------------------------------------------
 
@@ -53,7 +58,7 @@ public function TestUploadSimples()
         * ->setHeight(100) - height (int)
         */
         $resize = new \Upload\ResizeImage();
-        $resize->setDirectory('C:\upload')->setPorc(95)->setWidth(300)->setHeight(300);
+        $resize->setDirectory('C:\upload')->setSaveAs('jpg')->setPorc(95)->setWidth(300)->setHeight(300);
 
         //---------------------------------------------------------
 
@@ -67,7 +72,7 @@ public function TestUploadSimples()
         * ->validExecute([$upload2, $upload]) - array classes execute functions
         */
         $core = new \Upload\Core();
-        $core->setMessage(new \Upload\Langs\PtBr())->setFile($filesInput ?? [])->setUploadMultiple(true)
+        $core->setMessage(new \Upload\Langs\PtBr())->setFile($filesInput ?? [])->setUploadMultiple(false)
         ->setObjValids([$validaJpg, $validaPng])
         ->validExecute([$resize]);
 
@@ -84,6 +89,8 @@ public function TestUploadSimples()
 
         //---------------------------------------------------------        
 
+        var_dump($core->getFile());
+
         /**
         * execute functions
         *

diff --git a/Upload/CropImage.php b/Upload/CropImage.php
@@ -229,11 +229,7 @@ public function execute(Core $container) : bool
         $file = $container->getFileActive();
 
         //directory final
-        if ($this->getSaveAs()) {
-            $directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
-        } else {
-            $directory = $this->getDirectory().'/'.$file['new_name'];
-        }
+        $directory = $this->getDirectory().'/'.$file['new_name'];
 
         //id image resource
         $image = $imggd->imgCreateFrom($file, $file['tmp_name']);

diff --git a/Upload/FilterImage.php b/Upload/FilterImage.php
@@ -249,11 +249,7 @@ public function execute(Core $container) : bool
         $file = $container->getFileActive();
 
         //directory final
-        if ($this->getSaveAs()) {
-            $directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
-        } else {
-            $directory = $this->getDirectory().'/'.$file['new_name'];
-        }
+        $directory = $this->getDirectory().'/'.$file['new_name'];
 
         //id image resource
         $image = $imggd->imgCreateFrom($file, $file['tmp_name']);

diff --git a/Upload/FlipImage.php b/Upload/FlipImage.php
@@ -138,11 +138,7 @@ public function execute(Core $container) : bool
         $file = $container->getFileActive();
 
         //directory final
-        if ($this->getSaveAs()) {
-            $directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
-        } else {
-            $directory = $this->getDirectory().'/'.$file['new_name'];
-        }
+        $directory = $this->getDirectory().'/'.$file['new_name'];
 
         //id image resource
         $image = $imggd->imgCreateFrom($file, $file['tmp_name']);

diff --git a/Upload/GamaCorrectImage.php b/Upload/GamaCorrectImage.php
@@ -161,11 +161,7 @@ public function execute(Core $container) : bool
         $file = $container->getFileActive();
 
         //directory final
-        if ($this->getSaveAs()) {
-            $directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
-        } else {
-            $directory = $this->getDirectory().'/'.$file['new_name'];
-        }
+        $directory = $this->getDirectory().'/'.$file['new_name'];
 
         //id image resource
         $image = $imggd->imgCreateFrom($file, $file['tmp_name']);

diff --git a/Upload/ResizeImage.php b/Upload/ResizeImage.php
@@ -171,11 +171,7 @@ public function execute(Core $container) : bool
         $file = $container->getFileActive();
 
         //directory final
-        if ($this->getSaveAs()) {
-            $directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
-        }else{
-            $directory = $this->getDirectory().'/'.$file['new_name'];
-        }
+        $directory = $this->getDirectory().'/'.$file['new_name'];
 
         //id image resource
         $image = $imggd->imgCreateFrom($file, $file['tmp_name']);

diff --git a/Upload/RotateImage.php b/Upload/RotateImage.php
@@ -137,11 +137,7 @@ public function execute(Core $container) : bool
         $file = $container->getFileActive();
 
         //directory final
-        if ($this->getSaveAs()) {
-            $directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
-        } else {
-            $directory = $this->getDirectory().'/'.$file['new_name'];
-        }
+        $directory = $this->getDirectory().'/'.$file['new_name'];
 
         //id image resource
         $image = $imggd->imgCreateFrom($file, $file['tmp_name']);

diff --git a/Upload/TextImage.php b/Upload/TextImage.php
@@ -317,11 +317,7 @@ public function execute(Core $container) : bool
         $file = $container->getFileActive();
 
         //directory final
-        if ($this->getSaveAs()) {
-            $directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
-        } else {
-            $directory = $this->getDirectory().'/'.$file['new_name'];
-        }
+        $directory = $this->getDirectory().'/'.$file['new_name'];
 
         //id image resource
         $image = $imggd->imgCreateFrom($file, $file['tmp_name']);

diff --git a/Upload/WatermarksImage.php b/Upload/WatermarksImage.php
@@ -195,11 +195,7 @@ public function execute(Core $container) : bool
         $file = $container->getFileActive();
 
         //directory final
-        if ($this->getSaveAs()) {
-            $directory = $this->getDirectory().'/'.pathinfo($this->getDirectory().'/'.$file['new_name'], PATHINFO_FILENAME).'.'.$this->getSaveAs();
-        } else {
-            $directory = $this->getDirectory().'/'.$file['new_name'];
-        }
+        $directory = $this->getDirectory().'/'.$file['new_name'];
 
         //reorganized image logo array
         if (is_string($this->getImageLogo())) {