diff --git a/Classes/Api/PaymentApi.php b/Classes/Api/PaymentApi.php index 0e4e591..6011f38 100644 --- a/Classes/Api/PaymentApi.php +++ b/Classes/Api/PaymentApi.php @@ -54,7 +54,7 @@ static public function getTransactorConf ($gatewayExtensionKey, $key = '') $transactorConf = []; $result = ''; - $transactorConf = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( + $transactorConf = GeneralUtility::makeInstance( \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class )->get($gatewayExtensionKey); @@ -84,7 +84,7 @@ static public function getConf ( ) { $result = []; - $result = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( + $result = GeneralUtility::makeInstance( \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class )->get('transactor'); @@ -92,7 +92,7 @@ static public function getConf ( $extensionKey != '' && isset($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][$extensionKey]) ) { - $extManagerConf = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( + $extManagerConf = GeneralUtility::makeInstance( \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class )->get($extensionKey); } diff --git a/Classes/Domain/GatewayProxy.php b/Classes/Domain/GatewayProxy.php index aad4acf..e9238c4 100644 --- a/Classes/Domain/GatewayProxy.php +++ b/Classes/Domain/GatewayProxy.php @@ -26,8 +26,8 @@ * This copyright notice MUST APPEAR in all copies of the script! ***************************************************************/ -use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\ExtensionManagementUtility; +use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer; use JambageCom\Transactor\Domain\Gateway; @@ -61,11 +61,11 @@ class GatewayProxy implements \JambageCom\Transactor\Domain\GatewayInterface public function init ($extensionKey) { $this->gatewayClass = ''; - $this->extensionManagerConf = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( + $this->extensionManagerConf = GeneralUtility::makeInstance( \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class )->get('transactor'); - $newExtensionManagerConf = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance( + $newExtensionManagerConf = GeneralUtility::makeInstance( \TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class )->get($extensionKey); diff --git a/Classes/Request/Parameters.php b/Classes/Request/Parameters.php index 463d4cc..b88430b 100644 --- a/Classes/Request/Parameters.php +++ b/Classes/Request/Parameters.php @@ -35,6 +35,7 @@ * */ +use TYPO3\CMS\Core\Utility\ArrayUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; @@ -90,10 +91,13 @@ static public function getPiVars () self::$prefixId && !isset(self::$piVars[self::$prefixId]) ) { - self::$piVars = GeneralUtility::_GPmerged(self::$prefixId); + self::$piVars = $GLOBALS['TYPO3_REQUEST']->getQueryParams()[self::$prefixId]; + ArrayUtility::mergeRecursiveWithOverrule( + self::$piVars, + $GLOBALS['TYPO3_REQUEST']->getParsedBody()[self::$prefixId] + ); } $result = self::$piVars; return $result; } } - diff --git a/ext_emconf.php b/ext_emconf.php index fec8fc2..483d297 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -8,7 +8,7 @@ 'title' => 'Payment Transactor API', 'description' => 'This is a basic API to develop extensions which connect to different payment transaction gateways.', 'category' => 'misc', - 'version' => '0.11.0', + 'version' => '0.11.1', 'state' => 'stable', 'clearcacheonload' => 0, 'author' => 'Franz Holzinger',