Merge pull request #149 from magento-commerce/fix/update-magento-source

updated logic to fetch magento edition

Author: bgiamarino

app/code/Meta/BusinessExtension/Helper/FBEHelper.php

@@ -24,6 +24,7 @@
 use Magento\Framework\App\Helper\AbstractHelper;
 use Magento\Framework\App\Helper\Context;
 use Magento\Framework\App\ProductMetadataInterface;
+use Magento\Framework\App\ProductMetadata as FrameworkProductMetaData;
 use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\HTTP\Client\Curl;
 use Magento\Framework\Module\ModuleListInterface;
@@ -84,6 +85,11 @@ class FBEHelper extends AbstractHelper
      */
     private $systemConfig;
 
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
     /**
      * FBEHelper constructor
      *
@@ -95,6 +101,7 @@ class FBEHelper extends AbstractHelper
      * @param ResourceConnection $resourceConnection
      * @param ModuleListInterface $moduleList
      * @param SystemConfig $systemConfig
+     * @param ProductMetadataInterface $productMetadata
      */
     public function __construct(
         Context $context,
@@ -104,7 +111,8 @@ public function __construct(
         Curl $curl,
         ResourceConnection $resourceConnection,
         ModuleListInterface $moduleList,
-        SystemConfig $systemConfig
+        SystemConfig $systemConfig,
+        ProductMetadataInterface $productMetadata
     ) {
         parent::__construct($context);
         $this->objectManager = $objectManager;
@@ -114,16 +122,17 @@ public function __construct(
         $this->resourceConnection = $resourceConnection;
         $this->moduleList = $moduleList;
         $this->systemConfig = $systemConfig;
+        $this->productMetadata = $productMetadata;
     }
 
     /**
      * Get magento version
      *
-     * @return mixed
+     * @return string
      */
-    public function getMagentoVersion()
+    public function getMagentoVersion(): string
     {
-        return $this->objectManager->get(ProductMetadataInterface::class)->getVersion();
+        return $this->productMetadata->getVersion();
     }
 
     /**
@@ -141,9 +150,9 @@ public function getPluginVersion()
      *
      * @return string
      */
-    public function getSource()
+    public function getSource(): string
     {
-        return 'magento2';
+        return $this->productMetadata->getEdition() == FrameworkProductMetaData::EDITION_NAME ? 'magento_opensource' : 'adobe_commerce';
     }
 
     /**

app/code/Meta/BusinessExtension/Test/Unit/Helper/FBEHelperTest.php

@@ -35,17 +35,7 @@ class FBEHelperTest extends TestCase
     /**
      * @var FBEHelper
      */
-    private $fbeHelper;
-
-    /**
-     * @var MockObject
-     */
-    private $systemConfig;
-
-    /**
-     * @var MockObject
-     */
-    private $context;
+    private FBEHelper $fbeHelper;
 
     /**
      * @var MockObject
@@ -55,27 +45,12 @@ class FBEHelperTest extends TestCase
     /**
      * @var MockObject
      */
-    private $logger;
-
-    /**
-     * @var MockObject
-     */
-    private $storeManager;
-
-    /**
-     * @var MockObject
-     */
-    private $curl;
-
-    /**
-     * @var MockObject
-     */
-    private $resourceConnection;
+    private $moduleList;
 
     /**
-     * @var MockObject
+     * @var ProductMetadataInterface|MockObject
      */
-    private $moduleList;
+    private $productMetaData;
 
     /**
      * Used to reset or change values after running a test
@@ -93,23 +68,25 @@ public function tearDown(): void
      */
     public function setUp(): void
     {
-        $this->context = $this->createMock(Context::class);
+        $context = $this->createMock(Context::class);
         $this->objectManagerInterface = $this->createMock(ObjectManagerInterface::class);
-        $this->logger = $this->createMock(Logger::class);
-        $this->storeManager = $this->createMock(StoreManagerInterface::class);
-        $this->curl = $this->createMock(Curl::class);
-        $this->resourceConnection = $this->createMock(ResourceConnection::class);
+        $logger = $this->createMock(Logger::class);
+        $storeManager = $this->createMock(StoreManagerInterface::class);
+        $curl = $this->createMock(Curl::class);
+        $resourceConnection = $this->createMock(ResourceConnection::class);
         $this->moduleList = $this->createMock(ModuleListInterface::class);
-        $this->systemConfig = $this->createMock(Config::class);
+        $systemConfig = $this->createMock(Config::class);
+        $this->productMetaData = $this->createMock(ProductMetadataInterface::class);
         $this->fbeHelper = new FBEHelper(
-            $this->context,
+            $context,
             $this->objectManagerInterface,
-            $this->logger,
-            $this->storeManager,
-            $this->curl,
-            $this->resourceConnection,
+            $logger,
+            $storeManager,
+            $curl,
+            $resourceConnection,
             $this->moduleList,
-            $this->systemConfig
+            $systemConfig,
+            $this->productMetaData
         );
     }
 
@@ -132,8 +109,7 @@ public function testCorrectPartnerAgent()
             ->disableOriginalConstructor()
             ->setMethods(['getVersion', 'getEdition', 'getName'])
             ->getMock();
-        $productMetadata->method('getVersion')->willReturn($magentoVersion);
-        $productMetadata->method('getVersion')->willReturn($magentoVersion);
+        $this->productMetaData->expects($this->once())->method('getVersion')->willReturn($magentoVersion);
         $this->objectManagerInterface->method('get')->willReturn($productMetadata);
         $this->assertEquals(
             sprintf('%s-%s-%s', $source, $magentoVersion, $pluginVersion),