Continued:

[core.git] / framework / main / classes / response / image / class_ImageResponse.php

diff --git a/framework/main/classes/response/image/class_ImageResponse.php b/framework/main/classes/response/image/class_ImageResponse.php
index 5354c0ecb54bbb6ad4c06202668661236c5b1e4a..783c84894f77d6cbcaa2c5f0f8267865e7274ea5 100644 (file)
--- a/framework/main/classes/response/image/class_ImageResponse.php
+++ b/framework/main/classes/response/image/class_ImageResponse.php
@@ -4,9 +4,10 @@ namespace Org\Mxchange\CoreFramework\Response;
 
 // Import framework stuff
 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\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Middleware\Debug\DebugMiddleware;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
@@ -14,7 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *
@@ -45,7 +46,7 @@ class ImageResponse extends BaseResponse implements Responseable {
         *
         * @return      void
         */
-       protected function __construct () {
+       private function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
 
@@ -95,7 +96,6 @@ class ImageResponse extends BaseResponse implements Responseable {
         * @return      void
         * @throws      ResponseHeadersAlreadySentException             If headers are already sent
         * @todo        Encryption of cookie data not yet supported.
-        * @todo        Why are these parameters conflicting?
         * @todo        If the return statement is removed and setcookie() commented out,
         * @todo        this will send only one cookie out, the first one.
         */
@@ -109,7 +109,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
@@ -118,7 +118,7 @@ class ImageResponse extends BaseResponse implements Responseable {
                // Get all config entries
                if (is_null($expires)) {
                        $expires = (time() + FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_expire'));
-               } // END - if
+               }
 
                $path = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_path');
                $domain = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('cookie_domain');
@@ -144,15 +144,15 @@ class ImageResponse extends BaseResponse implements Responseable {
         * @return      void
         * @throws      ResponseHeadersAlreadySentException             If headers are already sent
         */
-       public function redirectToConfiguredUrl ($configEntry) {
+       public function redirectToConfiguredUrl (string $configEntry) {
                // Get application instance
-               $applicationInstance = GenericRegistry::getRegistry()->getInstance('application');
+               $applicationInstance = ApplicationHelper::getSelfInstance();
 
                // Is the header not yet sent?
                if (headers_sent()) {
                        // Throw an exception here
                        throw new ResponseHeadersAlreadySentException($this, self::EXCEPTION_HEADERS_ALREADY_SENT);
-               } // END - if
+               }
 
                // Assign application data
                $this->getTemplateInstance()->assignApplicationData($applicationInstance);
@@ -170,7 +170,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 
                        // No, then extend it with our base URL
                        $url = FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('base_url') . '/' . $url;
-               } // END - if
+               }
 
                // Add redirect header
                $this->addHeader('Location', str_replace('&amp;', '&', $url));
@@ -195,7 +195,7 @@ class ImageResponse extends BaseResponse implements Responseable {
         *                                      already sent with an exception
         * @return      void
         */
-       public function flushBuffer ($force = false) {
+       public function flushBuffer (bool $force = false) {
                // Finish the image
                $this->getImageInstance()->finishImage();
 
@@ -218,7 +218,7 @@ class ImageResponse extends BaseResponse implements Responseable {
         * @param       $cookieName             Cookie to expire
         * @return      void
         */
-       public function expireCookie ($cookieName) {
+       public function expireCookie (string $cookieName) {
                // Is the cookie there?
                if (isset($_COOKIE[$cookieName])) {
                        // Then expire it with 20 minutes past
@@ -226,7 +226,7 @@ class ImageResponse extends BaseResponse implements Responseable {
 
                        // Remove it from array
                        unset($_COOKIE[$cookieName]);
-               } // END - if
+               }
        }
 
        /**
@@ -235,12 +235,12 @@ class ImageResponse extends BaseResponse implements Responseable {
         * @param       $cookieName             Cookie to refresh
         * @return      void
         */
-       public function refreshCookie ($cookieName) {
+       public function refreshCookie (string $cookieName) {
                // Only update existing cookies
                if (isset($_COOKIE[$cookieName])) {
                        // Update the cookie
                        $this->addCookie($cookieName, $_COOKIE[$cookieName], false);
-               } // END - if
+               }
        }
 
 }