From: Roland Haeder Date: Mon, 23 Jun 2014 17:54:31 +0000 (+0200) Subject: Moved iterator instancing + removed duplicate getPointer(). X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bb1549e5999b32628c6598c908a2666de2526840;p=core.git Moved iterator instancing + removed duplicate getPointer(). Signed-off-by: Roland Häder --- diff --git a/inc/classes/main/file_directories/binary/class_BaseBinaryFile.php b/inc/classes/main/file_directories/binary/class_BaseBinaryFile.php index 230b4cbb..77b18e8e 100644 --- a/inc/classes/main/file_directories/binary/class_BaseBinaryFile.php +++ b/inc/classes/main/file_directories/binary/class_BaseBinaryFile.php @@ -311,16 +311,6 @@ class BaseBinaryFile extends BaseFile { return $isFound; } - /** - * Getter for the file pointer - * - * @return $filePointer The file pointer which shall be a valid file resource - * @throws UnsupportedOperationException If this method is called - */ - public final function getPointer () { - throw new UnsupportedOperationException(array($this, __FUNCTION__), self::EXCEPTION_UNSPPORTED_OPERATION); - } - /** * Initializes the back-buffer by setting it to an empty string. * diff --git a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php index da220403..7fe69cb8 100644 --- a/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php +++ b/inc/classes/main/file_directories/directory/class_FrameworkDirectoryPointer.php @@ -99,12 +99,12 @@ class FrameworkDirectoryPointer extends BaseFrameworkSystem { } } - // Get an iterator for the directory - $directoryInstance = new DirectoryIterator($pathName); - // Create new instance $pointerInstance = new FrameworkDirectoryPointer(); + // Get an iterator for the directory + $directoryInstance = new DirectoryIterator($pathName); + // Set directory pointer and path name $pointerInstance->setDirectoryInstance($directoryInstance); $pointerInstance->setPathName($pathName); diff --git a/inc/classes/main/file_directories/text/input/.htaccess b/inc/classes/main/file_directories/text/input/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/classes/main/file_directories/text/input/.htaccess @@ -0,0 +1 @@ +Deny from all diff --git a/inc/classes/main/file_directories/text/output/.htaccess b/inc/classes/main/file_directories/text/output/.htaccess new file mode 100644 index 00000000..3a428827 --- /dev/null +++ b/inc/classes/main/file_directories/text/output/.htaccess @@ -0,0 +1 @@ +Deny from all