Commit63e7fe3

committed

Merge branch 'hotfix/92'

2 parentsa582487 +063fca8 commit63e7fe3Copy full SHA for 63e7fe3

File tree

+34

-2

lines changed

+34

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,9 @@ All notable changes to this project will be documented in this file, in reverse`
`25`	`25`	`-[#89](https://github.com/zendframework/zend-filter/pull/89) fixes infinite`
`26`	`26`	`loop on malformed HTML comments in StripTags filter.`
`27`	`27`
	`28`	`+-[#92](https://github.com/zendframework/zend-filter/pull/92) fixes Tar adapter`
	`29`	+ to not require`archive` in options when decompressing.
	`30`	`+`
`28`	`31`	`##2.9.1 - 2018-12-17`
`29`	`32`
`30`	`33`	`###Added`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,11 +202,12 @@ public function compress($content)`
`202`	`202`	`publicfunctiondecompress($content)`
`203`	`203`	`{`
`204`	`204`	`$archive =$this->getArchive();`
`205`		`-if (empty($archive) \|\| !file_exists($archive)) {`
	`205`	`+if (file_exists($content)) {`
	`206`	`+$archive =str_replace(['/','\\'],DIRECTORY_SEPARATOR,realpath($content));`
	`207`	`+ }elseif (empty($archive) \|\| !file_exists($archive)) {`
`206`	`208`	`thrownewException\RuntimeException('Tar Archive not found');`
`207`	`209`	`}`
`208`	`210`
`209`		`-$archive =str_replace(['/','\\'],DIRECTORY_SEPARATOR,realpath($content));`
`210`	`211`	`$archive =newArchive_Tar($archive,$this->getMode());`
`211`	`212`	`$target =$this->getTarget();`
`212`	`213`	`if (!is_dir($target)) {`

Lines changed: 28 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -209,4 +209,32 @@ public function testTarToString()`
`209`	`209`	`$filter =newTarCompression();`
`210`	`210`	`$this->assertEquals('Tar',$filter->toString());`
`211`	`211`	`}`
	`212`	`+`
	`213`	`+/**`
	`214`	`+ * @see https://github.com/zendframework/zend-filter/issues/41`
	`215`	`+ */`
	`216`	`+publicfunctiontestDecompressionDoesNotRequireArchive()`
	`217`	`+ {`
	`218`	`+$filter =newTarCompression([`
	`219`	`+'archive' =>$this->tmp .'/compressed.tar',`
	`220`	`+'target' =>$this->tmp .'/zipextracted.txt',`
	`221`	`+ ]);`
	`222`	`+`
	`223`	`+$content ='compress me' .microtime(true);`
	`224`	`+$compressed =$filter->compress($content);`
	`225`	`+`
	`226`	`+self::assertSame($this->tmp .DIRECTORY_SEPARATOR .'compressed.tar',$compressed);`
	`227`	`+`
	`228`	`+$target =$this->tmp;`
	`229`	`+$filter =newTarCompression([`
	`230`	`+'target' =>$target,`
	`231`	`+ ]);`
	`232`	`+`
	`233`	`+$decompressed =$filter->decompress($compressed);`
	`234`	`+self::assertSame($target,$decompressed);`
	`235`	`+// per documentation, tar includes full path`
	`236`	`+$file =$target .DIRECTORY_SEPARATOR .$target .DIRECTORY_SEPARATOR .'/zipextracted.txt';`
	`237`	`+self::assertFileExists($file);`
	`238`	`+self::assertSame($content,file_get_contents($file));`
	`239`	`+ }`
`212`	`240`	`}`

Comments

(0)