From: Roland Haeder <roland@mxchange.org>
Date: Fri, 23 May 2014 23:43:17 +0000 (+0200)
Subject: Added assert() + noisy debug line + fixed double-implementation of an interface.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3e0abb7c375c43a11c1f2c790353f144dc7ca432;p=core.git

Added assert() + noisy debug line + fixed double-implementation of an interface.

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/inc/classes/main/index/file_stack/class_FileStackIndex.php b/inc/classes/main/index/file_stack/class_FileStackIndex.php
index ebd5fe25..3df30f84 100644
--- a/inc/classes/main/index/file_stack/class_FileStackIndex.php
+++ b/inc/classes/main/index/file_stack/class_FileStackIndex.php
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class FileStackIndex extends BaseIndex implements IndexableStack, CalculatableBlock, Registerable {
+class FileStackIndex extends BaseIndex implements IndexableStack, Registerable {
 	/**
 	 * Protected constructor
 	 *
diff --git a/inc/classes/main/iterator/io/class_FileIoIterator.php b/inc/classes/main/iterator/io/class_FileIoIterator.php
index 9ef4801d..ba1019ab 100644
--- a/inc/classes/main/iterator/io/class_FileIoIterator.php
+++ b/inc/classes/main/iterator/io/class_FileIoIterator.php
@@ -150,7 +150,7 @@ class FileIoIterator extends BaseIterator implements SeekableWritableFileIterato
 
 		// Wait until a entry/block separator has been found
 		$data = $this->getBackBuffer();
-		while (($this->getPointerInstance()->isEndOfFileReached()) && (!$this->getBlockInstance()->isBlockSeparatorFound($data))) {
+		while ((!$this->getPointerInstance()->isEndOfFileReached()) && (!$this->getBlockInstance()->isBlockSeparatorFound($data))) {
 			// Then read the block
 			$data .= $this->read($length);
 			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('data()=' . strlen($data));
@@ -159,6 +159,7 @@ class FileIoIterator extends BaseIterator implements SeekableWritableFileIterato
 		// EOF reached?
 		if ($this->getPointerInstance()->isEndOfFileReached()) {
 			// Then abort here silently
+			/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('EOF reached.');
 			return;
 		} // END - if
 
@@ -171,6 +172,10 @@ class FileIoIterator extends BaseIterator implements SeekableWritableFileIterato
 		// Separate data
 		$dataArray = explode(self::getBlockSeparator(), $data);
 
+		// This array must contain two elements
+		/* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('dataArray=' . print_r($dataArray, TRUE));
+		assert(count($dataArray) == 2);
+
 		// Left part is the actual block, right one the back-buffer data
 		$this->setCurrentBlock($dataArray[0]);
 		$this->setBackBuffer($dataArray[1]);