From 6327d67d057b505a33549c656310ee1f9ed1cffa Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 15 May 2014 21:35:09 +0200 Subject: [PATCH] Continued with loader and file i/o stuff: - renamed interface to SeekableWritableFileIterator as this interface allows write operations (such calls are forwarded to the wrapped file_raw_input_output_pointer_class instance). - Removed .svn from excepted paths as this won't be the case. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- ...or.php => class_SeekableWritableFileIterator.php} | 12 ++++++++++-- .../main/iterator/io/class_FileIoIterator.php | 2 +- inc/loader/class_ClassLoader.php | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) rename inc/classes/interfaces/iterator/{class_SeekableFileIterator.php => class_SeekableWritableFileIterator.php} (75%) diff --git a/inc/classes/interfaces/iterator/class_SeekableFileIterator.php b/inc/classes/interfaces/iterator/class_SeekableWritableFileIterator.php similarity index 75% rename from inc/classes/interfaces/iterator/class_SeekableFileIterator.php rename to inc/classes/interfaces/iterator/class_SeekableWritableFileIterator.php index 1192192b..48dd8db4 100644 --- a/inc/classes/interfaces/iterator/class_SeekableFileIterator.php +++ b/inc/classes/interfaces/iterator/class_SeekableWritableFileIterator.php @@ -1,6 +1,7 @@ * @version 0.0.0 @@ -21,7 +22,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface SeekableFileIterator extends SeekableIterator { +interface SeekableWritableFileIterator extends SeekableIterator { + /** + * Seeks to given position + * + * @param $seekPosition Seek position in file + * @return void + */ + function seek ($seedPosition); } // [EOF] diff --git a/inc/classes/main/iterator/io/class_FileIoIterator.php b/inc/classes/main/iterator/io/class_FileIoIterator.php index 1791e615..cfd1297b 100644 --- a/inc/classes/main/iterator/io/class_FileIoIterator.php +++ b/inc/classes/main/iterator/io/class_FileIoIterator.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class FileIoIterator extends BaseIterator implements SeekableFileIterator { +class FileIoIterator extends BaseIterator implements SeekableWritableFileIterator { /** * Protected constructor * diff --git a/inc/loader/class_ClassLoader.php b/inc/loader/class_ClassLoader.php index eea55805..af4d8d33 100644 --- a/inc/loader/class_ClassLoader.php +++ b/inc/loader/class_ClassLoader.php @@ -305,7 +305,6 @@ class ClassLoader { array_push($ignoreList, '.'); array_push($ignoreList, '..'); array_push($ignoreList, '.htaccess'); - array_push($ignoreList, '.svn'); // Keep it in class for later usage $this->ignoreList = $ignoreList; @@ -320,7 +319,7 @@ class ClassLoader { // If the basePath is FALSE it is invalid if ($basePath2 === FALSE) { /* @todo: Do not die here. */ - exit(__METHOD__ . ':Cannot read ' . $basePath . ' !'); + exit(__METHOD__ . ':Cannot read ' . $basePath . ' !' . PHP_EOL); } else { // Set base path $basePath = $basePath2; -- 2.39.5