ソースを参照

[php] added incomplete Compress / Uncompress implementation (#4572)

* [php] added incomplete Compress / Uncompress implementation

* [php] enabled Compress/Uncompress UT as per https://github.com/HaxeFoundation/haxe/pull/4572#issuecomment-150475759
Clément Charmet 9 年 前
コミット
df58008e98

+ 12 - 2
std/php/_std/haxe/zip/Compress.hx

@@ -24,12 +24,22 @@ package haxe.zip;
 @:coreApi
 class Compress {
 
+	private var level : Int;
+
 	public function new( level : Int ) : Void {
-		throw "Not implemented for this platform";
+		this.level = level;
 	}
 
 	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
-		return null;
+		var input = src.sub( srcPos , src.length - srcPos );
+		var data = run( input , level );
+		dst.blit( dstPos , data , 0 , data.length );
+
+		return {
+			done: true,
+			read: input.length,
+			write: data.length
+		};
 	}
 
 	public function setFlushMode( f : FlushMode ) : Void {

+ 45 - 0
std/php/_std/haxe/zip/Uncompress.hx

@@ -0,0 +1,45 @@
+/*
+ * Copyright (C)2005-2012 Haxe Foundation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+package haxe.zip;
+
+class Uncompress {
+
+	public function new( ?windowBits : Int ) {
+		throw "Not implemented for this platform";
+	}
+
+	public function execute( src : haxe.io.Bytes, srcPos : Int, dst : haxe.io.Bytes, dstPos : Int ) : { done : Bool, read : Int, write : Int } {
+		return null;
+	}
+
+	public function setFlushMode( f : FlushMode ) {
+	}
+
+	public function close() {
+	}
+
+	public static function run( src : haxe.io.Bytes, ?bufsize : Int ) : haxe.io.Bytes {
+		var c = untyped __call__("gzuncompress", src.toString());
+		return haxe.io.Bytes.ofString(c);
+	}
+
+}

+ 1 - 1
tests/unit/src/unit/issues/Issue2861.hx

@@ -2,7 +2,7 @@ package unit.issues;
 
 class Issue2861 extends Test
 {
-#if (flash || neko || cpp || java)
+#if (flash || neko || cpp || java || php)
 	public function test()
 	{
 		var b = haxe.io.Bytes.alloc(2048);