add 7.1.0.0 sourceGuardian PHP 8

Application/Model/Encoding/d3decoder.php

@@ -17,6 +17,8 @@
 
 namespace D3\ModCfg\Application\Model\Encoding;
 
+use JsonException;
+
 class d3decoder
 {
     public const DEC_DEFAULT   = 'default';
@@ -30,169 +32,174 @@ class d3decoder
     public const DEC_UUENC     = 'uuencode';
     public const DEC_QUOTED    = 'quoted';
 
-    protected $_aDecodingMethods = [
-        'default'   => 'decodeDefault',
-        'json'      => 'decodeJson',
-        'utf-8'     => 'decodeUtf8',
-        'gzip'      => 'decodeGZip',
-        'serialize' => 'decodeSerialize',
-        'rawurl'    => 'decodeRawUrl',
-        'url'       => 'decodeUrl',
-        'base64'    => 'decodeBase64',
-        'uuencode'  => 'decodeUUEncode',
-        'quoted'    => 'decodeQuotedPrintable',
-    ];
-
     /**
      * @param string $_sDecodingType
      */
-    public function __construct(protected $_sDecodingType)
+    public function __construct(protected string $_sDecodingType = self::DEC_DEFAULT)
     {
     }
 
     /**
      * @return string
      */
-    public function getDecodingType()
+    public function getDecodingType(): string
     {
         return $this->_sDecodingType;
     }
 
     /**
-     * @return string
+     * @param string|null $encodedValue
+     *
+     * @return mixed
+     * @throws JsonException
      */
-    public function getDecodingMethodName()
+    public function decode(?string $encodedValue): mixed
     {
-        $sType = strtolower($this->getDecodingType());
-
-        if (is_array($this->_aDecodingMethods)
-            && count($this->_aDecodingMethods)
-            && isset($this->_aDecodingMethods[$sType])
-        ) {
-            return $this->_aDecodingMethods[strtolower($this->getDecodingType())];
-        }
-
-        return $this->_aDecodingMethods['default'];
+        return match (strtolower($this->getDecodingType())) {
+            self::DEC_JSON      => $this->decodeJson($encodedValue),
+            self::DEC_UTF8      => $this->decodeUtf8($encodedValue),
+            self::DEC_GZIP      => $this->decodeGZip($encodedValue),
+            self::DEC_SERIALIZE => $this->decodeSerialize($encodedValue),
+            self::DEC_RAWURL    => $this->decodeRawUrl($encodedValue),
+            self::DEC_URL       => $this->decodeUrl($encodedValue),
+            self::DEC_BASE64    => $this->decodeBase64($encodedValue),
+            self::DEC_UUENC     => $this->decodeUUEncode($encodedValue),
+            self::DEC_QUOTED    => $this->decodeQuotedPrintable($encodedValue),
+            default             => $this->decodeDefault($encodedValue)
+        };
     }
 
     /**
-     * @param $mValue
+     * @param string|null $encodedValue
      *
-     * @return string
+     * @return mixed
      */
-    public function decode($mValue)
+    public function decodeDefault(?string $encodedValue): mixed
     {
-        $mRet = call_user_func([$this, $this->getDecodingMethodName()], $mValue);
-
-        return $mRet;
+        return unserialize(
+            rawurldecode(
+                base64_decode($encodedValue ?? '')
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
-     * @return string
+     * @return mixed
+     * @throws JsonException
      */
-    public function decodeDefault($mValue)
+    public function decodeJson(?string $encodedValue): mixed
     {
-        return unserialize(rawurldecode(base64_decode($mValue)));
+        return json_decode(
+            html_entity_decode($encodedValue ?? '', ENT_QUOTES),
+            null,
+            512,
+            JSON_THROW_ON_ERROR
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
-     * @return string
+     * @return mixed
      */
-    public function decodeJson($mValue)
+    public function decodeUtf8(?string $encodedValue): mixed
     {
-        $mValue = html_entity_decode($mValue, ENT_QUOTES);
-        return json_decode($mValue, null, 512, JSON_THROW_ON_ERROR);
+        return unserialize(
+            utf8_decode(
+                html_entity_decode($encodedValue ?? '', ENT_QUOTES)
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
-     * @return string
+     * @return mixed
      */
-    public function decodeUtf8($mValue)
+    public function decodeSerialize(?string $encodedValue): mixed
     {
-        $mValue = html_entity_decode($mValue, ENT_QUOTES);
-        return unserialize(utf8_decode($mValue));
+        return unserialize(
+            html_entity_decode($encodedValue ?? '', ENT_QUOTES)
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
-     * @return string
+     * @return mixed
      */
-    public function decodeSerialize($mValue)
+    public function decodeUrl(?string $encodedValue): mixed
     {
-        $mValue = html_entity_decode($mValue, ENT_QUOTES);
-        return unserialize($mValue);
+        return unserialize(
+            urldecode($encodedValue ?? '')
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
-     * @return string
+     * @return mixed
      */
-    public function decodeUrl($mValue)
+    public function decodeRawUrl(?string $encodedValue): mixed
     {
-        return unserialize(urldecode($mValue));
+        return unserialize(
+            rawurldecode($encodedValue ?? '')
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
      * @return string
      */
-    public function decodeRawUrl($mValue)
+    public function decodeBase64(?string $encodedValue): mixed
     {
-        return unserialize(rawurldecode($mValue));
+        return unserialize(
+            base64_decode($encodedValue ?? '')
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
-     * @return string
+     * @return mixed
      */
-    public function decodeBase64($mValue)
+    public function decodeGZip(?string $encodedValue): mixed
     {
-        return unserialize(base64_decode($mValue));
+        return unserialize(
+            gzdecode(
+                html_entity_decode($encodedValue ?? '', ENT_QUOTES)
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
-     * @return string|null
+     * @return mixed
      */
-    public function decodeGZip($mValue)
+    public function decodeUUEncode(?string $encodedValue): mixed
     {
-        if (false == $mValue || $mValue == '') {
-            return null;
-        }
-        $mValue = html_entity_decode($mValue, ENT_QUOTES);
-        return unserialize(gzdecode($mValue));
+        return unserialize(
+            convert_uudecode(
+                html_entity_decode($encodedValue ?? '', ENT_QUOTES)
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param string|null $encodedValue
      *
-     * @return string
+     * @return mixed
      */
-    public function decodeUUEncode($mValue)
+    public function decodeQuotedPrintable(?string $encodedValue): mixed
     {
-        $mValue = html_entity_decode($mValue, ENT_QUOTES);
-        return unserialize(convert_uudecode($mValue));
-    }
-
-    /**
-     * @param mixed $mValue
-     *
-     * @return string
-     */
-    public function decodeQuotedPrintable($mValue)
-    {
-        $mValue = html_entity_decode($mValue, ENT_QUOTES);
-        return unserialize(quoted_printable_decode($mValue));
+        return unserialize(
+            quoted_printable_decode(
+                html_entity_decode($encodedValue ?? '', ENT_QUOTES)
+            )
+        );
     }
 }

Application/Model/Encoding/d3encoder.php

@@ -17,6 +17,8 @@
 
 namespace D3\ModCfg\Application\Model\Encoding;
 
+use JsonException;
+
 class d3encoder
 {
     public const ENC_DEFAULT   = 'default';
@@ -30,160 +32,177 @@ class d3encoder
     public const ENC_UUENC     = 'uuencode';
     public const ENC_QUOTED    = 'quoted';
 
-    protected $_aEncodingMethods = [
-        'default'   => 'encodeDefault',
-        'json'      => 'encodeJson',
-        'utf-8'     => 'encodeUtf8',
-        'gzip'      => 'encodeGZip',
-        'serialize' => 'encodeSerialize',
-        'rawurl'    => 'encodeRawUrl',
-        'url'       => 'encodeUrl',
-        'base64'    => 'encodeBase64',
-        'uuencode'  => 'encodeUUEncode',
-        'quoted'    => 'encodeQuotedPrintable',
-    ];
-
     /**
      * @param string $_sEncodingType
      */
-    public function __construct(protected $_sEncodingType)
+    public function __construct(protected string $_sEncodingType = self::ENC_DEFAULT)
     {
     }
 
     /**
      * @return string
      */
-    public function getEncodingType()
+    public function getEncodingType(): string
     {
         return $this->_sEncodingType;
     }
 
     /**
+     * @param mixed $decodedValue
+     *
      * @return string
+     * @throws JsonException
      */
-    public function getEncodingMethodName()
+    public function encode( mixed $decodedValue): string
     {
-        $sType = strtolower($this->getEncodingType());
-
-        if (is_array($this->_aEncodingMethods)
-            && count($this->_aEncodingMethods)
-            && isset($this->_aEncodingMethods[$sType])
-        ) {
-            return $this->_aEncodingMethods[strtolower($this->getEncodingType())];
-        }
-
-        return $this->_aEncodingMethods['default'];
+        return match (strtolower($this->getEncodingType())) {
+            self::ENC_JSON      => $this->encodeJson($decodedValue),
+            self::ENC_UTF8      => $this->encodeUtf8($decodedValue),
+            self::ENC_GZIP      => $this->encodeGZip($decodedValue),
+            self::ENC_SERIALIZE => $this->encodeSerialize($decodedValue),
+            self::ENC_RAWURL    => $this->encodeRawUrl($decodedValue),
+            self::ENC_URL       => $this->encodeUrl($decodedValue),
+            self::ENC_BASE64    => $this->encodeBase64($decodedValue),
+            self::ENC_UUENC     => $this->encodeUUEncode($decodedValue),
+            self::ENC_QUOTED    => $this->encodeQuotedPrintable($decodedValue),
+            default             => $this->encodeDefault($decodedValue)
+        };
     }
 
     /**
-     * @param $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encode($mValue)
+    public function encodeDefault( mixed $decodedValue): string
     {
-        $mRet = call_user_func([$this, $this->getEncodingMethodName()], $mValue);
-
-        return $mRet;
+        return base64_encode(
+            rawurlencode(
+                serialize(
+                    $decodedValue
+                )
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
+     * @throws JsonException
      */
-    public function encodeDefault($mValue)
+    public function encodeJson( mixed $decodedValue): string
     {
-        return base64_encode(rawurlencode(serialize($mValue)));
+        return json_encode($decodedValue, JSON_THROW_ON_ERROR);
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encodeJson($mValue)
+    public function encodeUtf8( mixed $decodedValue): string
     {
-        return json_encode($mValue, JSON_THROW_ON_ERROR);
+        return utf8_encode(
+            serialize(
+                $decodedValue
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encodeUtf8($mValue)
+    public function encodeSerialize( mixed $decodedValue): string
     {
-        return utf8_encode(serialize($mValue));
+        return serialize(
+            $decodedValue
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encodeSerialize($mValue)
+    public function encodeUrl( mixed $decodedValue): string
     {
-        return serialize($mValue);
+        return urlencode(
+            serialize(
+                $decodedValue
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encodeUrl($mValue)
+    public function encodeRawUrl( mixed $decodedValue): string
     {
-        return urlencode(serialize($mValue));
+        return rawurlencode(
+            serialize(
+                $decodedValue
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encodeRawUrl($mValue)
+    public function encodeBase64( mixed $decodedValue): string
     {
-        return rawurlencode(serialize($mValue));
+        return base64_encode(
+            serialize(
+                $decodedValue
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encodeBase64($mValue)
+    public function encodeGZip( mixed $decodedValue): string
     {
-        return base64_encode(serialize($mValue));
+        return gzencode(
+            serialize(
+                $decodedValue
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encodeGZip($mValue)
+    public function encodeUUEncode( mixed $decodedValue): string
     {
-        return gzencode(serialize($mValue));
+        return convert_uuencode(
+            serialize(
+                $decodedValue
+            )
+        );
     }
 
     /**
-     * @param mixed $mValue
+     * @param mixed $decodedValue
      *
      * @return string
      */
-    public function encodeUUEncode($mValue)
+    public function encodeQuotedPrintable( mixed $decodedValue): string
     {
-        return convert_uuencode(serialize($mValue));
-    }
-
-    /**
-     * @param mixed $mValue
-     *
-     * @return string
-     */
-    public function encodeQuotedPrintable($mValue)
-    {
-        return quoted_printable_encode(serialize($mValue));
+        return quoted_printable_encode(
+            serialize(
+                $decodedValue
+            )
+        );
     }
 }

Application/Model/Exception/d3_cfg_mod_exception.php

@@ -15,6 +15,8 @@
 
 namespace D3\ModCfg\Application\Model\Exception;
 
+use DateTimeImmutable;
+
 /**
  * handle d3_cfg_mod specific exceptions
  */
@@ -27,9 +29,8 @@ class d3_cfg_mod_exception extends d3modprofile_exception
      */
     public function getString()
     {
-        $sStr = self::class . " (time: " . date(
-            'Y-m-d H:i:s'
-        ) . "): [{$this->code}]: {$this->message} ";
+        $sStr = self::class . " (time: " . (new DateTimeImmutable())->format('Y-m-d H:i:s')
+            . "): [{$this->code}]: {$this->message} ";
 
         if ($this->getCompareData()) {
             $sStr .= "(".$this->getCompareData().") ";

Application/Model/Exception/d3modprofile_exception.php

@@ -14,6 +14,7 @@
 
 namespace D3\ModCfg\Application\Model\Exception;
 
+use DateTimeImmutable;
 use Exception;
 use OxidEsales\Eshop\Core\Exception\StandardException;
 use OxidEsales\Eshop\Core\Registry;
@@ -33,9 +34,8 @@ class d3modprofile_exception extends StandardException
      */
     public function getString()
     {
-        return self::class . " (time: " . date(
-            'Y-m-d H:i:s'
-        ) . "): [{$this->code}]: {$this->message} - Faulty ModProfile: " . $this->getModCfgId();
+        return self::class . " (time: " . (new DateTimeImmutable())->format('Y-m-d H:i:s')
+            . "): [{$this->code}]: {$this->message} - Faulty ModProfile: " . $this->getModCfgId();
         //." \n Stack Trace: {$this->getTraceAsString()}\n\n";
     }
 

Application/Model/Log/d3NullLogger.php

@@ -17,9 +17,10 @@
 
 namespace D3\ModCfg\Application\Model\Log;
 
+use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerTrait;
 
-class d3NullLogger implements d3LogInterface
+class d3NullLogger implements d3LogInterface, LoggerInterface
 {
     use LoggerTrait;
 

Application/Model/Log/d3log.php

@@ -24,6 +24,7 @@ use D3\ModCfg\Application\Model\Parametercontainer\Registry as D3ModCfgRegistry;
 use D3\ModCfg\Application\Model\Exception\d3ShopCompatibilityAdapterException;
 use D3\ModCfg\Application\Model\Exception\d3_cfg_mod_exception;
 use D3\ModCfg\Modules\Application\Controller\d3_oxshopcontrol_modcfg_extension;
+use DateTimeImmutable;
 use Doctrine\DBAL\Connection;
 use Doctrine\DBAL\Driver\Exception as DBALDriverException;
 use Doctrine\DBAL\Query\QueryBuilder;
@@ -44,9 +45,10 @@ use OxidEsales\EshopCommunity\Internal\Framework\Database\ConnectionProviderInte
 use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
+use Psr\Log\LoggerInterface;
 use Psr\Log\LoggerTrait;
 
-class d3log extends BaseModel implements d3LogInterface
+class d3log extends BaseModel implements d3LogInterface, LoggerInterface
 {
     use LoggerTrait;
 
@@ -419,7 +421,7 @@ class d3log extends BaseModel implements d3LogInterface
                     'oxshopid'    => Registry::getConfig()->getShopId(),
                     'oxsessid'    => $sSessID,
                     'oxlogtype'   => strtolower($this->getErrorModeName($iLogType)),
-                    'oxtime'      => date('Y-m-d H:i:s'),
+                    'oxtime'      => (new DateTimeImmutable())->format('Y-m-d H:i:s'),
                     'oxmodid'     => $sModID,
                     'oxprofileid' => $this->d3getProfileId() ?: 'none',
                     'oxclass'     => $sClass,
@@ -1043,7 +1045,9 @@ class d3log extends BaseModel implements d3LogInterface
         $db = ContainerFactory::getInstance()->getContainer()->get(ConnectionProviderInterface::class)->get();
 
         $sWhere = $this->getLogSet()->getValue('sLog_messagetimestamp' . $iSlot) ? "oxtime > " . $db->quote(
-            date('Y-m-d H:i:s', $this->getLogSet()->getValue('sLog_messagetimestamp' . $iSlot))
+            (new DateTimeImmutable())
+                ->setTimestamp($this->getLogSet()->getValue('sLog_messagetimestamp' . $iSlot))
+                ->format('Y-m-d H:i:s')
         ) . " " : '1 ';
 
         $aLevelFilter = [];
@@ -1578,7 +1582,7 @@ class d3log extends BaseModel implements d3LogInterface
 
         $sTime = Registry::get(Request::class)->getRequestEscapedParameter('export_oxtime');
         if ($sTime) {
-            $aWhere['oxtime'] = date('Y-m-d H:i:s', strtotime($sTime));
+            $aWhere['oxtime'] = (new DateTimeImmutable($sTime))->format('Y-m-d H:i:s');
             Registry::getConfig()->getActiveView()->addTplParam('oxtime', $sTime);
         }
 

Application/Model/Maintenance/d3clrtmp.php

@@ -488,10 +488,6 @@ class d3clrtmp extends Base
         if (false == is_object($this->_d3GetSet()) || false == $this->_d3GetSet()->getValue('blClrTmp_showcleartmpoptions')) {
             $this->_getFileSystemHandler()->setDevMode(false);
 
-            if ($this->_iLimit) {
-                $this->_getFileSystemHandler()->setLimit($this->_iLimit, $this->_iLimitTimeStamp);
-            }
-
             if (is_object($this->_d3GetSet()) && $this->_d3GetSet()->getValue('blClrTmp_nofolderremove')) {
                 $blRecursive = false;
             }