diff --git a/Bootstrap/Bootstrap.php b/Bootstrap/Bootstrap.php index 563ecda0..1df08d32 100644 --- a/Bootstrap/Bootstrap.php +++ b/Bootstrap/Bootstrap.php @@ -19,7 +19,6 @@ use Adyen\Core\BusinessLogic\Domain\GeneralSettings\Services\GeneralSettingsService; use Adyen\Core\BusinessLogic\Domain\Integration\Order\OrderService as OrderServiceInterface; use Adyen\Core\BusinessLogic\Domain\Integration\Processors\AddressProcessor; -use Adyen\Core\BusinessLogic\Domain\Integration\Processors\ApplicationInfoProcessor; use Adyen\Core\BusinessLogic\Domain\Integration\Processors\BasketItemsProcessor; use Adyen\Core\BusinessLogic\Domain\Integration\Processors\BirthdayProcessor; use Adyen\Core\BusinessLogic\Domain\Integration\Processors\L2L3DataProcessor; @@ -66,7 +65,6 @@ use AdyenPayment\Components\Integration\PaymentProcessors\ShopperLocaleProcessor; use AdyenPayment\Components\Integration\PaymentProcessors\ShopperNameProcessor as IntegrationShopperNameProcessor; use AdyenPayment\Components\Integration\PaymentProcessors\ShopperReferenceProcessor as IntegrationShopperReferenceProcessor; -use AdyenPayment\Components\Integration\PaymentProcessors\ApplicationInfoProcessor as IntegrationApplicationInfoProcessor; use AdyenPayment\Components\Integration\StoreService; use AdyenPayment\Components\Integration\SystemInfoService; use AdyenPayment\Components\LastOpenTimeService; @@ -301,13 +299,6 @@ static function () { } ); - ServiceRegister::registerService( - ApplicationInfoProcessor::class, - static function () { - return new IntegrationApplicationInfoProcessor(); - } - ); - ServiceRegister::registerService( \Adyen\Core\BusinessLogic\Domain\Integration\Processors\ShopperLocaleProcessor::class, static function () { diff --git a/Components/Configuration/ConfigurationService.php b/Components/Configuration/ConfigurationService.php index 92e4c1c8..43936b59 100644 --- a/Components/Configuration/ConfigurationService.php +++ b/Components/Configuration/ConfigurationService.php @@ -1,15 +1,18 @@ Shop()->getName(); - $shopVersion = $this->getShopVersion(); - $pluginVersion = $this->getPluginVersion(); - - $shopName && $builder->setApplicationInfo( - new ApplicationInfo(new ExternalPlatform($shopName, $shopVersion), $pluginVersion) - ); - } - - /** - * Returns Shopware5 version. - * - * @return string - */ - private function getShopVersion(): string - { - /** @var ShopwareVersionCheck $versionCheck */ - $versionCheck = Shopware()->Container()->get('adyen_payment.components.shopware_version_check'); - - return $versionCheck->getShopwareVersion(); - } - - /** - * Returns Adyen plugin version. - * - * @return string - */ - private function getPluginVersion(): string - { - $pluginManager = Shopware()->Container()->get('shopware.plugin_manager'); - /** @var Plugin $pluginInfo */ - $pluginInfo = $pluginManager->getPluginByName('AdyenPayment'); - - return $pluginInfo->getVersion(); - } -} diff --git a/composer.json b/composer.json index bc9a7e15..54458c2e 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "php": "^7.2|^7.4|^8.0", "ext-json": "*", "ext-zip": "*", - "adyen/integration-core": "1.0.3", + "adyen/integration-core": "1.0.4", "ext-simplexml": "*" }, "minimum-stability": "dev", diff --git a/composer.lock b/composer.lock index 82aa81f4..fbfe5a4f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b633c1abeb07c573367663784bc4bcfb", + "content-hash": "77f7b72eeb34bb9558a48200fe6e52d1", "packages": [ { "name": "adyen/integration-core", - "version": "1.0.3", + "version": "1.0.4", "source": { "type": "git", "url": "git@github.com:Adyen/adyen-php-plugin-core.git", - "reference": "5c7dafba811dd2d6f963aaf7f514405c4189c0b7" + "reference": "caf90c37d782550006cc2197c9b3151779f365ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Adyen/adyen-php-plugin-core/zipball/5c7dafba811dd2d6f963aaf7f514405c4189c0b7", - "reference": "5c7dafba811dd2d6f963aaf7f514405c4189c0b7", + "url": "https://api.github.com/repos/Adyen/adyen-php-plugin-core/zipball/caf90c37d782550006cc2197c9b3151779f365ad", + "reference": "caf90c37d782550006cc2197c9b3151779f365ad", "shasum": "" }, "require": { @@ -48,7 +48,7 @@ "proprietary" ], "description": "Core Adyen integration library", - "time": "2023-10-12T08:54:21+00:00" + "time": "2023-11-02T11:21:31+00:00" }, { "name": "adyen/php-webhook-module", @@ -107,5 +107,5 @@ "ext-simplexml": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/plugin.xml b/plugin.xml index 36e5d005..7e9456f8 100644 --- a/plugin.xml +++ b/plugin.xml @@ -4,7 +4,7 @@ - 4.0.2 + 4.0.3 Adyen Adyen https://adyen.com @@ -487,4 +487,14 @@ * Update core, fixed credit card mapping + + + * Change application info values + * Update core to version 1.0.4 + + + * Change application info values + * Update core to version 1.0.4 + +