X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffile_directories%2Finput%2Ftext%2Fclass_FrameworkTextFileInputPointer.php;h=0fdd4398c37e314326defec5d958b5db45d8964d;hp=f8efef649b35948e8fbbeff8e190d8cf251a469f;hb=b9bfbe86c031c9d83c3670602906df191a33ba2a;hpb=5da8f717122568335b8a8ab230fa0de17e983fab

diff --git a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
index f8efef64..0fdd4398 100644
--- a/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
+++ b/framework/main/classes/file_directories/input/text/class_FrameworkTextFileInputPointer.php
@@ -55,35 +55,30 @@ class FrameworkTextFileInputPointer extends BaseFileIo implements InputPointer {
 	 * @throws	FileReadProtectedException	If the file cannot be read from
 	 * @return	void
 	 */
-	public static final function createFrameworkTextFileInputPointer ($fileName) {
-		// Some pre-sanity checks...
-		if ((is_null($fileName)) || (empty($fileName))) {
-			// No filename given
-			throw new FileIsEmptyException(NULL, self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-		} elseif (!FrameworkBootstrap::isReachableFilePath($fileName)) {
+	public static final function createFrameworkTextFileInputPointer ($infoInstance) {
+		if (!FrameworkBootstrap::isReachableFilePath($infoInstance)) {
 			// File cannot be reached
-			throw new FileIoException($fileName, self::EXCEPTION_FILE_NOT_REACHABLE);
-		} elseif ((!FrameworkBootstrap::isReadableFile($fileName)) && (!file_exists($fileName))) {
+			throw new FileIoException($infoInstance, self::EXCEPTION_FILE_NOT_REACHABLE);
+		} elseif ((!FrameworkBootstrap::isReadableFile($infoInstance)) && (!$infoInstance->isFile())) {
 			// File does not exist!
-			throw new FileNotFoundException($fileName, self::EXCEPTION_FILE_CANNOT_BE_READ);
-		} elseif ((!FrameworkBootstrap::isReadableFile($fileName)) && (file_exists($fileName))) {
+			throw new FileNotFoundException($infoInstance, self::EXCEPTION_FILE_CANNOT_BE_READ);
+		} elseif ((!FrameworkBootstrap::isReadableFile($infoInstance)) && ($infoInstance->isFile())) {
 			// File cannot be read from (but exists)
-			throw new FileReadProtectedException($fileName, self::EXCEPTION_FILE_CANNOT_BE_READ);
+			throw new FileReadProtectedException($infoInstance, self::EXCEPTION_FILE_CANNOT_BE_READ);
 		}
 
 		// Try to open a handler
-		$filePointer = fopen($fileName, 'r');
-		if ((is_null($filePointer)) || ($filePointer === false)) {
+		$fileObject = $infoInstance->openFile('r');
+		if ((is_null($fileObject)) || ($fileObject === false)) {
 			// Something bad happend
-			throw new FileIoException($fileName, self::EXCEPTION_FILE_POINTER_INVALID);
+			throw new FileIoException($infoInstance, self::EXCEPTION_FILE_POINTER_INVALID);
 		} // END - if
 
 		// Create new instance
 		$pointerInstance = new FrameworkTextFileInputPointer();
 
 		// Set file pointer and file name
-		$pointerInstance->setPointer($filePointer);
-		$pointerInstance->setFileName($fileName);
+		$pointerInstance->setPointer($fileObject);
 
 		// Return the instance
 		return $pointerInstance;
@@ -114,27 +109,26 @@ class FrameworkTextFileInputPointer extends BaseFileIo implements InputPointer {
 	 *
 	 * @param	$bytes	Amount of bytes to read or whole line (only text files)
 	 * @return	$data	Data read from file
-	 * @throws	NullPointerException	If the file pointer instance
-	 *									is not set by setPointer()
-	 * @throws	InvalidResourceException	If there is being set
+	 * @throws	NullPointerException	If the file pointer instance is not set by setPointer()
+	 * @throws	InvalidResourceException	If there is no object being set
 	 */
 	public function read ($bytes = NULL) {
 		// Some sanity checks
-		if (is_null($this->getPointer())) {
+		if (is_null($this->getFileObject())) {
 			// Pointer not initialized
 			throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
-		} elseif (!is_resource($this->getPointer())) {
+		} elseif (!is_object($this->getFileObject())) {
 			// Pointer is not a valid resource!
-			throw new InvalidResourceException($this, self::EXCEPTION_INVALID_RESOURCE);
+			throw new LogicException(sprintf('this->fileObject[]=%s is no object', gettype($this->getFileObject())));
 		}
 
 		// Is $bytes set?
 		if (is_int($bytes)) {
 			// Try to read given characters
-			$data = fgets($this->getPointer(), $bytes);
+			$data = $this->getFileObject()->fread($bytes);
 		} else {
 			// Try to read whole line
-			$data = fgets($this->getPointer());
+			$data = $this->getFileObject()->fgets();
 		}
 
 		// Then return it