Skip to content

Commit bd977e9

Browse files
nabhanmaswood98bgiamarino
nabhanmaswood98
and
bgiamarino
authored
Fix Magento Health Index protected modifier issue in Meta_Conversion (#253)
* Replace protected modifiers in Meta_Conversion block classes * Replace protected modifiers in Meta_Conversion Helper and Observers * Fix static test integrity issue for PHP 8.2 * Remove php7.4 from Meta_Conversion composer.json --------- Co-authored-by: Ben Giamarino <[email protected]>
1 parent 4d75d4d commit bd977e9

File tree

9 files changed

+207
-15
lines changed

9 files changed

+207
-15
lines changed

‎app/code/Meta/Conversion/Block/Pixel/AddToCart.php‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,55 @@
1717

1818
namespace Meta\Conversion\Block\Pixel;
1919

20+
use Meta\BusinessExtension\Helper\FBEHelper;
21+
use Meta\Conversion\Helper\MagentoDataHelper;
22+
use Meta\BusinessExtension\Model\System\Config as SystemConfig;
23+
use Magento\Framework\View\Element\Template\Context;
24+
use Magento\Framework\Escaper;
25+
use Magento\Checkout\Model\Session as CheckoutSession;
26+
2027
/**
2128
* @api
2229
*/
2330
class AddToCart extends Common
2431
{
32+
/**
33+
* @var FBEHelper
34+
*/
35+
private $fbeHelper;
36+
37+
/**
38+
* AddtoCart constructor
39+
*
40+
* @param Context $context
41+
* @param FBEHelper $fbeHelper
42+
* @param MagentoDataHelper $magentoDataHelper
43+
* @param SystemConfig $systemConfig
44+
* @param Escaper $escaper
45+
* @param CheckoutSession $checkoutSession
46+
* @param array $data
47+
*/
48+
public function __construct(
49+
Context $context,
50+
FBEHelper $fbeHelper,
51+
MagentoDataHelper $magentoDataHelper,
52+
SystemConfig $systemConfig,
53+
Escaper $escaper,
54+
CheckoutSession $checkoutSession,
55+
array $data = []
56+
) {
57+
parent::__construct(
58+
$context,
59+
$fbeHelper,
60+
$magentoDataHelper,
61+
$systemConfig,
62+
$escaper,
63+
$checkoutSession,
64+
$data
65+
);
66+
$this->fbeHelper = $fbeHelper;
67+
}
68+
2569
/**
2670
* Get product info url
2771
*

‎app/code/Meta/Conversion/Block/Pixel/Common.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ class Common extends \Magento\Framework\View\Element\Template
3131
/**
3232
* @var FBEHelper
3333
*/
34-
protected $fbeHelper;
34+
private $fbeHelper;
3535

3636
/**
3737
* @var MagentoDataHelper
3838
*/
39-
protected $magentoDataHelper;
39+
private $magentoDataHelper;
4040

4141
/**
4242
* @var SystemConfig
4343
*/
44-
protected $systemConfig;
44+
private $systemConfig;
4545

4646
/**
4747
* @var Escaper
4848
*/
49-
protected $escaper;
49+
private $escaper;
5050

5151
/**
5252
* @var CheckoutSession
5353
*/
54-
protected $checkoutSession;
54+
private $checkoutSession;
5555

5656
/**
5757
* Common constructor

‎app/code/Meta/Conversion/Block/Pixel/InitiateCheckout.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,23 @@ class InitiateCheckout extends Common
3636
/**
3737
* @var PricingHelper
3838
*/
39-
protected $pricingHelper;
39+
private $pricingHelper;
4040

4141
/**
4242
* @var Quote
4343
*/
4444
private $quote;
4545

46+
/**
47+
* @var MagentoDataHelper
48+
*/
49+
private $magentoDataHelper;
50+
51+
/**
52+
* @var CheckoutSession
53+
*/
54+
private $checkoutSession;
55+
4656
/**
4757
* Constructor
4858
*
@@ -75,6 +85,8 @@ public function __construct(
7585
$data
7686
);
7787
$this->pricingHelper = $pricingHelper;
88+
$this->magentoDataHelper = $magentoDataHelper;
89+
$this->checkoutSession = $checkoutSession;
7890
}
7991

8092
/**

‎app/code/Meta/Conversion/Block/Pixel/Purchase.php‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,55 @@
1919

2020
use Magento\Catalog\Model\Product;
2121
use Magento\Sales\Model\Order;
22+
use Meta\BusinessExtension\Helper\FBEHelper;
23+
use Meta\Conversion\Helper\MagentoDataHelper;
24+
use Meta\BusinessExtension\Model\System\Config as SystemConfig;
25+
use Magento\Framework\View\Element\Template\Context;
26+
use Magento\Framework\Escaper;
27+
use Magento\Checkout\Model\Session as CheckoutSession;
2228

2329
/**
2430
* @api
2531
*/
2632
class Purchase extends Common
2733
{
34+
/**
35+
* @var FBEHelper
36+
*/
37+
private $fbeHelper;
38+
39+
/**
40+
* Purchase constructor
41+
*
42+
* @param Context $context
43+
* @param FBEHelper $fbeHelper
44+
* @param MagentoDataHelper $magentoDataHelper
45+
* @param SystemConfig $systemConfig
46+
* @param Escaper $escaper
47+
* @param CheckoutSession $checkoutSession
48+
* @param array $data
49+
*/
50+
public function __construct(
51+
Context $context,
52+
FBEHelper $fbeHelper,
53+
MagentoDataHelper $magentoDataHelper,
54+
SystemConfig $systemConfig,
55+
Escaper $escaper,
56+
CheckoutSession $checkoutSession,
57+
array $data = []
58+
) {
59+
parent::__construct(
60+
$context,
61+
$fbeHelper,
62+
$magentoDataHelper,
63+
$systemConfig,
64+
$escaper,
65+
$checkoutSession,
66+
$data
67+
);
68+
$this->fbeHelper = $fbeHelper;
69+
}
70+
2871
/**
2972
* Get contents IDs
3073
*

‎app/code/Meta/Conversion/Block/Pixel/Search.php‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,54 @@
1717

1818
namespace Meta\Conversion\Block\Pixel;
1919

20+
use Meta\BusinessExtension\Helper\FBEHelper;
21+
use Meta\Conversion\Helper\MagentoDataHelper;
22+
use Meta\BusinessExtension\Model\System\Config as SystemConfig;
23+
use Magento\Framework\View\Element\Template\Context;
24+
use Magento\Framework\Escaper;
25+
use Magento\Checkout\Model\Session as CheckoutSession;
26+
2027
/**
2128
* @api
2229
*/
2330
class Search extends Common
2431
{
32+
/**
33+
* @var Escaper
34+
*/
35+
private $escaper;
36+
37+
/**
38+
* Search constructor
39+
*
40+
* @param Context $context
41+
* @param FBEHelper $fbeHelper
42+
* @param MagentoDataHelper $magentoDataHelper
43+
* @param SystemConfig $systemConfig
44+
* @param Escaper $escaper
45+
* @param CheckoutSession $checkoutSession
46+
* @param array $data
47+
*/
48+
public function __construct(
49+
Context $context,
50+
FBEHelper $fbeHelper,
51+
MagentoDataHelper $magentoDataHelper,
52+
SystemConfig $systemConfig,
53+
Escaper $escaper,
54+
CheckoutSession $checkoutSession,
55+
array $data = []
56+
) {
57+
parent::__construct(
58+
$context,
59+
$fbeHelper,
60+
$magentoDataHelper,
61+
$systemConfig,
62+
$escaper,
63+
$checkoutSession,
64+
$data
65+
);
66+
$this->escaper = $escaper;
67+
}
2568
/**
2669
* Get search query
2770
*

‎app/code/Meta/Conversion/Block/Pixel/ViewContent.php‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,61 @@
1717

1818
namespace Meta\Conversion\Block\Pixel;
1919

20+
use Meta\BusinessExtension\Helper\FBEHelper;
21+
use Meta\Conversion\Helper\MagentoDataHelper;
22+
use Meta\BusinessExtension\Model\System\Config as SystemConfig;
23+
use Magento\Framework\View\Element\Template\Context;
24+
use Magento\Framework\Escaper;
25+
use Magento\Checkout\Model\Session as CheckoutSession;
26+
2027
/**
2128
* @api
2229
*/
2330
class ViewContent extends Common
2431
{
32+
/**
33+
* @var FBEHelper
34+
*/
35+
private $fbeHelper;
36+
37+
/**
38+
* @var MagentoDataHelper
39+
*/
40+
private $magentoDataHelper;
41+
42+
/**
43+
* ViewContent constructor
44+
*
45+
* @param Context $context
46+
* @param FBEHelper $fbeHelper
47+
* @param MagentoDataHelper $magentoDataHelper
48+
* @param SystemConfig $systemConfig
49+
* @param Escaper $escaper
50+
* @param CheckoutSession $checkoutSession
51+
* @param array $data
52+
*/
53+
public function __construct(
54+
Context $context,
55+
FBEHelper $fbeHelper,
56+
MagentoDataHelper $magentoDataHelper,
57+
SystemConfig $systemConfig,
58+
Escaper $escaper,
59+
CheckoutSession $checkoutSession,
60+
array $data = []
61+
) {
62+
parent::__construct(
63+
$context,
64+
$fbeHelper,
65+
$magentoDataHelper,
66+
$systemConfig,
67+
$escaper,
68+
$checkoutSession,
69+
$data
70+
);
71+
$this->fbeHelper = $fbeHelper;
72+
$this->magentoDataHelper = $magentoDataHelper;
73+
}
74+
2575
/**
2676
* Return content ids
2777
*

‎app/code/Meta/Conversion/Helper/ServerSideHelper.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ class ServerSideHelper
3333
/**
3434
* @var FBEHelper
3535
*/
36-
protected $fbeHelper;
36+
private $fbeHelper;
3737

3838
/**
3939
* @var AAMFieldsExtractorHelper
4040
*/
41-
protected $aamFieldsExtractorHelper;
41+
private $aamFieldsExtractorHelper;
4242

4343
/**
4444
* @var array
4545
*/
46-
protected $trackedEvents = [];
46+
private $trackedEvents = [];
4747

4848
/**
4949
* @var SystemConfig
5050
*/
51-
protected $systemConfig;
51+
private $systemConfig;
5252

5353
/**
5454
* Constructor

‎app/code/Meta/Conversion/Observer/AddToCart.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,17 @@ class AddToCart implements ObserverInterface
3232
/**
3333
* @var FBEHelper
3434
*/
35-
protected $fbeHelper;
35+
private $fbeHelper;
3636

3737
/**
3838
* @var MagentoDataHelper
3939
*/
40-
protected $magentoDataHelper;
40+
private $magentoDataHelper;
4141

4242
/**
4343
* @var ServerSideHelper
4444
*/
45-
protected $serverSideHelper;
45+
private $serverSideHelper;
4646

4747
/**
4848
* @var ServerEventFactory
@@ -52,7 +52,7 @@ class AddToCart implements ObserverInterface
5252
/**
5353
* @var RequestInterface
5454
*/
55-
protected $request;
55+
private $request;
5656

5757
/**
5858
* @var Escaper

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "Meta Business Extension Conversion module",
44
"type": "magento2-module",
55
"require": {
6-
"php": "~7.4.0||~8.1.0",
6+
"php": "~8.1.0||~8.2.0",
77
"magento/framework": "*",
88
"magento/module-catalog": "*",
99
"magento/module-configurable-product": "*",

0 commit comments

Comments
 (0)