diff --git a/source/Core/Config.php b/source/Core/Config.php index 68435dc1e5..6f54fbc699 100644 --- a/source/Core/Config.php +++ b/source/Core/Config.php @@ -90,6 +90,8 @@ class Config extends \OxidEsales\Eshop\Core\Base * Shops install directory * * @var string + * + * @deprecated will be removed in next major, use environment variables instead */ protected $sShopDir = null; @@ -97,6 +99,8 @@ class Config extends \OxidEsales\Eshop\Core\Base * Shops compile directory * * @var string + * + * @deprecated will be removed in next major, use environment variables instead */ protected $sCompileDir = null; @@ -867,6 +871,8 @@ public function getShopUrl($lang = null, $admin = null) /** * Returns config sSSLShopURL or sMallSSLShopURL if secondary shop * + * @deprecated since v8.0 use getShopUrl instead + * * @param int $lang language (default is null) * * @return string diff --git a/source/Core/Exception/ExceptionHandler.php b/source/Core/Exception/ExceptionHandler.php index 9455cc7391..2bb562d723 100644 --- a/source/Core/Exception/ExceptionHandler.php +++ b/source/Core/Exception/ExceptionHandler.php @@ -68,11 +68,7 @@ public function handleUncaughtException(\Throwable $exception) } /** - * Report the exception and in case that iDebug is not set, redirect to maintenance page. - * Special methods are used here as the normal exception handling routines always need a database connection and - * this would create a loop. - * - * @param \OxidEsales\Eshop\Core\Exception\DatabaseException $exception Exception to handle + * @deprecated method will be removed in next major, use handleUncaughtException directly */ public function handleDatabaseException(\OxidEsales\Eshop\Core\Exception\DatabaseException $exception) { @@ -81,7 +77,7 @@ public function handleDatabaseException(\OxidEsales\Eshop\Core\Exception\Databas /** - * Exit the application with error status 1 + * @deprecated method will be removed in next major, use PHP function directly */ protected function exitApplication() { diff --git a/source/Core/ShopControl.php b/source/Core/ShopControl.php index a1dfcd373a..9fb0da084b 100644 --- a/source/Core/ShopControl.php +++ b/source/Core/ShopControl.php @@ -666,6 +666,8 @@ protected function handleCookieException($exception) } /** + * @deprecated will be removed in next major, standard execution handling will be used. + * * Handle database exceptions * There is still space for improving this as a similar exception handling for database exceptions may be done in * \OxidEsales\EshopCommunity\Core\Config::init() and the current method may not be executed @@ -732,6 +734,8 @@ protected function logException(\Exception $exception) } /** + * @deprecated will be removed in next major, standard execution handling will be used. + * * Notify the shop owner about database connection problems. * * This method forms part of the exception handling process. Any further exceptions must be caught. @@ -757,6 +761,8 @@ protected function reportDatabaseConnectionException(DatabaseConnectionException } /** + * @deprecated will be removed in next major, standard execution handling will be used. + * * Return true, if a message was already sent within a given threshold. * * This method forms part of the exception handling process. Any further exceptions must be caught. @@ -781,6 +787,8 @@ protected function messageWasSentWithinThreshold() } /** + * @deprecated will be removed in next major, standard execution handling will be used. + * * Send an offline warning to the shop owner. * Currently an email is sent to the email address configured as 'sAdminEmail' in the eShop config file. * diff --git a/source/Core/ViewConfig.php b/source/Core/ViewConfig.php index 5490e5da43..3dec49c681 100644 --- a/source/Core/ViewConfig.php +++ b/source/Core/ViewConfig.php @@ -1097,6 +1097,8 @@ public function getBasketTimeLeft() * true if blocks javascript code be enabled in templates * * @return bool + * + * @deprecated function will be removed in next major version */ public function isTplBlocksDebugMode() { diff --git a/source/Internal/Framework/Database/ConnectionFactory.php b/source/Internal/Framework/Database/ConnectionFactory.php new file mode 100644 index 0000000000..c7cae2389d --- /dev/null +++ b/source/Internal/Framework/Database/ConnectionFactory.php @@ -0,0 +1,21 @@ +getPublicConnection(); + } +} diff --git a/source/Internal/Framework/Database/ConnectionFactoryInterface.php b/source/Internal/Framework/Database/ConnectionFactoryInterface.php new file mode 100644 index 0000000000..e439be9d3b --- /dev/null +++ b/source/Internal/Framework/Database/ConnectionFactoryInterface.php @@ -0,0 +1,15 @@ +OXID Online Shop - Alles rund um das Thema Wassersport, Sportbekleidung und Mode ', 'standard footer', '
OXID Online Shop - All about watersports, sportswear and fashion
', 1, '', '', 1, '', '', '30e44ab83fdee7564.23264141', '', ''), diff --git a/source/Internal/Transition/Utility/BasicContextInterface.php b/source/Internal/Transition/Utility/BasicContextInterface.php index 2e05a1db30..473b32bcbf 100644 --- a/source/Internal/Transition/Utility/BasicContextInterface.php +++ b/source/Internal/Transition/Utility/BasicContextInterface.php @@ -24,10 +24,13 @@ public function getContainerCacheFilePath(int $shopId): string; public function getGeneratedServicesFilePath(): string; /** - * @return string + * @deprecated functionality will be superseded, method will be removed in next major */ public function getConfigurableServicesFilePath(): string; + /** + * @deprecated functionality will be superseded, method will be removed in next major + */ public function getShopConfigurableServicesFilePath(int $shopId): string; /** @@ -92,7 +95,7 @@ public function getProjectConfigurationDirectory(): string; public function getShopConfigurationDirectory(int $shopId): string; /** - * @return string + * @deprecated method will be removed in next major, use getProjectConfigurationDirectory() instead */ public function getConfigurationDirectoryPath(): string; diff --git a/source/Internal/Transition/Utility/ContextInterface.php b/source/Internal/Transition/Utility/ContextInterface.php index 0c4609981c..70b019402d 100644 --- a/source/Internal/Transition/Utility/ContextInterface.php +++ b/source/Internal/Transition/Utility/ContextInterface.php @@ -31,6 +31,8 @@ public function getLogFilePath(): string; public function getRequiredContactFormFields(): array; /** + * @deprecated method will be removed in next major version + * * @return bool */ public function isEnabledAdminQueryLog(): bool; diff --git a/source/oxfunctions.php b/source/oxfunctions.php index 8d4e721965..ba7b1782c0 100644 --- a/source/oxfunctions.php +++ b/source/oxfunctions.php @@ -27,6 +27,7 @@ function isAdmin() * * @param int $iErrorNr error number * @param string $sErrorText error message + * @deprecated function will be removed in next major */ function warningHandler($iErrorNr, $sErrorText) { @@ -39,6 +40,7 @@ function warningHandler($iErrorNr, $sErrorText) * * @param mixed $mVar variable * @param bool $blToFile marker to write log info to file (must be true to log) + * @deprecated function will be removed in next major */ function dumpVar($mVar, $blToFile = false) { @@ -59,6 +61,7 @@ function dumpVar($mVar, $blToFile = false) * prints anything given into a file, for debugging * * @param mixed $mVar variable to debug + * @deprecated function will be removed in next major */ function debug($mVar) { diff --git a/tests/Integration/Legacy/Core/InputValidatorTest.php b/tests/Integration/Legacy/Core/InputValidatorTest.php index 1727057e96..4dd65ef86b 100644 --- a/tests/Integration/Legacy/Core/InputValidatorTest.php +++ b/tests/Integration/Legacy/Core/InputValidatorTest.php @@ -34,8 +34,8 @@ public function testValidatePaymentInputDataWithCorrectBankCode(): void { $testValues = [ 'lsbankname' => 'Bank name', - 'lsblz' => '12345678', - 'lsktonr' => '123456', + 'lsblz' => 'DEDEDEFF', + 'lsktonr' => 'DE55200800000770876200', 'lsktoinhaber' => 'Hans Mustermann', ];