Rewording some exceptions messages

Ne-Lexa · May 8, 2018 · aa8846b · aa8846b
1 parent 251ce11
commit aa8846b
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 38 deletions.
diff --git a/src/PhpZip/ZipFile.php b/src/PhpZip/ZipFile.php
@@ -98,7 +98,7 @@ public function __construct()
     public function openFile($filename)
     {
         if (!file_exists($filename)) {
-            throw new InvalidArgumentException("File $filename can't exists.");
+            throw new InvalidArgumentException("File $filename does not exist.");
         }
         if (!($handle = @fopen($filename, 'rb'))) {
             throw new ZipException("File $filename can't open.");
@@ -550,10 +550,10 @@ public function addDir($inputDir, $localPath = "/", $compressionMethod = null)
     {
         $inputDir = (string)$inputDir;
         if (null === $inputDir || strlen($inputDir) === 0) {
-            throw new InvalidArgumentException('Input dir empty');
+            throw new InvalidArgumentException('The input directory is not specified');
         }
         if (!is_dir($inputDir)) {
-            throw new InvalidArgumentException('Directory ' . $inputDir . ' can\'t exists');
+            throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.',  $inputDir));
         }
         $inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR;
 
@@ -580,10 +580,10 @@ public function addDirRecursive($inputDir, $localPath = "/", $compressionMethod
     {
         $inputDir = (string)$inputDir;
         if (null === $inputDir || strlen($inputDir) === 0) {
-            throw new InvalidArgumentException('Input dir empty');
+            throw new InvalidArgumentException('The input directory is not specified');
         }
         if (!is_dir($inputDir)) {
-            throw new InvalidArgumentException('Directory ' . $inputDir . ' can\'t exists');
+            throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.',  $inputDir));
         }
         $inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR;
 
@@ -697,14 +697,14 @@ private function addGlob(
     ) {
         $inputDir = (string)$inputDir;
         if (null === $inputDir || 0 === strlen($inputDir)) {
-            throw new InvalidArgumentException('Input dir empty');
+            throw new InvalidArgumentException('The input directory is not specified');
         }
         if (!is_dir($inputDir)) {
-            throw new InvalidArgumentException('Directory ' . $inputDir . ' can\'t exists');
+            throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.',  $inputDir));
         }
         $globPattern = (string)$globPattern;
         if (empty($globPattern)) {
-            throw new InvalidArgumentException("glob pattern empty");
+            throw new InvalidArgumentException('The glob pattern is not specified');
         }
 
         $inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR;
@@ -792,14 +792,14 @@ private function addRegex(
     ) {
         $regexPattern = (string)$regexPattern;
         if (empty($regexPattern)) {
-            throw new InvalidArgumentException("regex pattern empty");
+            throw new InvalidArgumentException('The regex pattern is not specified');
         }
         $inputDir = (string)$inputDir;
         if (null === $inputDir || 0 === strlen($inputDir)) {
-            throw new InvalidArgumentException('Input dir empty');
+            throw new InvalidArgumentException('The input directory is not specified');
         }
         if (!is_dir($inputDir)) {
-            throw new InvalidArgumentException('Directory ' . $inputDir . ' can\'t exists');
+            throw new InvalidArgumentException(sprintf('The "%s" directory does not exist.',  $inputDir));
         }
         $inputDir = rtrim($inputDir, '/\\') . DIRECTORY_SEPARATOR;
 

diff --git a/tests/PhpZip/ZipFileTest.php b/tests/PhpZip/ZipFileTest.php
@@ -17,7 +17,7 @@ class ZipFileTest extends ZipTestCase
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage can't exists
+     * @expectedExceptionMessage does not exist
      */
     public function testOpenFileCantExists()
     {
@@ -1235,7 +1235,7 @@ public function testAddFileCantOpen()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddDirNullDirname()
     {
@@ -1245,7 +1245,7 @@ public function testAddDirNullDirname()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddDirEmptyDirname()
     {
@@ -1255,7 +1255,7 @@ public function testAddDirEmptyDirname()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage can't exists
+     * @expectedExceptionMessage does not exist
      */
     public function testAddDirCantExists()
     {
@@ -1265,7 +1265,7 @@ public function testAddDirCantExists()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddDirRecursiveNullDirname()
     {
@@ -1275,7 +1275,7 @@ public function testAddDirRecursiveNullDirname()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddDirRecursiveEmptyDirname()
     {
@@ -1285,7 +1285,7 @@ public function testAddDirRecursiveEmptyDirname()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage can't exists
+     * @expectedExceptionMessage does not exist
      */
     public function testAddDirRecursiveCantExists()
     {
@@ -1295,7 +1295,7 @@ public function testAddDirRecursiveCantExists()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddFilesFromGlobNull()
     {
@@ -1305,7 +1305,7 @@ public function testAddFilesFromGlobNull()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddFilesFromGlobEmpty()
     {
@@ -1315,7 +1315,7 @@ public function testAddFilesFromGlobEmpty()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage can't exists
+     * @expectedExceptionMessage does not exist
      */
     public function testAddFilesFromGlobCantExists()
     {
@@ -1325,7 +1325,7 @@ public function testAddFilesFromGlobCantExists()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage glob pattern empty
+     * @expectedExceptionMessage The glob pattern is not specified
      */
     public function testAddFilesFromGlobNullPattern()
     {
@@ -1335,7 +1335,7 @@ public function testAddFilesFromGlobNullPattern()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage glob pattern empty
+     * @expectedExceptionMessage The glob pattern is not specified
      */
     public function testAddFilesFromGlobEmptyPattern()
     {
@@ -1345,7 +1345,7 @@ public function testAddFilesFromGlobEmptyPattern()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddFilesFromGlobRecursiveNull()
     {
@@ -1355,7 +1355,7 @@ public function testAddFilesFromGlobRecursiveNull()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddFilesFromGlobRecursiveEmpty()
     {
@@ -1365,7 +1365,7 @@ public function testAddFilesFromGlobRecursiveEmpty()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage can't exists
+     * @expectedExceptionMessage does not exist
      */
     public function testAddFilesFromGlobRecursiveCantExists()
     {
@@ -1375,7 +1375,7 @@ public function testAddFilesFromGlobRecursiveCantExists()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage glob pattern empty
+     * @expectedExceptionMessage The glob pattern is not specified
      */
     public function testAddFilesFromGlobRecursiveNullPattern()
     {
@@ -1385,7 +1385,7 @@ public function testAddFilesFromGlobRecursiveNullPattern()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage glob pattern empty
+     * @expectedExceptionMessage The glob pattern is not specified
      */
     public function testAddFilesFromGlobRecursiveEmptyPattern()
     {
@@ -1395,7 +1395,7 @@ public function testAddFilesFromGlobRecursiveEmptyPattern()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddFilesFromRegexDirectoryNull()
     {
@@ -1405,7 +1405,7 @@ public function testAddFilesFromRegexDirectoryNull()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddFilesFromRegexDirectoryEmpty()
     {
@@ -1415,7 +1415,7 @@ public function testAddFilesFromRegexDirectoryEmpty()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage can't exists
+     * @expectedExceptionMessage does not exist
      */
     public function testAddFilesFromRegexCantExists()
     {
@@ -1425,7 +1425,7 @@ public function testAddFilesFromRegexCantExists()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage regex pattern empty
+     * @expectedExceptionMessage The regex pattern is not specified
      */
     public function testAddFilesFromRegexNullPattern()
     {
@@ -1435,7 +1435,7 @@ public function testAddFilesFromRegexNullPattern()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage regex pattern empty
+     * @expectedExceptionMessage The regex pattern is not specified
      */
     public function testAddFilesFromRegexEmptyPattern()
     {
@@ -1445,7 +1445,7 @@ public function testAddFilesFromRegexEmptyPattern()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddFilesFromRegexRecursiveDirectoryNull()
     {
@@ -1455,7 +1455,7 @@ public function testAddFilesFromRegexRecursiveDirectoryNull()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage Input dir empty
+     * @expectedExceptionMessage The input directory is not specified
      */
     public function testAddFilesFromRegexRecursiveEmpty()
     {
@@ -1465,7 +1465,7 @@ public function testAddFilesFromRegexRecursiveEmpty()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage can't exists
+     * @expectedExceptionMessage does not exist
      */
     public function testAddFilesFromRegexRecursiveCantExists()
     {
@@ -1475,7 +1475,7 @@ public function testAddFilesFromRegexRecursiveCantExists()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage regex pattern empty
+     * @expectedExceptionMessage The regex pattern is not specified
      */
     public function testAddFilesFromRegexRecursiveNullPattern()
     {
@@ -1485,7 +1485,7 @@ public function testAddFilesFromRegexRecursiveNullPattern()
 
     /**
      * @expectedException \PhpZip\Exception\InvalidArgumentException
-     * @expectedExceptionMessage regex pattern empty
+     * @expectedExceptionMessage The regex pattern is not specified
      */
     public function testAddFilesFromRegexRecursiveEmptyPattern()
     {