More usage of FileNotFoundException
authorRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 21:53:33 +0000 (23:53 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 26 May 2015 21:53:33 +0000 (23:53 +0200)
Signed-off-by: Roland H├Ąder <roland@mxchange.org>
inc/classes/main/file_directories/input/text/class_FrameworkTextFileInputPointer.php
inc/classes/main/template/class_BaseTemplateEngine.php

index fa238a5..16e43d5 100644 (file)
@@ -48,10 +48,13 @@ class FrameworkTextFileInputPointer extends BaseFileIo implements InputPointer {
                        // No filename given
                        throw new FileIsEmptyException(NULL, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
                } elseif (!BaseFrameworkSystem::isReachableFilePath($fileName)) {
-                       // File does not exist!
+                       // File cannot be reached
                        throw new FileIoException($fileName, self::EXCEPTION_FILE_NOT_REACHABLE);
-               } elseif (!BaseFrameworkSystem::isReadableFile($fileName)) {
+               } elseif ((!BaseFrameworkSystem::isReadableFile($fileName)) && (!file_exists($fileName))) {
                        // File does not exist!
+                       throw new FileNotFoundException($fileName, self::EXCEPTION_FILE_CANNOT_BE_READ);
+               } elseif ((!BaseFrameworkSystem::isReadableFile($fileName)) && (file_exists($fileName))) {
+                       // File cannot be read from (but exists)
                        throw new FileReadProtectedException($fileName, self::EXCEPTION_FILE_CANNOT_BE_READ);
                }
 
index 68511ad..69b8607 100644 (file)
@@ -662,7 +662,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
         * @param       $template       The template we shall load
         * @param       $extOther       An other extension to use
         * @return      void
-        * @throws      FileIoException If the template was not found
+        * @throws      FileNotFoundException   If the template was not found
         */
        protected function loadTemplate ($template, $extOther = '') {
                // Get extension for the template if empty
@@ -712,7 +712,7 @@ class BaseTemplateEngine extends BaseFrameworkSystem {
                                $this->loadTemplate($template, $ext);
                        } else {
                                // Throw it again
-                               throw new FileIoException($fqfn, self::EXCEPTION_FILE_NOT_FOUND);
+                               throw new FileNotFoundException($fqfn, self::EXCEPTION_FILE_NOT_FOUND);
                        }
                }