mirror_php/php-zip
1
0
Fork 0
mirror of https://github.com/Ne-Lexa/php-zip.git synced 2025-01-17 04:38:20 +01:00
Code Issues Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Ne-Lexa 2018-10-11 10:49:53 +03:00
parent a13f4cc32f
commit 7e84f97473
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PhpZip/ZipFile.php
View File

@ -92,7 +92,7 @@ class ZipFile implements ZipFileInterface
public function openFile($filename)
{
if (!file_exists($filename)) {
throw new InvalidArgumentException("File $filename does not exist.");
throw new ZipException("File $filename does not exist.");
}
if (!($handle = @fopen($filename, 'rb'))) {
throw new ZipException("File $filename can't open.");

20
tests/PhpZip/ZipFileTest.php
View File

@ -606,7 +606,7 @@ class ZipFileTest extends ZipTestCase
/**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage Glob pattern is empty
* @expectedExceptionMessage The glob pattern is not specified
*/
public function testDeleteFromGlobFailNull()
{
@ -616,7 +616,7 @@ class ZipFileTest extends ZipTestCase
/**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage Glob pattern is empty
* @expectedExceptionMessage The glob pattern is not specified
*/
public function testDeleteFromGlobFailEmpty()
{
@ -657,7 +657,7 @@ class ZipFileTest extends ZipTestCase
/**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage Regex pattern is empty.
* @expectedExceptionMessage The regex pattern is not specified
*/
public function testDeleteFromRegexFailNull()
{
@ -667,7 +667,7 @@ class ZipFileTest extends ZipTestCase
/**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage Regex pattern is empty.
* @expectedExceptionMessage The regex pattern is not specified
*/
public function testDeleteFromRegexFailEmpty()
{
@ -1292,7 +1292,7 @@ class ZipFileTest extends ZipTestCase
/**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage The input directory is not specified
* @expectedExceptionMessage Input dir is null
* @throws ZipException
*/
public function testAddDirNullDirname()
@ -1313,7 +1313,7 @@ class ZipFileTest extends ZipTestCase
}
/**
* @expectedException \PhpZip\Exception\ZipException
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage does not exist
* @throws ZipException
*/
@ -1325,7 +1325,7 @@ class ZipFileTest extends ZipTestCase
/**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage The input directory is not specified
* @expectedExceptionMessage Input dir is null
* @throws ZipException
*/
public function testAddDirRecursiveNullDirname()
@ -1358,7 +1358,7 @@ class ZipFileTest extends ZipTestCase
/**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage The input directory is not specified
* @expectedExceptionMessage Input dir is null
* @throws ZipException
*/
public function testAddFilesFromGlobNull()
@ -1413,7 +1413,7 @@ class ZipFileTest extends ZipTestCase
/**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage The input directory is not specified
* @expectedExceptionMessage Input dir is null
* @throws ZipException
*/
public function testAddFilesFromGlobRecursiveNull()
@ -1544,7 +1544,7 @@ class ZipFileTest extends ZipTestCase
}
/**
* @expectedException \PhpZip\Exception\ZipException
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage does not exist
* @throws ZipException
*/