From: Roland Häder Date: Tue, 1 Dec 2020 22:21:21 +0000 (+0100) Subject: Continued: X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=28ff0710d8eb3a2d0c1547d6ebeaae05eb50c7f6 Continued: - moved $helperInstance and setter/getter to proper class - renamed extended to png Signed-off-by: Roland Häder --- diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php index d1f88883..4b481128 100644 --- a/framework/main/classes/class_BaseFrameworkSystem.php +++ b/framework/main/classes/class_BaseFrameworkSystem.php @@ -15,7 +15,6 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; use Org\Mxchange\CoreFramework\Generic\NullPointerException; use Org\Mxchange\CoreFramework\Generic\UnsupportedOperationException; use Org\Mxchange\CoreFramework\Handler\Handleable; -use Org\Mxchange\CoreFramework\Helper\Helper; use Org\Mxchange\CoreFramework\Loader\ClassLoader; use Org\Mxchange\CoreFramework\Manager\ManageableApplication; use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware; @@ -95,11 +94,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac */ private $iteratorInstance = NULL; - /** - * A helper instance for the form - */ - private $helperInstance = NULL; - /** * An instance of a InputStream class */ @@ -566,25 +560,6 @@ abstract class BaseFrameworkSystem extends stdClass implements FrameworkInterfac return $this->wrapperInstance; } - /** - * Setter for helper instance - * - * @param $helperInstance An instance of a helper class - * @return void - */ - protected final function setHelperInstance (Helper $helperInstance) { - $this->helperInstance = $helperInstance; - } - - /** - * Getter for helper instance - * - * @return $helperInstance An instance of a helper class - */ - public final function getHelperInstance () { - return $this->helperInstance; - } - /** * Getter for a InputStream instance * diff --git a/framework/main/classes/helper/captcha/class_BaseCaptcha.php b/framework/main/classes/helper/captcha/class_BaseCaptcha.php index 8005d064..b31ddf31 100644 --- a/framework/main/classes/helper/captcha/class_BaseCaptcha.php +++ b/framework/main/classes/helper/captcha/class_BaseCaptcha.php @@ -7,6 +7,7 @@ use Org\Mxchange\CoreFramework\Crypto\RandomNumber\RandomNumberGenerator; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; use Org\Mxchange\CoreFramework\Helper\BaseHelper; +use Org\Mxchange\CoreFramework\Helper\Helper; /** * A general captcha @@ -36,6 +37,11 @@ abstract class BaseCaptcha extends BaseHelper { */ private $rngInstance = NULL; + /** + * A helper instance for the form + */ + private $helperInstance = NULL; + /** * Protected constructor * @@ -66,6 +72,25 @@ abstract class BaseCaptcha extends BaseHelper { return $this->rngInstance; } + /** + * Setter for helper instance + * + * @param $helperInstance An instance of a helper class + * @return void + */ + protected final function setHelperInstance (Helper $helperInstance) { + $this->helperInstance = $helperInstance; + } + + /** + * Getter for helper instance + * + * @return $helperInstance An instance of a helper class + */ + public final function getHelperInstance () { + return $this->helperInstance; + } + /** * Initializes the random number generator (RNG) * diff --git a/framework/main/classes/images/extended/class_PngImage.php b/framework/main/classes/images/extended/class_PngImage.php deleted file mode 100644 index c8b46aab..00000000 --- a/framework/main/classes/images/extended/class_PngImage.php +++ /dev/null @@ -1,91 +0,0 @@ - - * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team - * @license GNU GPL 3.0 or any newer version - * @link http://www.shipsimu.org - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -class PngImage extends BaseImage { - /** - * Protected constructor - * - * @return void - */ - protected function __construct () { - // Call parent constructor - parent::__construct(__CLASS__); - } - - /** - * Creates an instance of this image class - * - * @param $templateInstance A template instance - * @return $imageInstance An instance of this image class - */ - public static final function createPngImage(CompileableTemplate $templateInstance) { - // Get a new instance - $imageInstance = new PngImage(); - - // Set template instance - $imageInstance->setTemplateInstance($templateInstance); - - // Set image type - $imageInstance->setImageType('png'); - - // Return the instance - return $imageInstance; - } - - /** - * Finish this image by producing it - * - * @return void - * @todo Rewrite this to SplFileInfo/Object - */ - public function finishImage () { - $this->partialStub('Unfinished method.'); - return; - - // Call parent method - parent::finishImage(); - - // Get a file name for our image - $cacheFile = $this->getTemplateInstance()->getImageCacheFile(); - - // Does it exist? - if (FrameworkBootstrap::isReadableFile($cacheFile)) { - // Remove it - unlink($cacheFile->getPathname()); - } // END - if - - // Finish the image and send it to a cache file - imagepng($this->getImageResource(), $cacheFile->getPathname(), 9, PNG_ALL_FILTERS); - } - -} diff --git a/framework/main/classes/images/png/class_PngImage.php b/framework/main/classes/images/png/class_PngImage.php new file mode 100644 index 00000000..c8b46aab --- /dev/null +++ b/framework/main/classes/images/png/class_PngImage.php @@ -0,0 +1,91 @@ + + * @version 0.0.0 + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team + * @license GNU GPL 3.0 or any newer version + * @link http://www.shipsimu.org + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +class PngImage extends BaseImage { + /** + * Protected constructor + * + * @return void + */ + protected function __construct () { + // Call parent constructor + parent::__construct(__CLASS__); + } + + /** + * Creates an instance of this image class + * + * @param $templateInstance A template instance + * @return $imageInstance An instance of this image class + */ + public static final function createPngImage(CompileableTemplate $templateInstance) { + // Get a new instance + $imageInstance = new PngImage(); + + // Set template instance + $imageInstance->setTemplateInstance($templateInstance); + + // Set image type + $imageInstance->setImageType('png'); + + // Return the instance + return $imageInstance; + } + + /** + * Finish this image by producing it + * + * @return void + * @todo Rewrite this to SplFileInfo/Object + */ + public function finishImage () { + $this->partialStub('Unfinished method.'); + return; + + // Call parent method + parent::finishImage(); + + // Get a file name for our image + $cacheFile = $this->getTemplateInstance()->getImageCacheFile(); + + // Does it exist? + if (FrameworkBootstrap::isReadableFile($cacheFile)) { + // Remove it + unlink($cacheFile->getPathname()); + } // END - if + + // Finish the image and send it to a cache file + imagepng($this->getImageResource(), $cacheFile->getPathname(), 9, PNG_ALL_FILTERS); + } + +}