Skip to content

Commit ac467a2

Browse files
priyambadpriyambad
authored
Merge branch 'main' into fix/product-special-charachter
2 parents 784ac00 + 1727c60 commit ac467a2

File tree

89 files changed

+706
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+706
-103
lines changed

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

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
use Magento\Framework\App\Helper\AbstractHelper;
2525
use Magento\Framework\App\Helper\Context;
2626
use Magento\Framework\App\ProductMetadataInterface;
27+
use Magento\Framework\App\ProductMetadata as FrameworkProductMetaData;
2728
use Magento\Framework\App\ResourceConnection;
2829
use Magento\Framework\HTTP\Client\Curl;
2930
use Magento\Framework\Module\ModuleListInterface;
@@ -84,6 +85,11 @@ class FBEHelper extends AbstractHelper
8485
*/
8586
private $systemConfig;
8687

88+
/**
89+
* @var ProductMetadataInterface
90+
*/
91+
private $productMetadata;
92+
8793
/**
8894
* FBEHelper constructor
8995
*
@@ -95,6 +101,7 @@ class FBEHelper extends AbstractHelper
95101
* @param ResourceConnection $resourceConnection
96102
* @param ModuleListInterface $moduleList
97103
* @param SystemConfig $systemConfig
104+
* @param ProductMetadataInterface $productMetadata
98105
*/
99106
public function __construct(
100107
Context $context,
@@ -104,7 +111,8 @@ public function __construct(
104111
Curl $curl,
105112
ResourceConnection $resourceConnection,
106113
ModuleListInterface $moduleList,
107-
SystemConfig $systemConfig
114+
SystemConfig $systemConfig,
115+
ProductMetadataInterface $productMetadata
108116
) {
109117
parent::__construct($context);
110118
$this->objectManager = $objectManager;
@@ -114,16 +122,17 @@ public function __construct(
114122
$this->resourceConnection = $resourceConnection;
115123
$this->moduleList = $moduleList;
116124
$this->systemConfig = $systemConfig;
125+
$this->productMetadata = $productMetadata;
117126
}
118127

119128
/**
120129
* Get magento version
121130
*
122-
* @return mixed
131+
* @return string
123132
*/
124-
public function getMagentoVersion()
133+
public function getMagentoVersion(): string
125134
{
126-
return $this->objectManager->get(ProductMetadataInterface::class)->getVersion();
135+
return $this->productMetadata->getVersion();
127136
}
128137

129138
/**
@@ -141,9 +150,9 @@ public function getPluginVersion()
141150
*
142151
* @return string
143152
*/
144-
public function getSource()
153+
public function getSource(): string
145154
{
146-
return 'magento2';
155+
return $this->productMetadata->getEdition() == FrameworkProductMetaData::EDITION_NAME ? 'magento_opensource' : 'adobe_commerce';
147156
}
148157

149158
/**

‎app/code/Meta/BusinessExtension/Model/System/Config.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ public function isActiveCollectionsSync($scopeId = null, $scope = null)
839839
*/
840840
public function isServerTestModeEnabled(int $scopeId = null, string $scope = null): bool
841841
{
842-
return $this->getConfig(self::XML_PATH_FACEBOOK_CONVERSION_MANAGEMENT_ENABLE_SERVER_TEST, $scopeId, $scope);
842+
return (bool) $this->getConfig(self::XML_PATH_FACEBOOK_CONVERSION_MANAGEMENT_ENABLE_SERVER_TEST, $scopeId, $scope);
843843
}
844844

845845
/**

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

Lines changed: 19 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,7 @@ class FBEHelperTest extends TestCase
3535
/**
3636
* @var FBEHelper
3737
*/
38-
private $fbeHelper;
39-
40-
/**
41-
* @var MockObject
42-
*/
43-
private $systemConfig;
44-
45-
/**
46-
* @var MockObject
47-
*/
48-
private $context;
38+
private FBEHelper $fbeHelper;
4939

5040
/**
5141
* @var MockObject
@@ -55,27 +45,12 @@ class FBEHelperTest extends TestCase
5545
/**
5646
* @var MockObject
5747
*/
58-
private $logger;
59-
60-
/**
61-
* @var MockObject
62-
*/
63-
private $storeManager;
64-
65-
/**
66-
* @var MockObject
67-
*/
68-
private $curl;
69-
70-
/**
71-
* @var MockObject
72-
*/
73-
private $resourceConnection;
48+
private $moduleList;
7449

7550
/**
76-
* @var MockObject
51+
* @var ProductMetadataInterface|MockObject
7752
*/
78-
private $moduleList;
53+
private $productMetaData;
7954

8055
/**
8156
* Used to reset or change values after running a test
@@ -93,23 +68,25 @@ public function tearDown(): void
9368
*/
9469
public function setUp(): void
9570
{
96-
$this->context = $this->createMock(Context::class);
71+
$context = $this->createMock(Context::class);
9772
$this->objectManagerInterface = $this->createMock(ObjectManagerInterface::class);
98-
$this->logger = $this->createMock(Logger::class);
99-
$this->storeManager = $this->createMock(StoreManagerInterface::class);
100-
$this->curl = $this->createMock(Curl::class);
101-
$this->resourceConnection = $this->createMock(ResourceConnection::class);
73+
$logger = $this->createMock(Logger::class);
74+
$storeManager = $this->createMock(StoreManagerInterface::class);
75+
$curl = $this->createMock(Curl::class);
76+
$resourceConnection = $this->createMock(ResourceConnection::class);
10277
$this->moduleList = $this->createMock(ModuleListInterface::class);
103-
$this->systemConfig = $this->createMock(Config::class);
78+
$systemConfig = $this->createMock(Config::class);
79+
$this->productMetaData = $this->createMock(ProductMetadataInterface::class);
10480
$this->fbeHelper = new FBEHelper(
105-
$this->context,
81+
$context,
10682
$this->objectManagerInterface,
107-
$this->logger,
108-
$this->storeManager,
109-
$this->curl,
110-
$this->resourceConnection,
83+
$logger,
84+
$storeManager,
85+
$curl,
86+
$resourceConnection,
11187
$this->moduleList,
112-
$this->systemConfig
88+
$systemConfig,
89+
$this->productMetaData
11390
);
11491
}
11592

@@ -132,8 +109,7 @@ public function testCorrectPartnerAgent()
132109
->disableOriginalConstructor()
133110
->setMethods(['getVersion', 'getEdition', 'getName'])
134111
->getMock();
135-
$productMetadata->method('getVersion')->willReturn($magentoVersion);
136-
$productMetadata->method('getVersion')->willReturn($magentoVersion);
112+
$this->productMetaData->expects($this->once())->method('getVersion')->willReturn($magentoVersion);
137113
$this->objectManagerInterface->method('get')->willReturn($productMetadata);
138114
$this->assertEquals(
139115
sprintf('%s-%s-%s', $source, $magentoVersion, $pluginVersion),

‎app/code/Meta/BusinessExtension/composer.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@
99
"magento/framework": "*",
1010
"magento/module-backend": "*",
1111
"magento/module-catalog": "*",
12-
"magento/module-configurable-product": "*",
1312
"magento/module-config": "*",
1413
"magento/module-security": "*",
1514
"magento/module-store": "*",
1615
"magento/module-newsletter": "*",
17-
"magento/module-customer": "*",
18-
"magento/module-checkout": "*",
19-
"magento/module-directory": "*",
20-
"magento/module-eav": "*",
16+
"meta/module-sales": "*",
2117
"facebook/php-business-sdk": "^15.0.0"
2218
},
2319
"autoload": {

‎app/code/Meta/BusinessExtension/etc/module.xml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,11 @@
55
<sequence>
66
<module name="Magento_Backend"/>
77
<module name="Magento_Catalog"/>
8-
<module name="Magento_ConfigurableProduct"/>
98
<module name="Magento_Config"/>
109
<module name="Magento_Security"/>
1110
<module name="Magento_Store"/>
1211
<module name="Magento_Newsletter"/>
13-
<module name="Magento_Customer"/>
14-
<module name="Magento_Checkout"/>
15-
<module name="Magento_Directory"/>
16-
<module name="Magento_Eav"/>
12+
<module name="Meta_Sales"/>
1713
</sequence>
1814
</module>
1915
</config>

‎app/code/Meta/BusinessExtension/view/adminhtml/templates/setup.phtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
, appId: '<?= $escaper->escapeHtml($block->getAppId()) ?>'
3838
, timeZone: 'America/Los_Angeles'
3939
, businessVertical: 'ECOMMERCE'
40-
, channel: 'DEFAULT'
40+
, channel: 'COMMERCE'
4141
, currency: '<?= $escaper->escapeHtml($block->getCurrencyCode()) ?>'
4242
, businessName: 'Magento'
4343
, debug: true

‎app/code/Meta/Catalog/Test/Unit/Observer/ProcessCategoryAfterDeleteEventObserverTest.php‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,30 @@
1818
namespace Meta\Catalog\Test\Unit\Observer;
1919

2020
use Magento\Framework\Event\Observer;
21+
use Meta\BusinessExtension\Helper\FBEHelper;
22+
use Meta\BusinessExtension\Model\System\Config;
2123
use Meta\Catalog\Model\Feed\CategoryCollection;
22-
use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
2324
use Magento\Catalog\Model\Category;
2425
use Magento\Framework\Event;
2526
use Meta\Catalog\Observer\ProcessCategoryAfterDeleteEventObserver;
27+
use PHPUnit\Framework\TestCase;
2628
use PHPUnit\Framework\MockObject\MockObject;
2729

28-
class ProcessCategoryAfterDeleteEventObserverTest extends CommonTest
30+
class ProcessCategoryAfterDeleteEventObserverTest extends TestCase
2931
{
32+
/**
33+
* @var MockObject
34+
*/
35+
private MockObject $fbeHelper;
36+
37+
/**
38+
* @var MockObject
39+
*/
40+
private MockObject $systemConfig;
41+
42+
/**
43+
* @var ProcessCategoryAfterDeleteEventObserver
44+
*/
3045
private $processCategoryAfterDeleteEventObserver;
3146

3247
/**
@@ -46,7 +61,8 @@ class ProcessCategoryAfterDeleteEventObserverTest extends CommonTest
4661
*/
4762
public function setUp(): void
4863
{
49-
parent::setUp();
64+
$this->fbeHelper = $this->createMock(FBEHelper::class);
65+
$this->systemConfig = $this->createMock(Config::class);
5066
$this->_category = $this->createMock(Category::class);
5167
$event = $this->getMockBuilder(Event::class)->addMethods(['getCategory'])->getMock();
5268
$event->expects($this->once())->method('getCategory')->will($this->returnValue($this->_category));

‎app/code/Meta/Catalog/Test/Unit/Observer/ProcessCategoryAfterSaveEventObserverTest.php‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,20 @@
1818
namespace Meta\Catalog\Test\Unit\Observer;
1919

2020
use Magento\Framework\Event;
21-
use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
21+
use Meta\BusinessExtension\Helper\FBEHelper;
2222
use Meta\Catalog\Model\Feed\CategoryCollection;
2323
use Meta\Catalog\Observer\ProcessCategoryAfterSaveEventObserver;
24+
use PHPUnit\Framework\TestCase;
25+
use PHPUnit\Framework\MockObject\MockObject;
2426

25-
class ProcessCategoryAfterSaveEventObserverTest extends CommonTest
27+
class ProcessCategoryAfterSaveEventObserverTest extends TestCase
2628
{
27-
protected $processCategoryAfterSaveEventObserver;
29+
/**
30+
* @var MockObject
31+
*/
32+
private MockObject $fbeHelper;
33+
34+
private $processCategoryAfterSaveEventObserver;
2835

2936
/**
3037
* @var \PHPUnit\Framework\MockObject\MockObject
@@ -43,7 +50,7 @@ class ProcessCategoryAfterSaveEventObserverTest extends CommonTest
4350
*/
4451
public function setUp(): void
4552
{
46-
parent::setUp();
53+
$this->fbeHelper = $this->createMock(FBEHelper::class);
4754
$this->_category = $this->createMock(\Magento\Catalog\Model\Category::class);
4855
$event = $this->getMockBuilder(Event::class)->addMethods(['getCategory'])->getMock();
4956
$event->expects($this->once())->method('getCategory')->will($this->returnValue($this->_category));

‎app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterDeleteEventObserverTest.php‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,33 @@
1717

1818
namespace Meta\Catalog\Test\Unit\Observer;
1919

20+
use Meta\BusinessExtension\Helper\FBEHelper;
2021
use Meta\BusinessExtension\Helper\GraphAPIAdapter;
21-
use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
22+
use Meta\BusinessExtension\Model\System\Config;
2223
use Meta\Catalog\Helper\Product\Identifier;
2324
use Meta\Catalog\Observer\Product\DeleteAfter as ProcessProductAfterDeleteEventObserver;
2425
use Magento\Catalog\Model\Product;
2526
use Magento\Framework\Event;
2627
use Magento\Framework\Event\Observer;
28+
use PHPUnit\Framework\TestCase;
2729
use PHPUnit\Framework\MockObject\MockObject;
2830

29-
class ProcessProductAfterDeleteEventObserverTest extends CommonTest
31+
class ProcessProductAfterDeleteEventObserverTest extends TestCase
3032
{
33+
/**
34+
* @var MockObject
35+
*/
36+
private MockObject $fbeHelper;
37+
38+
/**
39+
* @var MockObject
40+
*/
41+
private MockObject $systemConfig;
42+
3143
/**
3244
* @var ProcessProductAfterDeleteEventObserver
3345
*/
34-
protected $processProductAfterDeleteEventObserver;
46+
private $processProductAfterDeleteEventObserver;
3547

3648
/**
3749
* @var MockObject
@@ -60,7 +72,8 @@ class ProcessProductAfterDeleteEventObserverTest extends CommonTest
6072
*/
6173
public function setUp(): void
6274
{
63-
parent::setUp();
75+
$this->fbeHelper = $this->createMock(FBEHelper::class);
76+
$this->systemConfig = $this->createMock(Config::class);
6477
$this->_product = $this->createMock(Product::class);
6578
$this->_product->expects($this->atLeastOnce())->method('getId')->will($this->returnValue("1234"));
6679
$this->_product->expects($this->never())->method('getSku');

‎app/code/Meta/Catalog/Test/Unit/Observer/ProcessProductAfterSaveEventObserverTest.php‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,34 @@
1717

1818
namespace Meta\Catalog\Test\Unit\Observer;
1919

20+
use Meta\BusinessExtension\Helper\FBEHelper;
2021
use Meta\BusinessExtension\Helper\GraphAPIAdapter;
21-
use Meta\BusinessExtension\Test\Unit\Observer\CommonTest;
22+
use Meta\BusinessExtension\Model\System\Config;
2223
use Meta\Catalog\Model\Product\Feed\Method\BatchApi;
2324
use Meta\Catalog\Observer\Product\SaveAfter as ProcessProductAfterSaveEventObserver;
2425
use Magento\Catalog\Model\Product;
2526
use Magento\Framework\Event;
2627
use Magento\Framework\Event\Observer;
2728
use Magento\Store\Api\Data\StoreInterface;
29+
use PHPUnit\Framework\TestCase;
2830
use PHPUnit\Framework\MockObject\MockObject;
2931

30-
class ProcessProductAfterSaveEventObserverTest extends CommonTest
32+
class ProcessProductAfterSaveEventObserverTest extends TestCase
3133
{
34+
/**
35+
* @var MockObject
36+
*/
37+
private MockObject $fbeHelper;
38+
39+
/**
40+
* @var MockObject
41+
*/
42+
private MockObject $systemConfig;
43+
3244
/**
3345
* @var ProcessProductAfterSaveEventObserver
3446
*/
35-
protected $processProductAfterSaveEventObserver;
47+
private $processProductAfterSaveEventObserver;
3648

3749
/**
3850
* @var MockObject
@@ -66,7 +78,8 @@ class ProcessProductAfterSaveEventObserverTest extends CommonTest
6678
*/
6779
public function setUp(): void
6880
{
69-
parent::setUp();
81+
$this->fbeHelper = $this->createMock(FBEHelper::class);
82+
$this->systemConfig = $this->createMock(Config::class);
7083
$this->store = $this->createMock(StoreInterface::class);
7184
$this->fbeHelper->expects($this->once())->method('getStore')->will($this->returnValue($this->store));
7285
$this->_product = $this->createMock(Product::class);

0 commit comments

Comments
 (0)