From f861d6bc00f8a3ecf6b057f2aa93129572643896 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 19 Feb 2023 01:17:11 +0100 Subject: [PATCH] Continued: - moved partialStub() method to DebugMiddleware --- application/tests/class_ApplicationHelper.php | 3 +- framework/main/classes/actions/class_ | 3 +- .../classes/class_BaseFrameworkSystem.php | 31 ++----------------- framework/main/classes/commands/class_ | 7 +++-- .../classes/commands/console/class_Console | 7 +++-- .../console/class_ConsoleFuseCommand.php | 3 +- .../main/classes/commands/html/class_Html | 5 ++- .../html/class_HtmlProblemCommand.php | 3 +- framework/main/classes/discovery/class_ | 5 +-- framework/main/classes/feature/class_ | 3 +- .../feature/fuse/class_FuseFeature.php | 3 +- .../binary/class_BaseBinaryFile.php | 3 +- .../io_stream/class_FileIoStream.php | 7 +++-- .../filter/change/class_EmailChangeFilter.php | 3 +- .../change/class_PasswordChangeFilter.php | 3 +- framework/main/classes/filter/class_ | 3 +- .../verifier/class_EmailVerifierFilter.php | 3 +- framework/main/classes/helper/captcha/class_ | 5 +-- framework/main/classes/helper/html/class_ | 3 +- .../classes/images/png/class_PngImage.php | 3 +- framework/main/classes/iterator/class_ | 11 ++++--- framework/main/classes/lists/class_ | 7 +++-- .../lists/groups/class_ListGroupList.php | 3 +- framework/main/classes/mailer/class_ | 5 +-- framework/main/classes/output/class_ | 3 +- .../classes/parser/xml/class_XmlParser.php | 3 +- ...LocalFileDatabaseFormatUpgradeRegistry.php | 3 +- framework/main/classes/request/class_ | 11 ++++--- .../console/class_ConsoleResponse.php | 11 ++++--- .../response/html/class_HtmlResponse.php | 3 +- .../response/image/class_ImageResponse.php | 3 +- framework/main/classes/stacker/class_ | 7 +++-- framework/main/classes/stacker/file/class_ | 13 +++++--- .../stacker/file/class_BaseFileStack.php | 11 ++++--- .../stacker/file/fifo/class_FiFoFileStack.php | 3 +- framework/main/classes/tasks/class_ | 3 +- .../image/class_ImageTemplateEngine.php | 3 +- .../debug/class_DebugMiddleware.php | 24 ++++++++++++++ .../middleware/io/class_FileIoHandler.php | 9 +++--- framework/main/tests/filter/tests/class_Tests | 3 +- .../configuration/class_TestConfiguration | 3 +- .../class_TestsPhpRequirementsFilter.php | 3 +- 42 files changed, 150 insertions(+), 101 deletions(-) diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php index f84fe3c5..3d531efd 100644 --- a/application/tests/class_ApplicationHelper.php +++ b/application/tests/class_ApplicationHelper.php @@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Loader\ClassLoader; use Org\Mxchange\CoreFramework\Manager\ManageableApplication; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Registry\Registerable; use Org\Mxchange\CoreFramework\Template\CompileableTemplate; use Org\Mxchange\CoreFramework\Utils\Strings\StringUtils; @@ -192,7 +193,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication * @todo Nothing to add? */ public function assignExtraTemplateData (CompileableTemplate $templateInstance) { - $this->partialStub('Unfinished method. templateInstance=' . $templateInstance->__toString()); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished method. templateInstance=' . $templateInstance->__toString()); } } diff --git a/framework/main/classes/actions/class_ b/framework/main/classes/actions/class_ index ed34a50d..80eefba5 100644 --- a/framework/main/classes/actions/class_ +++ b/framework/main/classes/actions/class_ @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Action\!!!; // Import framework stuff use Org\Mxchange\CoreFramework\Action\BaseAction; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * An action for ??? @@ -60,7 +61,7 @@ class ???Action extends BaseAction implements Commandable { * @todo 0% done */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { - $this->partialStub("You have to implement me."); + DebugMiddleware::getSelfInstance()->partialStub("You have to implement me."); } } diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index 3920db4c..dc2410c3 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -400,7 +400,7 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac * @return void */ public final function setDebugInstance (DebugMiddleware $debugInstance) { - GenericRegistry::getRegistry()->addInstance('debug', $debugInstance); + self::$debugInstance = $debugInstance; } /** @@ -543,33 +543,6 @@ Loaded includes: )); } - /** - * Output a partial stub message for the caller method - * - * @param $message An optional message to display - * @return void - */ - protected function partialStub (string $message = '') { - // Init variable - $stubMessage = 'Partial stub!'; - - // Is an extra message given? - if (!empty($message)) { - // Then add it as well - $stubMessage .= ' Message: ' . $message; - } - - // Debug instance is there? - if (!is_null($this->getDebugInstance())) { - // Output stub message - self::createDebugInstance(__CLASS__, __LINE__)->warningMessage($stubMessage); - } else { - // Trigger an error - trigger_error($stubMessage); - exit(255); - } - } - /** * Outputs a debug backtrace and stops further script execution * @@ -845,7 +818,7 @@ Loaded includes: } } else { // @TODO Finish this part! - $this->partialStub('Developer mode inactive. Message:' . $message); + DebugMiddleware::getSelfInstance()->partialStub('Developer mode inactive. Message:' . $message); } } diff --git a/framework/main/classes/commands/class_ b/framework/main/classes/commands/class_ index cf160ac3..195b0b02 100644 --- a/framework/main/classes/commands/class_ +++ b/framework/main/classes/commands/class_ @@ -1,4 +1,7 @@ partialStub('Unfinished!'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished!'); } /** @@ -68,7 +71,7 @@ class ???Command extends BaseCommand implements Commandable { * @return void */ public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { - $this->partialStub('Unfinished!'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished!'); } } diff --git a/framework/main/classes/commands/console/class_Console b/framework/main/classes/commands/console/class_Console index 6318963c..e2bb4de3 100644 --- a/framework/main/classes/commands/console/class_Console +++ b/framework/main/classes/commands/console/class_Console @@ -1,4 +1,7 @@ partialStub('Unfinished!'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished!'); } /** @@ -68,7 +71,7 @@ class Console???Command extends BaseCommand implements Commandable { * @return void */ public function addExtraFilters (Controller $controllerInstance, Requestable $requestInstance) { - $this->partialStub('Unfinished!'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished!'); } } diff --git a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php index 84a8f081..c8061ffc 100644 --- a/framework/main/classes/commands/console/class_ConsoleFuseCommand.php +++ b/framework/main/classes/commands/console/class_ConsoleFuseCommand.php @@ -7,6 +7,7 @@ use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; use Org\Mxchange\CoreFramework\Feature\FrameworkFeature; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -82,7 +83,7 @@ class ConsoleFuseCommand extends BaseCommand implements Commandable { } // @TODO Unfinished - $this->partialStub('Still unfinished! ;-)'); + DebugMiddleware::getSelfInstance()->partialStub('Still unfinished! ;-)'); } /** diff --git a/framework/main/classes/commands/html/class_Html b/framework/main/classes/commands/html/class_Html index 06f4923c..2db86e39 100644 --- a/framework/main/classes/commands/html/class_Html +++ b/framework/main/classes/commands/html/class_Html @@ -1,4 +1,7 @@ partialStub('Unfinished method.'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished method.'); } /** diff --git a/framework/main/classes/commands/html/class_HtmlProblemCommand.php b/framework/main/classes/commands/html/class_HtmlProblemCommand.php index ce132366..1b876f7b 100644 --- a/framework/main/classes/commands/html/class_HtmlProblemCommand.php +++ b/framework/main/classes/commands/html/class_HtmlProblemCommand.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\CoreFramework\Command\Failed; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; @@ -70,7 +71,7 @@ class HtmlProblemCommand extends BaseCommand implements Commandable { * @todo 0% done */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { - $this->partialStub('Unfinished method.'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished method.'); } /** diff --git a/framework/main/classes/discovery/class_ b/framework/main/classes/discovery/class_ index b4a7a343..6209f5f8 100644 --- a/framework/main/classes/discovery/class_ +++ b/framework/main/classes/discovery/class_ @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Disovery\; // Import framework stuff use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * A ??? discovery class. @@ -59,7 +60,7 @@ class ???Discovery extends BaseDiscovery implements Discoverable { * @todo 0% done */ public function discover (Requestable $requestInstance) { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); } /** @@ -70,7 +71,7 @@ class ???Discovery extends BaseDiscovery implements Discoverable { * @todo 0% done */ public function addResultsToHelper (HelpableTemplate $helperInstance) { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); } } diff --git a/framework/main/classes/feature/class_ b/framework/main/classes/feature/class_ index 85aa1b1f..4cad8ab6 100644 --- a/framework/main/classes/feature/class_ +++ b/framework/main/classes/feature/class_ @@ -5,6 +5,7 @@ namespace Org\Mxchange\CoreFramework\Feature\!!!; // Import framework stuff use Org\Mxchange\CoreFramework\Feature\BaseFeature; use Org\Mxchange\CoreFramework\Feature\Feature; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * A ??? feature class @@ -63,7 +64,7 @@ class ???Feature extends BaseFeature implements Feature { $isAvailable = false; // Unfinished: - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); // Return status return $isAvailable; diff --git a/framework/main/classes/feature/fuse/class_FuseFeature.php b/framework/main/classes/feature/fuse/class_FuseFeature.php index fcc98b59..fb039d41 100644 --- a/framework/main/classes/feature/fuse/class_FuseFeature.php +++ b/framework/main/classes/feature/fuse/class_FuseFeature.php @@ -5,6 +5,7 @@ namespace Org\Mxchange\CoreFramework\Feature\Fuse; // Import framework stuff use Org\Mxchange\CoreFramework\Feature\BaseFeature; use Org\Mxchange\CoreFramework\Feature\Feature; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * A FUSE feature class @@ -63,7 +64,7 @@ class FuseFeature extends BaseFeature implements Feature { $isAvailable = false; // Unfinished: - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); // Return status return $isAvailable; diff --git a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php index c214d962..0885e338 100644 --- a/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php +++ b/framework/main/classes/file_directories/binary/class_BaseBinaryFile.php @@ -9,6 +9,7 @@ use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Filesystem\File\BaseAbstractFile; use Org\Mxchange\CoreFramework\Filesystem\FilePointer; use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Traits\Index\IndexableTrait; use Org\Mxchange\CoreFramework\Traits\Stack\StackableTrait; @@ -1028,7 +1029,7 @@ abstract class BaseBinaryFile extends BaseAbstractFile implements BinaryFile { } // @TODO Unfinished - $this->partialStub('length=' . $length); + DebugMiddleware::getSelfInstance()->partialStub('length=' . $length); } } diff --git a/framework/main/classes/file_directories/io_stream/class_FileIoStream.php b/framework/main/classes/file_directories/io_stream/class_FileIoStream.php index a0fb8e04..126ab896 100644 --- a/framework/main/classes/file_directories/io_stream/class_FileIoStream.php +++ b/framework/main/classes/file_directories/io_stream/class_FileIoStream.php @@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Filesystem\FileNotFoundException; use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; use Org\Mxchange\CoreFramework\Stream\Filesystem\FileInputStreamer; use Org\Mxchange\CoreFramework\Stream\Filesystem\FileOutputStreamer; @@ -323,7 +324,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil * @todo 0% done */ public function determineSeekPosition () { - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); } /** @@ -334,7 +335,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil * @return $status Status of file seek: 0 = success, -1 = failed */ public function seek (int $offset, int $whence = SEEK_SET) { - $this->partialStub('offset=' . $offset . ',whence=' . $whence); + DebugMiddleware::getSelfInstance()->partialStub('offset=' . $offset . ',whence=' . $whence); } /** @@ -343,7 +344,7 @@ class FileIoStream extends BaseFrameworkSystem implements FileInputStreamer, Fil * @return $size Size (in bytes) of file */ public function size () { - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); } } diff --git a/framework/main/classes/filter/change/class_EmailChangeFilter.php b/framework/main/classes/filter/change/class_EmailChangeFilter.php index a2de4bbd..a8411e70 100644 --- a/framework/main/classes/filter/change/class_EmailChangeFilter.php +++ b/framework/main/classes/filter/change/class_EmailChangeFilter.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Change\Email; use Org\Mxchange\CoreFramework\Filter\BaseFilter; use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException; use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -125,7 +126,7 @@ class EmailChangeFilter extends BaseFilter implements Filterable { } // Update the "new_email" field - $this->partialStub('Unfinished part.'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished part.'); } } diff --git a/framework/main/classes/filter/change/class_PasswordChangeFilter.php b/framework/main/classes/filter/change/class_PasswordChangeFilter.php index ff67434c..7eaaa2ee 100644 --- a/framework/main/classes/filter/change/class_PasswordChangeFilter.php +++ b/framework/main/classes/filter/change/class_PasswordChangeFilter.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Change\Password; use Org\Mxchange\CoreFramework\Filter\BaseFilter; use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException; use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -117,7 +118,7 @@ class PasswordChangeFilter extends BaseFilter implements Filterable { $userInstance = GenericRegistry::getRegistry()->getInstance('user'); // Update the "password" field - $this->partialStub('Unfinished part.'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished part.'); } } diff --git a/framework/main/classes/filter/class_ b/framework/main/classes/filter/class_ index 70073f04..13011f2c 100644 --- a/framework/main/classes/filter/class_ +++ b/framework/main/classes/filter/class_ @@ -5,6 +5,7 @@ namespace \Filter\; // Import framework stuff use Org\Mxchange\CoreFramework\Filter\BaseFilter; use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -65,7 +66,7 @@ class ???Filter extends BaseFilter implements Filterable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Implement this! - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } } diff --git a/framework/main/classes/filter/verifier/class_EmailVerifierFilter.php b/framework/main/classes/filter/verifier/class_EmailVerifierFilter.php index c014b5b7..08bb8bee 100644 --- a/framework/main/classes/filter/verifier/class_EmailVerifierFilter.php +++ b/framework/main/classes/filter/verifier/class_EmailVerifierFilter.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\CoreFramework\Filter\Verifier\Email; use Org\Mxchange\CoreFramework\Filter\BaseFilter; use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException; use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -66,7 +67,7 @@ class EmailVerifierFilter extends BaseFilter implements Filterable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Implement this! - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } } diff --git a/framework/main/classes/helper/captcha/class_ b/framework/main/classes/helper/captcha/class_ index 776e2c0b..1e9e9da7 100644 --- a/framework/main/classes/helper/captcha/class_ +++ b/framework/main/classes/helper/captcha/class_ @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Captcha\; // Import framework stuff use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * A solveable CAPTCHA @@ -66,7 +67,7 @@ class ???Captcha extends BaseCaptcha implements SolveableCaptcha { * @todo 0% done */ public function initiateCaptcha () { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); } /** @@ -76,7 +77,7 @@ class ???Captcha extends BaseCaptcha implements SolveableCaptcha { * @todo 0% done */ public function renderCode () { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); } } diff --git a/framework/main/classes/helper/html/class_ b/framework/main/classes/helper/html/class_ index 164852f9..224fb185 100644 --- a/framework/main/classes/helper/html/class_ +++ b/framework/main/classes/helper/html/class_ @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Helper\; // Import framework stuff use Org\Mxchange\CoreFramework\Helper\Template\HelpableTemplate; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * @@ -74,7 +75,7 @@ class Html???Helper extends BaseHtmlHelper implements HelpableTemplate { * @todo 0% done */ public function flushContent () { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); } } diff --git a/framework/main/classes/images/png/class_PngImage.php b/framework/main/classes/images/png/class_PngImage.php index f5f54cf1..4dcc9d3d 100644 --- a/framework/main/classes/images/png/class_PngImage.php +++ b/framework/main/classes/images/png/class_PngImage.php @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Image; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Template\CompileableTemplate; // Import SPL stuff @@ -69,7 +70,7 @@ class PngImage extends BaseImage { * @todo Rewrite this to SplFileInfo/Object */ public function finishImage () { - $this->partialStub('Unfinished method.'); + DebugMiddleware::getSelfInstance()->partialStub('Unfinished method.'); return; // Call parent method diff --git a/framework/main/classes/iterator/class_ b/framework/main/classes/iterator/class_ index cc7292b3..d08a1d90 100644 --- a/framework/main/classes/iterator/class_ +++ b/framework/main/classes/iterator/class_ @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Iterator\!!!; // Import framework stuff use Org\Mxchange\CoreFramework\Iterator\BaseIterator; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; // Import SPL stuff use \Iterator; @@ -63,7 +64,7 @@ class ???Iterator extends BaseIterator implements Iterator { // Default is null $current = null; - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); // Return it return $current; @@ -78,7 +79,7 @@ class ???Iterator extends BaseIterator implements Iterator { // Default is null $key = null; - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); // Return it return $key; @@ -90,7 +91,7 @@ class ???Iterator extends BaseIterator implements Iterator { * @return void */ public function next () { - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } /** @@ -99,7 +100,7 @@ class ???Iterator extends BaseIterator implements Iterator { * @return void */ public function rewind () { - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } /** @@ -108,7 +109,7 @@ class ???Iterator extends BaseIterator implements Iterator { * @return void */ public function valid () { - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } } diff --git a/framework/main/classes/lists/class_ b/framework/main/classes/lists/class_ index 69590fba..93cc43dd 100644 --- a/framework/main/classes/lists/class_ +++ b/framework/main/classes/lists/class_ @@ -1,4 +1,7 @@ partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } /** @@ -62,7 +65,7 @@ class ???List extends BaseList implements Listable { * @todo 0% done */ public function clearList () { - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } } diff --git a/framework/main/classes/lists/groups/class_ListGroupList.php b/framework/main/classes/lists/groups/class_ListGroupList.php index 03568f40..8f3f6ac5 100644 --- a/framework/main/classes/lists/groups/class_ListGroupList.php +++ b/framework/main/classes/lists/groups/class_ListGroupList.php @@ -5,6 +5,7 @@ namespace Org\Mxchange\CoreFramework\Lists\Group; // Import framework stuff use Org\Mxchange\CoreFramework\Lists\BaseList; use Org\Mxchange\CoreFramework\Lists\Listable; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * A ListGroup list @@ -68,7 +69,7 @@ class ListGroupList extends BaseList implements Listable { * @todo 0% done */ public function clearList () { - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } } diff --git a/framework/main/classes/mailer/class_ b/framework/main/classes/mailer/class_ index ab5ed827..55b566a3 100644 --- a/framework/main/classes/mailer/class_ +++ b/framework/main/classes/mailer/class_ @@ -5,6 +5,7 @@ namespace Org\Mxchange\CoreFramework\Mailer\!!!; // Import framwork stuff use Org\Mxchange\CoreFramework\Mailer\BaseMailer; use Org\Mxchange\CoreFramework\Mailer\DeliverableMail; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * A ??? mailer class @@ -59,7 +60,7 @@ class ???Mailer extends BaseMailer implements DeliverableMail { * @todo 0% done */ public function deliverEmail() { - $this->partialStub("You have to implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("You have to implement this method."); } /** @@ -69,7 +70,7 @@ class ???Mailer extends BaseMailer implements DeliverableMail { * @todo 0% done */ public function sendAdminNotification() { - $this->partialStub("You have to implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("You have to implement this method."); } } diff --git a/framework/main/classes/output/class_ b/framework/main/classes/output/class_ index 2420d7e8..84b7d53d 100644 --- a/framework/main/classes/output/class_ +++ b/framework/main/classes/output/class_ @@ -5,6 +5,7 @@ namespace Org\Mxchange\CoreFramework\Output\; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; /** * A ??? output class @@ -79,7 +80,7 @@ class ???Output extends BaseOutput implements OutputStreamer, Registerable { * @todo 0% done */ public final function output ($outStream = false, $stripTags = false) { - $this->partialStub('Please implement this method. outStream()=' . strlen($outStream) . ',stripTags=' . intval($stripTags)); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method. outStream()=' . strlen($outStream) . ',stripTags=' . intval($stripTags)); } /** diff --git a/framework/main/classes/parser/xml/class_XmlParser.php b/framework/main/classes/parser/xml/class_XmlParser.php index af036ab2..7b09884e 100644 --- a/framework/main/classes/parser/xml/class_XmlParser.php +++ b/framework/main/classes/parser/xml/class_XmlParser.php @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Parser\Xml; // Import framework stuff use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Parser\BaseParser; use Org\Mxchange\CoreFramework\Parser\Parseable; use Org\Mxchange\CoreFramework\Template\CompileableTemplate; @@ -82,7 +83,7 @@ class XmlParser extends BaseParser implements Parseable { $content = mb_convert_encoding($content, 'UTF-8', 'auto'); } else { // @TODO We need to find a fallback solution here - $this->partialStub('Cannot find recode/mbstring extension!'); + DebugMiddleware::getSelfInstance()->partialStub('Cannot find recode/mbstring extension!'); } // Get an XML parser diff --git a/framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php b/framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php index 3196108d..c40b19a8 100644 --- a/framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php +++ b/framework/main/classes/registry/format_upgrade/database/class_LocalFileDatabaseFormatUpgradeRegistry.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\CoreFramework\Registry\Upgrade\Format\Lfdb; // Import framework stuff +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Registry\BaseRegistry; use Org\Mxchange\CoreFramework\Upgrade\Format\Database\UpgradeableDatabaseFormat; use Org\Mxchange\CoreFramework\Upgrade\Format\RegisterableFormatUpgrade; @@ -70,7 +71,7 @@ class LocalFileDatabaseFormatUpgradeRegistry extends BaseRegistry implements Reg * @todo 0% done */ public function registerFormatUpgrader (UpgradeableDatabaseFormat $upgradeInstance) { - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); } } diff --git a/framework/main/classes/request/class_ b/framework/main/classes/request/class_ index c24fa32b..c4ab6a90 100644 --- a/framework/main/classes/request/class_ +++ b/framework/main/classes/request/class_ @@ -2,6 +2,9 @@ // Own namespace namespace Org\Mxchange\CoreFramework\Request; +// Import framework stuff +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; + /** * A concrete request class * @@ -58,7 +61,7 @@ class ???Request extends BaseRequest implements Requestable { * @todo Needs to be implemented */ protected function prepareRequestData () { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); } /** @@ -68,7 +71,7 @@ class ???Request extends BaseRequest implements Requestable { * @return $headerValue Value of the header or 'null' if not found */ public function getHeaderElement ($headerName) { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); } /** @@ -77,7 +80,7 @@ class ???Request extends BaseRequest implements Requestable { * @return $requestMethod Used request method */ public final function getRequestMethod () { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); return $_SERVER['REQUEST_METHOD']; } @@ -88,7 +91,7 @@ class ???Request extends BaseRequest implements Requestable { * @return $cookieValue Value of cookie or null if not found */ public final function readCookie ($cookieName) { - $this->partialStub("Please implement this method."); + DebugMiddleware::getSelfInstance()->partialStub("Please implement this method."); } } diff --git a/framework/main/classes/response/console/class_ConsoleResponse.php b/framework/main/classes/response/console/class_ConsoleResponse.php index 7a3fd3bc..4cb10564 100644 --- a/framework/main/classes/response/console/class_ConsoleResponse.php +++ b/framework/main/classes/response/console/class_ConsoleResponse.php @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Response; // Import framework stuff use Org\Mxchange\CoreFramework\Manager\ManageableApplication; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Response\Responseable; /** @@ -70,7 +71,7 @@ class ConsoleResponse extends BaseResponse implements Responseable { */ public function addCookie (string $cookieName, $cookieValue, bool $encrypted = FALSE, int $expires = NULL) { //* DEBUG: */ echo $cookieName.'='.$cookieValue."
\n"; - $this->partialStub('Naturally unimplemented in console response.'); + DebugMiddleware::getSelfInstance()->partialStub('Naturally unimplemented in console response.'); } /** @@ -82,7 +83,7 @@ class ConsoleResponse extends BaseResponse implements Responseable { * @throws ResponseHeadersAlreadySentException If headers are already sent */ public function redirectToConfiguredUrl ($configEntry) { - $this->partialStub('Naturally unimplemented in console response.'); + DebugMiddleware::getSelfInstance()->partialStub('Naturally unimplemented in console response.'); } /** @@ -92,7 +93,7 @@ class ConsoleResponse extends BaseResponse implements Responseable { * @return void */ public function expireCookie ($cookieName) { - $this->partialStub('Naturally unimplemented in console response.'); + DebugMiddleware::getSelfInstance()->partialStub('Naturally unimplemented in console response.'); } /** @@ -102,7 +103,7 @@ class ConsoleResponse extends BaseResponse implements Responseable { * @return void */ public function refreshCookie ($cookieName) { - $this->partialStub('Naturally unimplemented in console response.'); + DebugMiddleware::getSelfInstance()->partialStub('Naturally unimplemented in console response.'); } /** @@ -114,7 +115,7 @@ class ConsoleResponse extends BaseResponse implements Responseable { * @throws ResponseHeadersAlreadySentException Thrown if headers are already sent */ public function flushBuffer ($force = false) { - $this->partialStub('Please implement this class.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this class.'); } } diff --git a/framework/main/classes/response/html/class_HtmlResponse.php b/framework/main/classes/response/html/class_HtmlResponse.php index 76cd50d0..b81a30a9 100644 --- a/framework/main/classes/response/html/class_HtmlResponse.php +++ b/framework/main/classes/response/html/class_HtmlResponse.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\CoreFramework\Response; use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Manager\ManageableApplication; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -86,7 +87,7 @@ class HtmlResponse extends BaseResponse implements Responseable { // Shall we encrypt the cookie? if ($encrypted) { // Unsupported at the moment - $this->partialStub('Encryption is unsupported at the moment.'); + DebugMiddleware::getSelfInstance()->partialStub('Encryption is unsupported at the moment.'); } // For slow browsers set the cookie array element first diff --git a/framework/main/classes/response/image/class_ImageResponse.php b/framework/main/classes/response/image/class_ImageResponse.php index 496cb8f9..aa25d792 100644 --- a/framework/main/classes/response/image/class_ImageResponse.php +++ b/framework/main/classes/response/image/class_ImageResponse.php @@ -7,6 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Image\BaseImage; use Org\Mxchange\CoreFramework\Manager\ManageableApplication; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -109,7 +110,7 @@ class ImageResponse extends BaseResponse implements Responseable { // Shall we encrypt the cookie? if ($encrypted) { // Unsupported at the moment - $this->partialStub('Encryption is unsupported at the moment.'); + DebugMiddleware::getSelfInstance()->partialStub('Encryption is unsupported at the moment.'); } // For slow browsers set the cookie array element first diff --git a/framework/main/classes/stacker/class_ b/framework/main/classes/stacker/class_ index 80d49318..b8e5aa09 100644 --- a/framework/main/classes/stacker/class_ +++ b/framework/main/classes/stacker/class_ @@ -3,6 +3,7 @@ namespace Org\Mxchange\CoreFramework\Stack\!!!; // Import framework stuff +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Stack\BaseStacker; use Org\Mxchange\CoreFramework\Stack\Stackable; @@ -65,7 +66,7 @@ class ???Stacker extends BaseStacker implements Stackable { * @throws StackerFullException If the stack is full */ public function pushNamed ($stackerName, $value) { - $this->partialStub('stackerName=' . $stackerName . ',value[' . gettype($value) . ']=' . $value); + DebugMiddleware::getSelfInstance()->partialStub('stackerName=' . $stackerName . ',value[' . gettype($value) . ']=' . $value); } /** @@ -77,7 +78,7 @@ class ???Stacker extends BaseStacker implements Stackable { * @throws EmptyStackerException If the named stacker is empty */ public function popNamed ($stackerName) { - $this->partialStub('stackerName=' . $stackerName); + DebugMiddleware::getSelfInstance()->partialStub('stackerName=' . $stackerName); } /** @@ -89,7 +90,7 @@ class ???Stacker extends BaseStacker implements Stackable { * @throws EmptyStackerException If the named stacker is empty */ public function getNamed ($stackerName) { - $this->partialStub('stackerName=' . $stackerName); + DebugMiddleware::getSelfInstance()->partialStub('stackerName=' . $stackerName); } } diff --git a/framework/main/classes/stacker/file/class_ b/framework/main/classes/stacker/file/class_ index ec7961ca..091d7526 100644 --- a/framework/main/classes/stacker/file/class_ +++ b/framework/main/classes/stacker/file/class_ @@ -1,4 +1,7 @@ partialStub('stackerName=' . $stackerName . ',value[' . gettype($value) . ']=' . $value); + DebugMiddleware::getSelfInstance()->partialStub('stackerName=' . $stackerName . ',value[' . gettype($value) . ']=' . $value); } /** @@ -70,7 +73,7 @@ class ???FileStack extends BaseFileStack implements StackableFile, Registerable * @throws EmptyStackerException If the named stacker is empty */ public function popNamed ($stackerName) { - $this->partialStub('stackerName=' . $stackerName); + DebugMiddleware::getSelfInstance()->partialStub('stackerName=' . $stackerName); } /** @@ -82,7 +85,7 @@ class ???FileStack extends BaseFileStack implements StackableFile, Registerable * @throws EmptyStackerException If the named stacker is empty */ public function getNamed ($stackerName) { - $this->partialStub('stackerName=' . $stackerName); + DebugMiddleware::getSelfInstance()->partialStub('stackerName=' . $stackerName); } /** @@ -92,7 +95,7 @@ class ???FileStack extends BaseFileStack implements StackableFile, Registerable * @return void */ public function seek ($seekPosition) { - $this->partialStub('seekPosition=' . $seekPosition); + DebugMiddleware::getSelfInstance()->partialStub('seekPosition=' . $seekPosition); } /** @@ -101,7 +104,7 @@ class ???FileStack extends BaseFileStack implements StackableFile, Registerable * @return $size Size (in bytes) of file */ public function size () { - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); } } diff --git a/framework/main/classes/stacker/file/class_BaseFileStack.php b/framework/main/classes/stacker/file/class_BaseFileStack.php index 36973947..573403dd 100644 --- a/framework/main/classes/stacker/file/class_BaseFileStack.php +++ b/framework/main/classes/stacker/file/class_BaseFileStack.php @@ -9,6 +9,7 @@ use Org\Mxchange\CoreFramework\Filesystem\File\BaseBinaryFile; use Org\Mxchange\CoreFramework\Filesystem\File\BinaryFile; use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Stack\BaseStacker; use Org\Mxchange\CoreFramework\Traits\Index\IndexableTrait; use Org\Mxchange\CoreFramework\Traits\Iterator\IteratorTrait; @@ -364,7 +365,7 @@ abstract class BaseFileStack extends BaseStacker { } // Now get the last value - /* NOISY-DEBUG: */ $this->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); + /* NOISY-DEBUG: */ DebugMiddleware::getSelfInstance()->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); $value = NULL; // Return it @@ -392,7 +393,7 @@ abstract class BaseFileStack extends BaseStacker { } // Now get the first value - /* NOISY-DEBUG: */ $this->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); + /* NOISY-DEBUG: */ DebugMiddleware::getSelfInstance()->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); $value = NULL; // Return it @@ -420,7 +421,7 @@ abstract class BaseFileStack extends BaseStacker { } // Now, remove the last entry, we don't care about the return value here, see elseif() block above - /* NOISY-DEBUG: */ $this->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); + /* NOISY-DEBUG: */ DebugMiddleware::getSelfInstance()->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); return NULL; } @@ -444,7 +445,7 @@ abstract class BaseFileStack extends BaseStacker { } // Now, remove the last entry, we don't care about the return value here, see elseif() block above - /* NOISY-DEBUG: */ $this->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); + /* NOISY-DEBUG: */ DebugMiddleware::getSelfInstance()->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); return NULL; } @@ -464,7 +465,7 @@ abstract class BaseFileStack extends BaseStacker { } // @TODO Please implement this, returning false - /* NOISY-DEBUG: */ $this->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); + /* NOISY-DEBUG: */ DebugMiddleware::getSelfInstance()->partialStub('[' . __METHOD__ . ':' . __LINE__ . '] stackerName=' . $stackerName); $isFull = false; // Return result diff --git a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php index 7e5bb5f8..3c291361 100644 --- a/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php +++ b/framework/main/classes/stacker/file/fifo/class_FiFoFileStack.php @@ -5,6 +5,7 @@ namespace Org\Mxchange\CoreFramework\Stack\File; // Import framework stuff use Org\Mxchange\CoreFramework\Filesystem\Block\CalculatableBlock; use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Registry\Registerable; use Org\Mxchange\CoreFramework\Stack\File\BaseFileStack; use Org\Mxchange\CoreFramework\Stack\File\StackableFile; @@ -175,7 +176,7 @@ class FiFoFileStack extends BaseFileStack implements StackableFile, Calculatable } // @TODO Unfinished method or invoke inner iterator's method? - $this->partialStub('seekPosition=' . $seekPosition); + DebugMiddleware::getSelfInstance()->partialStub('seekPosition=' . $seekPosition); // Trace message /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput('FIFO-FILE-STACK: EXIT!'); diff --git a/framework/main/classes/tasks/class_ b/framework/main/classes/tasks/class_ index e06e577f..efce727e 100644 --- a/framework/main/classes/tasks/class_ +++ b/framework/main/classes/tasks/class_ @@ -3,6 +3,7 @@ namespace Tld\Domain\Project\Task\___; // Import framework stuff +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Task\BaseTask; use Org\Mxchange\CoreFramework\Task\Taskable; use Org\Mxchange\CoreFramework\Visitor\Visitable; @@ -73,7 +74,7 @@ class !!!???Task extends BaseTask implements Taskable, Visitable { * @todo 0% */ public function executeTask () { - $this->partialStub('Unimplemented task.'); + DebugMiddleware::getSelfInstance()->partialStub('Unimplemented task.'); } /** diff --git a/framework/main/classes/template/image/class_ImageTemplateEngine.php b/framework/main/classes/template/image/class_ImageTemplateEngine.php index 4faba021..e24d8cac 100644 --- a/framework/main/classes/template/image/class_ImageTemplateEngine.php +++ b/framework/main/classes/template/image/class_ImageTemplateEngine.php @@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Filesystem\InvalidDirectoryException; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Image\BaseImage; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Parser\Parseable; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -265,7 +266,7 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl } // Unfinished work! - $this->partialStub('Handling extra characters is not yet supported!'); + DebugMiddleware::getSelfInstance()->partialStub('Handling extra characters is not yet supported!'); } /** diff --git a/framework/main/middleware/debug/class_DebugMiddleware.php b/framework/main/middleware/debug/class_DebugMiddleware.php index d4ff279a..959c9272 100644 --- a/framework/main/middleware/debug/class_DebugMiddleware.php +++ b/framework/main/middleware/debug/class_DebugMiddleware.php @@ -268,6 +268,30 @@ class DebugMiddleware extends BaseMiddleware implements Registerable { //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__); } + /** + * Output a partial stub message for the caller method + * + * @param $message An optional message to display + * @return void + */ + public function partialStub (string $message = '') { + // Init variable + //* NOISY-DEBUG: */ printf('[%s:%d]: message=%s - CALLED!' . PHP_EOL, __METHOD__, __LINE__, $message); + $stubMessage = 'Partial stub!'; + + // Is an extra message given? + if (!empty($message)) { + // Then add it as well + $stubMessage .= ' Message: ' . $message; + } + + // Output stub message + $this->output($stubMessage); + + // Trace message + //* NOISY-DEBUG: */ printf('[%s:%d]: EXIT!' . PHP_EOL, __METHOD__, __LINE__); + } + /** * Outputs a debug message whether to debug instance (should be set!) or * dies with or ptints the message. Do NEVER EVER rewrite the exit() call to diff --git a/framework/main/middleware/io/class_FileIoHandler.php b/framework/main/middleware/io/class_FileIoHandler.php index 1f40fba8..7658aa0d 100644 --- a/framework/main/middleware/io/class_FileIoHandler.php +++ b/framework/main/middleware/io/class_FileIoHandler.php @@ -8,6 +8,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException; use Org\Mxchange\CoreFramework\Handler\Stream\IoHandler; use Org\Mxchange\CoreFramework\Middleware\BaseMiddleware; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Traits\Streamer\File\Input\FileInputStreamerTrait; use Org\Mxchange\CoreFramework\Traits\Streamer\File\Output\FileOutputStreamerTrait; @@ -169,7 +170,7 @@ class FileIoHandler extends BaseMiddleware implements IoHandler { public function determineSeekPosition () { // Trace message /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('FILE-IO-HANDLER: CALLED!'); - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); // Trace message /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('FILE-IO-HANDLER: EXIT!'); @@ -192,7 +193,7 @@ class FileIoHandler extends BaseMiddleware implements IoHandler { } // @TODO Unfinished work - $this->partialStub('offset=' . $offset . ',whence=' . $whence); + DebugMiddleware::getSelfInstance()->partialStub('offset=' . $offset . ',whence=' . $whence); // Trace message /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('FILE-IO-HANDLER: EXIT!'); @@ -209,7 +210,7 @@ class FileIoHandler extends BaseMiddleware implements IoHandler { /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('FILE-IO-HANDLER: CALLED!'); // @TODO: Unfinished method: - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); // Trace message /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('FILE-IO-HANDLER: EXIT!'); @@ -226,7 +227,7 @@ class FileIoHandler extends BaseMiddleware implements IoHandler { /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('FILE-IO-HANDLER: CALLED!'); // @TODO: Unfinished method: - $this->partialStub(); + DebugMiddleware::getSelfInstance()->partialStub(); // Trace message /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->traceMessage('FILE-IO-HANDLER: EXIT!'); diff --git a/framework/main/tests/filter/tests/class_Tests b/framework/main/tests/filter/tests/class_Tests index 3777af64..ed4ff6d5 100644 --- a/framework/main/tests/filter/tests/class_Tests +++ b/framework/main/tests/filter/tests/class_Tests @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Tests\Filter\!!!; // Import framework stuff use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; use Org\Mxchange\CoreFramework\Tests\Filter\BaseTestsFilter; @@ -64,7 +65,7 @@ class Tests???Filter extends BaseTestsFilter implements Filterable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Implement this! - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } } diff --git a/framework/main/tests/filter/tests/configuration/class_TestConfiguration b/framework/main/tests/filter/tests/configuration/class_TestConfiguration index 435416a5..f3205439 100644 --- a/framework/main/tests/filter/tests/configuration/class_TestConfiguration +++ b/framework/main/tests/filter/tests/configuration/class_TestConfiguration @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Tests\Filter\Configuration\!!!; // Import framework stuff use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; use Org\Mxchange\CoreFramework\Tests\Filter\BaseTestsFilter; @@ -64,7 +65,7 @@ class TestConfiguration???Filter extends BaseTestsFilter implements Filterable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Implement this! - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } } diff --git a/framework/main/tests/filter/tests/requirements/class_TestsPhpRequirementsFilter.php b/framework/main/tests/filter/tests/requirements/class_TestsPhpRequirementsFilter.php index f9cbdb87..f390e7f4 100644 --- a/framework/main/tests/filter/tests/requirements/class_TestsPhpRequirementsFilter.php +++ b/framework/main/tests/filter/tests/requirements/class_TestsPhpRequirementsFilter.php @@ -4,6 +4,7 @@ namespace Org\Mxchange\CoreFramework\Tests\Filter\Requirements; // Import framework stuff use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; use Org\Mxchange\CoreFramework\Tests\Filter\BaseTestsFilter; @@ -64,7 +65,7 @@ class TestsPhpRequirementsFilter extends BaseTestsFilter implements Filterable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Implement this! - $this->partialStub('Please implement this method.'); + DebugMiddleware::getSelfInstance()->partialStub('Please implement this method.'); } } -- 2.39.2