RATESWSX-300: refactoring: move feature-flag-service to core-namespace

ratepay · Mar 22, 2024 · 5073d09 · 5073d09
1 parent 34ff4f1
commit 5073d09
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 21 deletions.
diff --git a/src/Components/FeatureFlags/DependencyInjection/services.xml b/src/Components/FeatureFlags/DependencyInjection/services.xml
diff --git a/src/Components/RatepayApi/Service/Request/PaymentRequestService.php b/src/Components/RatepayApi/Service/Request/PaymentRequestService.php
@@ -14,7 +14,6 @@
 use RatePAY\Model\Request\SubModel\Content;
 use RatePAY\Model\Request\SubModel\Head;
 use RatePAY\RequestBuilder;
-use Ratepay\RpayPayments\Components\FeatureFlags\Util\FeatureFlagService;
 use Ratepay\RpayPayments\Components\ProfileConfig\Model\ProfileConfigEntity;
 use Ratepay\RpayPayments\Components\ProfileConfig\Service\Search\ProfileByOrderEntity;
 use Ratepay\RpayPayments\Components\ProfileConfig\Service\Search\ProfileSearchService;
@@ -25,6 +24,7 @@
 use Ratepay\RpayPayments\Components\RatepayApi\Factory\HeadFactory;
 use Ratepay\RpayPayments\Components\RatepayApi\Factory\PaymentFactory;
 use Ratepay\RpayPayments\Components\RatepayApi\Factory\ShoppingBasketFactory;
+use Ratepay\RpayPayments\Core\FeatureFlagService;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**

diff --git a/.../FeatureFlags/Util/FeatureFlagService.php → src/Core/FeatureFlagService.php b/.../FeatureFlags/Util/FeatureFlagService.php → src/Core/FeatureFlagService.php
@@ -8,7 +8,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Ratepay\RpayPayments\Components\FeatureFlags\Util;
+namespace Ratepay\RpayPayments\Core;
 
 class FeatureFlagService
 {

diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -20,6 +20,9 @@
             <argument id="Shopware\Core\System\SystemConfig\SystemConfigService" type="service"/>
             <argument>%ratepay.shopware_payment.plugin_version%</argument>
         </service>
+
+        <!-- needs to be public, so we can get it in boot in bundle-file -->
+        <service id="Ratepay\RpayPayments\Components\FeatureFlags\Util\FeatureFlagService" autowire="true" public="true"/>
     </services>
 
 </container>
diff --git a/src/RpayPayments.php b/src/RpayPayments.php
@@ -14,7 +14,7 @@
 use Ratepay\RpayPayments\Bootstrap\AbstractBootstrap;
 use Ratepay\RpayPayments\Bootstrap\Database;
 use Ratepay\RpayPayments\Bootstrap\PaymentMethods;
-use Ratepay\RpayPayments\Components\FeatureFlags\Util\FeatureFlagService;
+use Ratepay\RpayPayments\Core\FeatureFlagService;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;