Make compatible with XP9, drop PHP 5.5

Author: thekid

.travis.yml

@@ -2,10 +2,7 @@
 
 language: php
 
-sudo: false
-
 php:
-  - 5.5
   - 5.6
   - 7.0
   - 7.1
@@ -14,17 +11,12 @@ php:
 
 matrix:
   allow_failures:
-    - php: hhvm
     - php: nightly
 
 before_script:
-  - wget 'https://github.com/xp-framework/xp-runners/releases/download/v6.3.0/setup' -O - | php
+  - curl -sSL https://dl.bintray.com/xp-runners/generic/xp-run-master.sh > xp-run
   - composer install --prefer-dist
   - echo "vendor/autoload.php" > composer.pth
-  - echo "use=vendor/xp-framework/core" > xp.ini
-  - echo "[runtime]" >> xp.ini
-  - echo "date.timezone=Europe/Berlin" >> xp.ini
 
 script:
-  - ./unittest src/test/php
-
+  - sh xp-run xp.unittest.TestRunner src/test/php

ChangeLog.md

@@ -3,6 +3,12 @@ ZIP File support for the XP Framework ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 8.0.0 / 2017-09-24
+
+* **Heads up**: Dropped PHP 5.5 support - @thekid
+* Added compatibility with XP 9.0+ - @thekid
+* Dropped dependency on `xp-framework/security` library - @thekid
+
 ## 7.1.0 / 2016-08-29
 
 * Added forward compatibility with XP 8.0.0: Use File::in() instead of

composer.json

@@ -6,13 +6,12 @@
   "description" : "ZIP File support for the XP Framework",
   "keywords": ["module", "xp"],
   "require" : {
-    "xp-framework/core": "^8.0 | ^7.0 | ^6.5",
-    "xp-framework/security": "^7.0 | ^6.6",
-    "xp-framework/math": "^7.0 | ^6.6",
-    "php" : ">=5.5.0"
+    "xp-framework/core": "^9.0 | ^8.0 | ^7.0 | ^6.5",
+    "xp-framework/math": "^8.0 | ^7.0 | ^6.6",
+    "php" : ">=5.6.0"
   },
   "require-dev" : {
-    "xp-framework/unittest": "^7.0 | ^6.5"
+    "xp-framework/unittest": "^9.0 | ^8.0 | ^7.0 | ^6.5"
   },
   "autoload" : {
     "files" : ["src/main/php/autoload.php"]

src/main/php/io/archive/zip/AbstractZipReaderImpl.class.php

@@ -10,7 +10,7 @@
  *
  * @ext   iconv
  */
-abstract class AbstractZipReaderImpl extends \lang\Object {
+abstract class AbstractZipReaderImpl {
   public $skip= 0;
 
   protected $stream= null;

src/main/php/io/archive/zip/CipheringZipFileOutputStream.class.php

@@ -2,14 +2,13 @@
 
 use io\streams\OutputStream;
 use io\streams\MemoryOutputStream;
-use security\checksum\CRC32;
 
 /**
  * Output stream for files
  *
  * @see   xp://io.archive.zip.ZipArchiveWriter#addFile
  */
-class CipheringZipFileOutputStream extends \lang\Object implements OutputStream {
+class CipheringZipFileOutputStream implements OutputStream {
   protected
     $writer      = null,
     $compression = null,
@@ -33,7 +32,7 @@ public function __construct(ZipArchiveWriter $writer, ZipFileEntry $file, $name,
     $this->file= $file;
     $this->name= $name;
     $this->data= null;
-    $this->md= CRC32::digest();
+    $this->md= hash_init('crc32b');
     $this->cipher= $cipher;
   }
 
@@ -57,7 +56,7 @@ public function withCompression(Compression $compression, $level= 6) {
    */
   public function write($arg) {
     $this->size+= strlen($arg);
-    $this->md->update($arg);
+    hash_update($this->md, $arg);
     $this->data->write($arg);
   }
 
@@ -77,7 +76,10 @@ public function close() {
     if (null === $this->data) return;     // Already written
 
     // Calculate CRC32
-    $crc32= (new CRC32($this->md->digest()))->asInt32();
+    $crc32= hexdec(hash_final($this->md));
+    if ($crc32 > 2147483647) {      // Convert from uint32 to int32
+      $crc32= intval($crc32 - 4294967296);
+    }
 
     // Create random bytes
     $rand= '';

src/main/php/io/archive/zip/DecipheringInputStream.class.php

@@ -7,7 +7,7 @@
  *
  * @see   xp://io.archive.zip.ZipCipher
  */
-class DecipheringInputStream extends \lang\Object implements InputStream {
+class DecipheringInputStream implements InputStream {
   protected $in= null;
   protected $cipher= null;
 

src/main/php/io/archive/zip/ZipArchiveReader.class.php

@@ -28,7 +28,7 @@
  * @test    xp://net.xp_framework.unittest.io.archive.ZipFileIteratorTest
  * @see     xp://io.archive.zip.ZipArchive#open
  */
-class ZipArchiveReader extends \lang\Object {
+class ZipArchiveReader {
   protected $impl= NULL;
 
   /**

src/main/php/io/archive/zip/ZipArchiveWriter.class.php

@@ -10,7 +10,7 @@
  * @see   xp://io.archive.zip.ZipArchive#create
  * @test  xp://io.archive.zip.unittest.ZipArchiveWriterTest
  */
-class ZipArchiveWriter extends \lang\Object {
+class ZipArchiveWriter {
   protected
     $stream   = null,
     $dir      = [], 

src/main/php/io/archive/zip/ZipCipher.class.php

@@ -8,7 +8,7 @@
  * @test     xp://net.xp_framework.unittest.io.archive.vendors.SevenZipFileTest
  * @see      http://www.pkware.com/documents/casestudies/APPNOTE.TXT
  */
-class ZipCipher extends \lang\Object {
+class ZipCipher {
   protected $keys= null;
 
   // Calculated by Vbaccelerator.Components.Algorithms.CRC32 class seen at

src/main/php/io/archive/zip/ZipDirEntry.class.php

@@ -9,7 +9,7 @@
  * @see      xp://io.archive.zip.ZipEntry
  * @purpose  Interface
  */
-class ZipDirEntry extends \lang\Object implements ZipEntry {
+class ZipDirEntry implements ZipEntry {
   protected 
     $name        = '', 
     $mod         = null,