/**
* Read data a file pointer
*
- * @return mixed The result of fread()
+ * @return $data Read data from file
+ */
+ public function readFromFile () {
+ // Read 1024 Byte data from the file pointer and return it
+ return $this->read(1024);
+ }
+
+ /**
+ * Reads a line, maximum 4096 Bytes from current file pointer
+ *
+ * @return $data Read data from file
+ */
+ public function readLine () {
+ // Read whole line from the file pointer and return it
+ return $this->read();
+ }
+
+ /**
+ * Reads given amount of bytes from file.
+ *
+ * @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
*/
- public function readFromFile () {
+ public function read ($bytes = NULL) {
+ // Some sanity checks
if (is_null($this->getPointer())) {
// Pointer not initialized
throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER);
throw new InvalidResourceException($this, self::EXCEPTION_INVALID_RESOURCE);
}
- // Read data from the file pointer and return it
- return $this->read(1024);
- }
-
- /**
- * Reads given amount of bytes from file.
- *
- * @param $bytes Amount of bytes to read
- * @return $data Data read from file
- */
- public function read ($bytes) {
- // Try to read given characters
- $data = fgets($this->getPointer(), $bytes);
-
- // Was this successfull?
- assert(is_string($data));
+ // Is $bytes set?
+ if (is_int($bytes)) {
+ // Try to read given characters
+ $data = fgets($this->getPointer(), $bytes);
+ } else {
+ // Try to read whole line
+ $data = fgets($this->getPointer());
+ }
// Then return it
return $data;