Merge pull request #3 from giansalex/f002

New Zip routines
thegreenter · Nov 14, 2017 · d2882ad · d2882ad
2 parents f028c4c + 5415191
commit d2882ad
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 113 deletions.
diff --git a/composer.json b/composer.json
@@ -13,6 +13,7 @@
     "type": "project",
     "require": {
 		"php": ">=5.5.9",
+        "ext-zlib": "*",
         "greenter/core": "^1.0"
     },
 	"require-dev": {

diff --git a/src/Ws/Services/BaseSunat.php b/src/Ws/Services/BaseSunat.php
@@ -11,7 +11,8 @@
 use Greenter\Model\Response\Error;
 use Greenter\Ws\Reader\DomCdrReader;
 use Greenter\Ws\Reader\XmlErrorReader;
-use Greenter\Zip\ZipFactory;
+use Greenter\Zip\ZipReader;
+use Greenter\Zip\ZipWriter;
 
 /**
  * Class BaseSunat
@@ -78,7 +79,8 @@ protected function getErrorFromFault(\SoapFault $fault)
      */
     protected function compress($filename, $xml)
     {
-        return (new ZipFactory())->compress($filename, $xml);
+        return (new ZipWriter())
+            ->compress($filename, $xml);
     }
 
     /**
@@ -87,11 +89,11 @@ protected function compress($filename, $xml)
      */
     protected function extractResponse($zipContent)
     {
-        $zip = new ZipFactory();
-        $xml = $zip->decompressLastFile($zipContent);
-        $reader = new DomCdrReader();
+        $xml = (new ZipReader())
+            ->decompressXmlFile($zipContent);
 
-        return $reader->getCdrResponse($xml);
+        return (new DomCdrReader())
+            ->getCdrResponse($xml);
     }
 
     /**
@@ -100,8 +102,8 @@ protected function extractResponse($zipContent)
      */
     protected function getMessageError($code)
     {
-        $search = new XmlErrorReader();
-        $msg = $search->getMessageByCode(intval($code));
+        $msg = (new XmlErrorReader())
+                ->getMessageByCode(intval($code));
 
         return $msg;
     }

diff --git a/src/Ws/Services/BillSender.php b/src/Ws/Services/BillSender.php
@@ -17,7 +17,6 @@
  */
 class BillSender extends BaseSunat implements SenderInterface
 {
-
     /**
      * @param string $filename
      * @param string $content

diff --git a/src/Zip/ZipFactory.php b/src/Zip/ZipFactory.php
diff --git a/src/Zip/ZipReader.php b/src/Zip/ZipReader.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Giansalex
+ * Date: 16/07/2017
+ * Time: 12:23
+ */
+
+namespace Greenter\Zip;
+
+/**
+ * Class ZipFactory
+ * @package Greenter\Zip
+ */
+final class ZipReader
+{
+    const UNZIP_FORMAT = 'Vsig/vver/vflag/vmeth/vmodt/vmodd/Vcrc/Vcsize/Vsize/vnamelen/vexlen';
+
+    /**
+     * Retorna el contenido del primer xml dentro del zip.
+     *
+     * @param string $zipContent
+     * @return string
+     */
+    public function decompressXmlFile($zipContent)
+    {
+        $start = 0;
+        $max = 10;
+        while ($max > 0) {
+            $dat = substr($zipContent, $start, 30);
+            if (empty($dat)) {
+                break;
+            }
+
+            $head = unpack(self::UNZIP_FORMAT, $dat);
+            $filename = substr(substr($zipContent, $start),30, $head['namelen']);
+            if (empty($filename)) {
+                break;
+            }
+            $count = 30 + $head['namelen'] + $head['exlen'];
+
+            if (strtolower($this->getFileExtension($filename)) == 'xml') {
+                return gzinflate(substr($zipContent, $start + $count, $head['csize']));
+            }
+
+            $start += $count + $head['csize'];
+            $max--;
+        }
+
+        return '';
+    }
+
+    function getFileExtension($filename)
+    {
+        $lastDotPos = strrpos($filename, '.');
+        if (!$lastDotPos) return '';
+
+        return substr($filename, $lastDotPos + 1);
+    }
+}
diff --git a/src/Zip/ZipFile.php → src/Zip/ZipWriter.php b/src/Zip/ZipFile.php → src/Zip/ZipWriter.php
@@ -11,7 +11,7 @@
 /**
  * Class ZipFile.
  */
-class ZipFile
+class ZipWriter
 {
     /**
      * Array to store compressed data.
@@ -65,8 +65,6 @@ public function unix2DosTime($unixtime = 0)
             | ($timearray['seconds'] >> 1);
     }
 
- // end of the 'unix2DosTime()' method
-
     /**
      * Adds "file" to archive.
      *
@@ -148,5 +146,18 @@ public function file()
         return $data.$header;
     }
 
+    /**
+     * Comprime el contenido del archivo con el nombre especifico y retorna el contenido del zip.
+     *
+     * @param string $filename
+     * @param string $content
+     * @return string
+     */
+    public function compress($filename, $content)
+    {
+        $this->addFile($content, $filename);
+
+        return $this->file();
+    }
  // end of the 'file()' method
 }
diff --git a/tests/Ws/Zip/ZipFactoryTest.php b/tests/Ws/Zip/ZipFactoryTest.php
@@ -8,62 +8,64 @@
 
 namespace Tests\Greenter\Zip;
 
-use Greenter\Zip\ZipFactory;
-use Greenter\Zip\ZipFile;
+use Greenter\Zip\ZipReader;
+use Greenter\Zip\ZipWriter;
 
 /**
  * Class ZipFactoryTest
  * @package Tests\Greenter\Zip\ZipFactory
  */
 class ZipFactoryTest extends \PHPUnit_Framework_TestCase
 {
+    const DATA_XML = '<root>Empty</root>';
+
     public function testCompressFile()
     {
         $zip = $this->createZip();
 
-        //file_put_contents(sys_get_temp_dir() . '/myzip.zip', $zip);
         $this->assertNotEmpty($zip);
     }
 
-    public function testDecompressFile()
-    {
-        $zipContent = $this->createZip();
-        $helper = new ZipFactory();
-        $content = $helper->decompress($zipContent, 'myFile.txt');
-
-        $this->assertEquals('TEST TEXT 1', $content);
-    }
-
     public function testDecompressLastFile()
     {
         $zipContent = $this->createZip();
-        $helper = new ZipFactory();
-        $content = $helper->decompressLastFile($zipContent);
+        $helper = new ZipReader();
+        $content = $helper->decompressXmlFile($zipContent);
 
-        $this->assertEquals('TEST TEXT 1', $content);
+        $this->assertEquals(self::DATA_XML, $content);
     }
 
     public function testUnixTime()
     {
-        $zip = new ZipFile();
+        $zip = new ZipWriter();
         $result = $zip->unix2DosTime(181233012);
 
         $this->assertEquals(2162688, $result);
     }
 
     public function testInvalidZip()
     {
-        $zip = new ZipFactory();
-        $res = $zip->decompressLastFile('');
+        $zip = new ZipReader();
+        $res = $zip->decompressXmlFile('');
 
         $this->assertEmpty($res);
     }
 
-    private function createZip()
+    public function testNotXmlZip()
     {
-        $helper = new ZipFactory();
+        $helper = new ZipWriter();
         $zip = $helper->compress('myFile.txt', 'TEST TEXT 1');
 
+        $res = (new ZipReader())->decompressXmlFile($zip);
+
+        $this->assertEmpty($res);
+    }
+
+    private function createZip()
+    {
+        $helper = new ZipWriter();
+        $zip = $helper->compress('myFile.xml', self::DATA_XML);
+
         return $zip;
     }
 }