Upstream Merge Conflict (2.4-develop) (#103)

* ACQE-6901: Create Text Swatch from Stores ->Attributes section: Product Added an element and updated test file * AC-12823:Investigate the unit test failure due to phpunit patch update during component upgrade-Fix unit tests * LYNX-523: GraphQL: Provide available order actions * ACP2E-3149: Double slashes in customer segment URL * ACQE-6897 | Mainline Deployment Test Fix * ACQE-6897 | Mainline Deployment Test Annotation fix * ACQE-6897 | Mainline PR Deployment | mftf update * AC-12823:Investigate the unit test failure due to phpunit patch update during component upgrade-Fix unit tests * ACQE-6915 | Several Terms and Conditions with different types are shown on PayPal express checkout review page * ACQE-6915 | Several Terms and Conditions with different types are shown on PayPal express checkout review page Added fix for the PR * ACQE-6915 | Several Terms and Conditions with different types are shown on PayPal express checkout review page Added fix for the PR * ACQE-6901: Create Text Swatch from Stores ->Attributes section: Product Created AGs and updated those in test file * AC-12823:Investigate the unit test failure due to phpunit patch update during component upgrade-Fix unit tests * ACQE-6901: Create Text Swatch from Stores ->Attributes section: Product Updated test file * ACQE-6897 | Mainline Deployment * LYNX-524 - Add customer information to CustomerOrder type * ACQE-6897 | Mainline Deployment * AC-12823:Investigate the unit test failure due to phpunit patch update during component upgrade-Fix unit tests * ACP2E-3172: Import button missing * ACP2E-3273: avoid using toggle / fadeIn / fadeOut as it will generate a display none and this in turn impacts the styling for recaptcha * AC-12715::Investigate the laminas composer dependencies upgrading to latest version * ACQE-6901: Create Text Swatch from Stores ->Attributes section: Product Removed extra space in AG and added valuable name parameter for a locator * ACQE-6897 | Mainline Deployment * ACQE-6897 | Mainline Deployment * ACQE-6897 | Mainline Deployment * ACQE-6897 | Mainline Deployment * AC-12092_PHPUnit10: Providing invalid named argument is deprecated and will not be supported in PHPUnit 11.0 * AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999) * LYNX-505 - Allow guest to cancel order via GraphQL * AC-12092_PHPUnit10: Providing invalid named argument is deprecated and will not be supported in PHPUnit 11.0 * ACP2E-3273: fix static errors * ACP2E-3273: update short description * AC-12823:Investigate the unit test failure due to phpunit patch update during component upgrade-Fix unit tests * ACQE-6842 | AC-3857: Verify that customer matches to a segment with conditions "Order Address" Resolved static check error by updating the name * ACQE-6842 | AC-3857: Verify that customer matches to a segment with conditions "Order Address" * AC-12092_PHPUnit10: Providing invalid named argument is deprecated and will not be supported in PHPUnit 11.0 * AC-3921: Create Text Swatch from Stores ->Attributes section: Product * ACQE-6915 | StorefrontAssertSeveralTermsAndConditionsOnPayPalExpressCheckoutReviewPageTest * ACQE-6842 | AC-3857: Verify that customer matches to a segment with conditions "Order Address" * AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions * AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions * AC-12823: Unit Test fixes * AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999) * AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999) * AC-12823:Investigate the unit test failure due to phpunit patch update during component upgrade-Fix unit tests * AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999) * AC-12823: Unit Test fixes * AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions * AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999) * AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999) * AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions * AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions * AC-9712::Difference in less compilation between php & nodejs library * AC-12715::fixed the static test * AC-12715::Investigate the laminas composer dependencies upgrading to latest version * AC-12715::Investigate the laminas composer dependencies upgrading to latest version * AC-12823:Investigate the unit test failure due to phpunit patch update during component upgrade-Fix unit tests * AC-12092_PHPUnit10: Providing invalid named argument is deprecated and will not be supported in PHPUnit 11 * AC-12715::Investigate the laminas composer dependencies upgrading to latest version * ACP2E-3273: added jasmine unit test * AC-12901: Require.js upgrade to the latest version 2.3.7 (security vulnerability CVE-2024-38999) * AC-12092: Deprecations related to not static functionality removal in PHPUnit 10 * ACP2E-3273: emulate 'display:none' better avoiding extra white space * ACP2E-3172: Import button missing * ACQE-6897 | Mainline Deployment Test Fix * ACQE-6897 | Mainline Deployment Test Fix * ACQE-6897 | Mainline Deployment * ACQE-6897 | Mainline Deployment Removed extra spaces * ACQE-6897 | Mainline Deployment Space fix * ACQE-6897 | Mainline PR Deployment Alignment Fix * ACQE-6897 | Mainline Deployment Removed space * AC-12092_PHPUnit10: Providing invalid named argument is deprecated and will not be supported in PHPUnit 11. * ACQE-6966 | [MFTF PR TESTS] StorefrontCashOnDeliveryPaymentForSpecificCountryTestCest Added pr_exclude . Will be fixed in the scope of ACQE-6966 * ACQE-6795 | Mainline PR deployment Added pr_exclude .Will be fixed in the scope of ACQE-6795 * AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions * AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions * ACP2E-3172: Import button missing * ACP2E-3172: Import button missing * AC-9712::Difference in less compilation between php & nodejs library (grunt) with complicated calc expressions * ACP2E-3131: [Cloud] Anchor/Non-Anchor Categories Reversed in Content Widget - Fix for default category * AC-12092 Magento Framework PHPUnit10 Fixes * LYNX-512: original_item_price is not including discounts * LYNX-519 : Error codes for order cancellation * Check impact of paste and noeditable plugin removal * Acqe 7010 mftf thirdparty test pr exclude (#1744) * ACQE-7010: [MFTF Tests] Add payment related third party test in pr exclude * AC-12715::Update the magento-coding-standard version * Check impact of paste and noeditable plugin removal * AC-12951::Remove from files from tinymce 7 * AC-12092_PHPUnit10: PHPUnit10 Fixes for Magento Framework Modules * ACP2E-3131: [Cloud] Anchor/Non-Anchor Categories Reversed in Content Widget - Fix for default category * ACP2E-3131: [Cloud] Anchor/Non-Anchor Categories Reversed in Content Widget - Fix for default category * AC-12092_PHPUnit10: Providing invalid named argument is deprecated and will not be supported in PHPUnit 11. * AC-12092_PHPUnit10: PHPUnit10.5 Deprecation Fixes Framework App, Cache, Code, Validator Modules * AC-12092_PHPUnit10: PHP Unit 10 Deprecation Fixes For Framework DB, Data, Encryption, Profiler, Validator Modules * LYNX-536:orders/date_of_first_order always returning null * LYNX-544: Customer must not be able to cancel a partially shipped order * ACP2E-3248: update en_US.csv with missing translatable lines * AC-12092_PHPUnit10: PHP Unit10 Deprecation Fixes for Framework Code, Jwt and Test Modules * AC-12092_PHPUnit10: phpcs issue fix * AC-12092_PHPUnit10: PHPUnit Error fix * AC-12092_PHPUnit10: Not Static Deprecation Fixes forWidget Module * AC-12092_PHPUnit10: Fixed Risky testcase issues * AC-12092_PHPUnit10: PHPUnit Deprecation Error Fixes * AC-12092_PHPUnit10: Failure Fix for CatalogInventory Module * Revert "AC-12092_PHPUnit10: Fixed Risky testcase issues" This reverts commit c3b7947. * AC-12092_PHPUnit10: PHPUnit Failure fix --------- Co-authored-by: Shanthi Rajendran <[email protected]> Co-authored-by: Banvari Lal <[email protected]> Co-authored-by: jayrangnani-gl <[email protected]> Co-authored-by: magento-devops-queue-mgr-svc <[email protected]> Co-authored-by: Abhishek Pathak <[email protected]> Co-authored-by: Sergio Vera <[email protected]> Co-authored-by: lakshmana49 <[email protected]> Co-authored-by: Dnyaneshwar Jambhulkar <[email protected]> Co-authored-by: Arularasan <[email protected]> Co-authored-by: Manjusha S <[email protected]> Co-authored-by: manjusha729 <[email protected]> Co-authored-by: Rajesh Kumar <[email protected]> Co-authored-by: “Pavan-bj” <[email protected]> Co-authored-by: Indrani <[email protected]> Co-authored-by: Shantanu Dasgupta <[email protected]> Co-authored-by: Chhandak.Barua <[email protected]> Co-authored-by: Alexandra Zota <[email protected]> Co-authored-by: manishranjan-adobe <[email protected]> Co-authored-by: Saurabh Kumar <[email protected]> Co-authored-by: Mircea Rosmeteniuc <[email protected]> Co-authored-by: flowers <[email protected]> Co-authored-by: Pavan-bj <[email protected]> Co-authored-by: Manish Ranjan <[email protected]> Co-authored-by: Nishant Rana <[email protected]> Co-authored-by: Raj Mohan <[email protected]> Co-authored-by: Nishant Rana <[email protected]> Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com> Co-authored-by: arnsaha <[email protected]> Co-authored-by: Dmytro Voskoboinikov <[email protected]> Co-authored-by: Sumesh P <[email protected]> Co-authored-by: mohit-adobe <[email protected]> Co-authored-by: Stanislav Idolov <[email protected]> Co-authored-by: Rafal Janicki <[email protected]> Co-authored-by: Dmytro Horytskyi <[email protected]> Co-authored-by: chittima <[email protected]> Co-authored-by: cod43156 <[email protected]> Co-authored-by: Sarmistha <[email protected]> Co-authored-by: Ryan Hoerr <[email protected]>
mage-os · Oct 1, 2024 · 977f1c1 · 977f1c1
1 parent 535167b
commit 977f1c1
Show file tree

Hide file tree

Showing 2,227 changed files with 23,740 additions and 10,464 deletions.
diff --git a/app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php b/app/code/Magento/AdminAnalytics/Test/Unit/Condition/CanViewNotificationTest.php
@@ -77,7 +77,7 @@ public function testIsVisibleLoadDataFromLog($expected, $cacheResponse, $logExis
     /**
      * @return array
      */
-    public function isVisibleProvider()
+    public static function isVisibleProvider()
     {
         return [
             [true, false, false, true], // first login, no cache, config enabled

diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php
@@ -217,7 +217,7 @@ function ($initialValue, $item) use ($data) {
     /**
      * @return array
      */
-    public function checkUpdateDataProvider(): array
+    public static function checkUpdateDataProvider(): array
     {
         return [
             [

diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php
@@ -60,30 +60,37 @@ protected function setUp(): void
      * @param array $cacheTypes
      * @dataProvider getIdentityDataProvider
      */
-    public function testGetIdentity($expectedSum, $cacheTypes)
+    public function testGetIdentity($expectedSum, $types)
     {
+        $cacheType = [];
+        foreach ($types as $type) {
+            $cacheType[] = $type($this);
+        }
+
         $this->_cacheTypeListMock->method(
             'getInvalidated'
         )->willReturn(
-            $cacheTypes
+            $cacheType
         );
         $this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
     }
 
-    /**
-     * @return array
-     */
-    public function getIdentityDataProvider()
+    protected function getMockForStdClass($mockReturn)
     {
-        $cacheTypeMock1 = $this->getMockBuilder(\stdClass::class)->addMethods(['getCacheType'])
+        $cacheTypeMock = $this->getMockBuilder(\stdClass::class)->addMethods(['getCacheType'])
             ->disableOriginalConstructor()
             ->getMock();
-        $cacheTypeMock1->method('getCacheType')->willReturn('Simple');
+        $cacheTypeMock->method('getCacheType')->willReturn($mockReturn);
+        return $cacheTypeMock;
+    }
 
-        $cacheTypeMock2 = $this->getMockBuilder(\stdClass::class)->addMethods(['getCacheType'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $cacheTypeMock2->method('getCacheType')->willReturn('Advanced');
+    /**
+     * @return array
+     */
+    public static function getIdentityDataProvider()
+    {
+        $cacheTypeMock1 = static fn (self $testCase) => $testCase->getMockForStdClass('Simple');
+        $cacheTypeMock2 = static fn (self $testCase) => $testCase->getMockForStdClass('Advanced');
 
         return [
             ['c13cfaddc2c53e8d32f59bfe89719beb', [$cacheTypeMock1]],
@@ -99,24 +106,25 @@ public function getIdentityDataProvider()
      */
     public function testIsDisplayed($expected, $allowed, $cacheTypes)
     {
+        $cacheType1 = [];
+        foreach ($cacheTypes as $cacheType) {
+            $cacheType1[] = $cacheType($this);
+        }
         $this->_authorizationMock->expects($this->once())->method('isAllowed')->willReturn($allowed);
         $this->_cacheTypeListMock->method(
             'getInvalidated'
         )->willReturn(
-            $cacheTypes
+            $cacheType1
         );
         $this->assertEquals($expected, $this->_messageModel->isDisplayed());
     }
 
     /**
      * @return array
      */
-    public function isDisplayedDataProvider()
+    public static function isDisplayedDataProvider()
     {
-        $cacheTypesMock = $this->getMockBuilder(\stdClass::class)->addMethods(['getCacheType'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $cacheTypesMock->method('getCacheType')->willReturn('someVal');
+        $cacheTypesMock = static fn (self $testCase) => $testCase->getMockForStdClass('someVal');
         $cacheTypes = [$cacheTypesMock, $cacheTypesMock];
         return [
             [false, false, []],

diff --git a/...ento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php b/...ento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php
@@ -82,7 +82,7 @@ public function testIsDisplayed($expectedFirstRun, $data)
     /**
      * @return array
      */
-    public function isDisplayedDataProvider()
+    public static function isDisplayedDataProvider()
     {
         return [
             [true, ['has_errors' => 1]],

diff --git a/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php b/app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php
@@ -85,7 +85,7 @@ public function testIsDisplayed($expectedResult, $cached, $response)
     /**
      * @return array
      */
-    public function isDisplayedDataProvider()
+    public static function isDisplayedDataProvider()
     {
         return [
             'cached_case' => [false, true, ''],

diff --git a/...cedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php b/...cedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php
@@ -203,100 +203,100 @@ public static function isValidResultFalseDataProvider()
         return [
             // First if condition cases.
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => null,
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'value',
                     AdvancedPricing::COL_TIER_PRICE_QTY => 1000,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => null,
                     AdvancedPricing::COL_TIER_PRICE_QTY => 1000,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'value',
                     AdvancedPricing::COL_TIER_PRICE_QTY => null,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'value',
                     AdvancedPricing::COL_TIER_PRICE_QTY => 1000,
                     AdvancedPricing::COL_TIER_PRICE => null,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'value',
                     AdvancedPricing::COL_TIER_PRICE_QTY => 1000,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => true,
-                '$customerGroups' => [
+                'hasEmptyColumns' => true,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
             ],
             // Second if condition  cases.
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'not ALL GROUPS',
                     AdvancedPricing::COL_TIER_PRICE_QTY => 1000,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
             ],
             // Third if condition cases.
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'value',
                     AdvancedPricing::COL_TIER_PRICE_QTY => -1000,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'value',
                     AdvancedPricing::COL_TIER_PRICE_QTY => 1000,
                     AdvancedPricing::COL_TIER_PRICE => -1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
             ],
@@ -311,45 +311,45 @@ public static function isValidAddMessagesCallDataProvider()
         return [
             // First if condition cases.
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => null,
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'value',
                     AdvancedPricing::COL_TIER_PRICE_QTY => 1000,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
-                '$expectedMessages' => [Validator::ERROR_TIER_DATA_INCOMPLETE],
+                'expectedMessages' => [Validator::ERROR_TIER_DATA_INCOMPLETE],
             ],
             // Second if condition cases.
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'not ALL GROUPS',
                     AdvancedPricing::COL_TIER_PRICE_QTY => 1000,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
-                '$expectedMessages' => [Validator::ERROR_INVALID_TIER_PRICE_GROUP],
+                'expectedMessages' => [Validator::ERROR_INVALID_TIER_PRICE_GROUP],
             ],
             // Third if condition cases.
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'value',
                     AdvancedPricing::COL_TIER_PRICE_CUSTOMER_GROUP => 'value',
                     AdvancedPricing::COL_TIER_PRICE_QTY => -1000,
                     AdvancedPricing::COL_TIER_PRICE => 1000,
                 ],
-                '$hasEmptyColumns' => null,
-                '$customerGroups' => [
+                'hasEmptyColumns' => null,
+                'customerGroups' => [
                     'value' => 'value'
                 ],
-                '$expectedMessages' => [Validator::ERROR_INVALID_TIER_PRICE_QTY],
+                'expectedMessages' => [Validator::ERROR_INVALID_TIER_PRICE_QTY],
             ],
         ];
     }

diff --git a/...ancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php b/...ancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php
@@ -137,55 +137,55 @@ public static function isValidReturnDataProvider()
         return [
             // False cases.
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'tier value',
                     AdvancedPricing::COL_TIER_PRICE => 'value',
                 ],
-                '$allWebsites' => 'not tier|group price website value',
-                '$colTierPriceWebsite' => false,
-                '$expectedResult' => false,
+                'allWebsites' => 'not tier|group price website value',
+                'colTierPriceWebsite' => false,
+                'expectedResult' => false,
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'tier value',
                     AdvancedPricing::COL_TIER_PRICE => 'tier value',
                 ],
-                '$allWebsites' => 'not tier|group price website value',
-                '$colTierPriceWebsite' => false,
-                '$expectedResult' => false,
+                'allWebsites' => 'not tier|group price website value',
+                'colTierPriceWebsite' => false,
+                'expectedResult' => false,
             ],
             // True cases.
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'tier value',
                 ],
-                '$allWebsites' => 'tier value',
-                '$colTierPriceWebsite' => 'value',
-                '$expectedResult' => true,
+                'allWebsites' => 'tier value',
+                'colTierPriceWebsite' => 'value',
+                'expectedResult' => true,
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'tier value',
                 ],
-                '$allWebsites' => 'group value',
-                '$colTierPriceWebsite' => 'value',
-                '$expectedResult' => true,
+                'allWebsites' => 'group value',
+                'colTierPriceWebsite' => 'value',
+                'expectedResult' => true,
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => false,
                 ],
-                '$allWebsites' => 'not tier|group price website value',
-                '$colTierPriceWebsite' => 'value',
-                '$expectedResult' => true,
+                'allWebsites' => 'not tier|group price website value',
+                'colTierPriceWebsite' => 'value',
+                'expectedResult' => true,
             ],
             [
-                '$value' => [
+                'value' => [
                     AdvancedPricing::COL_TIER_PRICE_WEBSITE => 'tier value',
                 ],
-                '$allWebsites' => 'not tier|group price website value',
-                '$colTierPriceWebsite' => 'value',
-                '$expectedResult' => true,
+                'allWebsites' => 'not tier|group price website value',
+                'colTierPriceWebsite' => 'value',
+                'expectedResult' => true,
             ],
         ];
     }

diff --git a/...ento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php b/...ento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php
@@ -88,12 +88,12 @@ public static function isValidDataProvider()
     {
         return [
             [
-                '$validatorResult' => true,
-                '$expectedResult' => true,
+                'validatorResult' => true,
+                'expectedResult' => true,
             ],
             [
-                '$validatorResult' => false,
-                '$expectedResult' => false,
+                'validatorResult' => false,
+                'expectedResult' => false,
             ]
         ];
     }