X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fclass_BaseFrameworkSystem.php;h=f03df720824ff5112ccb5755149836f2f2f488ac;hp=9262934f375aa10fc3c04c7d5473ec746a03f0d6;hb=72c8e5113ca8d4c03a2b4853f61c549b5fbc0e31;hpb=c0cd963d2909edf773bfef702df042822a31f946

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 9262934f..f03df720 100644
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -23,6 +23,7 @@ use CoreFramework\Filesystem\PathWriteProtectedException;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Generic\UnsupportedOperationException;
+use CoreFramework\Handler\Handleable;
 use CoreFramework\Handler\Stream\IoHandler;
 use CoreFramework\Index\Indexable;
 use CoreFramework\Lists\Listable;
@@ -38,6 +39,7 @@ use CoreFramework\Result\Database\CachedDatabaseResult;
 use CoreFramework\Result\Search\SearchableResult;
 use CoreFramework\Stacker\Stackable;
 use CoreFramework\State\Stateable;
+use CoreFramework\Stream\Input\InputStream;
 use CoreFramework\Stream\Output\OutputStreamer;
 use CoreFramework\Template\CompileableTemplate;
 use CoreFramework\User\ManageableAccount;
@@ -167,11 +169,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $parserInstance = NULL;
 
-	/**
-	 * A HandleableProtocol instance
-	 */
-	private $protocolInstance = NULL;
-
 	/**
 	 * A database wrapper instance
 	 */
@@ -203,7 +200,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	private $outputStreamInstance = NULL;
 
 	/**
-	 * Networkable handler instance
+	 * Handler instance
 	 */
 	private $handlerInstance = NULL;
 
@@ -212,11 +209,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $visitorInstance = NULL;
 
-	/**
-	 * DHT instance
-	 */
-	private $dhtInstance = NULL;
-
 	/**
 	 * An instance of a database wrapper class
 	 */
@@ -302,11 +294,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	 */
 	private $controllerName = '';
 
-	/**
-	 * Name of used protocol
-	 */
-	private $protocolName = 'invalid';
-
 	/**
 	 * Array with bitmasks and such for pack/unpack methods to support both
 	 * 32-bit and 64-bit systems
@@ -401,6 +388,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	const EXCEPTION_PATH_CANNOT_BE_WRITTEN       = 0x03b;
 	const EXCEPTION_DATABASE_UPDATED_NOT_ALLOWED = 0x03c;
 	const EXCEPTION_FILTER_CHAIN_INTERCEPTED     = 0x03d;
+	const EXCEPTION_INVALID_SOCKET               = 0x03e;
 
 	/**
 	 * Hexadecimal->Decimal translation array
@@ -492,8 +480,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 			$this->setRealClass('DestructedObject');
 		} elseif ((defined('DEBUG_DESTRUCTOR')) && (is_object($this->getDebugInstance()))) {
 			// Already destructed object
-			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:] The object <span class="object_name">%s</span> is already destroyed.',
-				__CLASS__,
+			self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('The object <span class="object_name">%s</span> is already destroyed.',
 				$this->__toString()
 			));
 		} else {
@@ -585,7 +572,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 
 		// Output stub message
 		// @TODO __CLASS__ does always return BaseFrameworkSystem but not the extending (=child) class
-		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[unknown::%s:] Stub! Args: %s',
+		self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[unknown::%s]: Stub! Args: %s',
 			$methodName,
 			$argsString
 		));
@@ -1136,25 +1123,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $this->parserInstance;
 	}
 
-	/**
-	 * Setter for HandleableProtocol instance
-	 *
-	 * @param	$protocolInstance	An instance of an HandleableProtocol
-	 * @return	void
-	 */
-	public final function setProtocolInstance (HandleableProtocol $protocolInstance) {
-		$this->protocolInstance = $protocolInstance;
-	}
-
-	/**
-	 * Getter for HandleableProtocol instance
-	 *
-	 * @return	$protocolInstance	An instance of an HandleableProtocol
-	 */
-	public final function getProtocolInstance () {
-		return $this->protocolInstance;
-	}
-
 	/**
 	 * Setter for DatabaseWrapper instance
 	 *
@@ -1324,7 +1292,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 	/**
 	 * Getter for handler instance
 	 *
-	 * @return	$handlerInstance	A Networkable instance
+	 * @return	$handlerInstance	A Handleable instance
 	 */
 	protected final function getHandlerInstance () {
 		return $this->handlerInstance;
@@ -1349,25 +1317,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $this->visitorInstance;
 	}
 
-	/**
-	 * Setter for DHT instance
-	 *
-	 * @param	$dhtInstance	A Distributable instance
-	 * @return	void
-	 */
-	protected final function setDhtInstance (Distributable $dhtInstance) {
-		$this->dhtInstance = $dhtInstance;
-	}
-
-	/**
-	 * Getter for DHT instance
-	 *
-	 * @return	$dhtInstance	A Distributable instance
-	 */
-	protected final function getDhtInstance () {
-		return $this->dhtInstance;
-	}
-
 	/**
 	 * Setter for raw package Data
 	 *
@@ -1613,25 +1562,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $this->controllerName;
 	}
 
-	/**
-	 * Getter for protocol name
-	 *
-	 * @return	$protocolName	Name of used protocol
-	 */
-	public final function getProtocolName () {
-		return $this->protocolName;
-	}
-
-	/**
-	 * Setter for protocol name
-	 *
-	 * @param	$protocolName	Name of used protocol
-	 * @return	void
-	 */
-	protected final function setProtocolName ($protocolName) {
-		$this->protocolName = $protocolName;
-	}
-
 	/**
 	 * Checks whether an object equals this object. You should overwrite this
 	 * method to implement own equality checks
@@ -1809,7 +1739,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		} // END - if
 
 		// Construct the full message
-		$stubMessage = sprintf('[%s:] Partial stub!',
+		$stubMessage = sprintf('[%s]: Partial stub!',
 			$methodName
 		);
 
@@ -2578,20 +2508,6 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		return $ret;
 	}
 
-	/**
-	 * Checks whether start/end marker are set
-	 *
-	 * @param	$data	Data to be checked
-	 * @return	$isset	Whether start/end marker are set
-	 */
-	public final function ifStartEndMarkersSet ($data) {
-		// Determine it
-		$isset = ((substr($data, 0, strlen(BaseRawDataHandler::STREAM_START_MARKER)) == BaseRawDataHandler::STREAM_START_MARKER) && (substr($data, -1 * strlen(BaseRawDataHandler::STREAM_END_MARKER), strlen(BaseRawDataHandler::STREAM_END_MARKER)) == BaseRawDataHandler::STREAM_END_MARKER));
-
-		// ... and return it
-		return $isset;
-	}
-
 	/**
 	 * Determines if an element is set in the generic array
 	 *
@@ -3304,7 +3220,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
 		} // END - if
 
 		// Add it
-		$fqfn = $basePath . '/' . $fileName;
+		$fqfn = $basePath . DIRECTORY_SEPARATOR . $fileName;
 
 		// Is it reachable?
 		if (!FrameworkBootstrap::isReachableFilePath($fqfn)) {