diff --git a/dev/Docker/setup-magento-with-diff.sh b/dev/Docker/setup-magento-with-diff.sh index 87b18229..156c6565 100755 --- a/dev/Docker/setup-magento-with-diff.sh +++ b/dev/Docker/setup-magento-with-diff.sh @@ -117,9 +117,11 @@ echo "

some change

" >> vendor/magento/module-ui/view/base/web/tem # Redundant override echo " " >> vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html +echo " " >> vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html # Ignored change echo "" >> vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/ignore.html +echo "" >> vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/ignore.html echo "#" >> vendor/magento/module-customer/view/frontend/web/js/model/authentication-popup.js diff --git a/dev/TestModule/app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/ignore.html b/dev/TestModule/app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/ignore.html new file mode 100644 index 00000000..62bc0511 --- /dev/null +++ b/dev/TestModule/app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/ignore.html @@ -0,0 +1 @@ +

some override

\ No newline at end of file diff --git a/dev/TestModule/app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html b/dev/TestModule/app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html new file mode 100644 index 00000000..1e32d208 --- /dev/null +++ b/dev/TestModule/app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html @@ -0,0 +1,10 @@ +
+ + +

redundant

+ + + + + +
\ No newline at end of file diff --git a/dev/TestVendorModule/src/module/view/frontend/email/ignore.html b/dev/TestVendorModule/src/module/view/frontend/email/ignore.html new file mode 100644 index 00000000..f6fdeaea --- /dev/null +++ b/dev/TestVendorModule/src/module/view/frontend/email/ignore.html @@ -0,0 +1 @@ +

ignore this

\ No newline at end of file diff --git a/dev/TestVendorModule/src/module/view/frontend/email/redundant.html b/dev/TestVendorModule/src/module/view/frontend/email/redundant.html new file mode 100644 index 00000000..ba296549 --- /dev/null +++ b/dev/TestVendorModule/src/module/view/frontend/email/redundant.html @@ -0,0 +1,5 @@ +
+ + +

redundant

+
\ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom23.out.txt b/dev/phpunit/functional/expected_output/magentom23.out.txt index e4615ae7..0320a879 100644 --- a/dev/phpunit/functional/expected_output/magentom23.out.txt +++ b/dev/phpunit/functional/expected_output/magentom23.out.txt @@ -63,9 +63,10 @@ | WARN | Preference | vendor/magento/module-authorizenet/Model/Directpost.php | Ampersand\Test\Model\WebApiSoap\Directpost | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete | +| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html | | WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 63 +WARN count: 64 INFO count: 309 (to view re-run this tool with --show-info) -IGNORE count: 1 (to view re-run this tool with --show-ignore) +IGNORE count: 2 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom23VendorNamespaces.out.txt b/dev/phpunit/functional/expected_output/magentom23VendorNamespaces.out.txt index e7a08afe..21db3ca0 100644 --- a/dev/phpunit/functional/expected_output/magentom23VendorNamespaces.out.txt +++ b/dev/phpunit/functional/expected_output/magentom23VendorNamespaces.out.txt @@ -64,9 +64,10 @@ | WARN | Preference | vendor/magento/module-authorizenet/Model/Directpost.php | Ampersand\Test\Model\WebApiSoap\Directpost | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete | +| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html | | WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 64 +WARN count: 65 INFO count: 314 (to view re-run this tool with --show-info) -IGNORE count: 1 (to view re-run this tool with --show-ignore) +IGNORE count: 2 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt b/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt index b5e9fb9e..82d0a130 100644 --- a/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt @@ -59,9 +59,10 @@ | WARN | Preference | vendor/magento/module-weee/Model/Total/Quote/Weee.php | Ampersand\Test\Model\WebApiSoap\Total\Quote\Weee | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete | +| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html | | WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 59 +WARN count: 60 INFO count: 395 (to view re-run this tool with --show-info) -IGNORE count: 1 (to view re-run this tool with --show-ignore) +IGNORE count: 2 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt b/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt index 290c13c0..c1ca7f65 100644 --- a/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt @@ -59,6 +59,7 @@ | WARN | Preference | vendor/magento/module-weee/Model/Total/Quote/Weee.php | Ampersand\Test\Model\WebApiSoap\Total\Quote\Weee | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete | +| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html | | WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | | INFO | DB schema added | vendor/magento/module-admin-adobe-ims/etc/db_schema.xml | admin_adobe_ims_webapi | | INFO | DB schema added | vendor/magento/module-catalog/etc/db_schema.xml | catalog_compare_list | @@ -455,9 +456,10 @@ | INFO | Setup Patch Data | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Setup/Patch/Data/SomeDataChanges.php | Ampersand\TestVendor\Setup\Patch\Data\SomeDataChanges | | INFO | Setup Patch Schema | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Setup/Patch/Schema/SomeSchemaChanges.php | Ampersand\TestVendor\Setup\Patch\Schema\SomeSchemaChanges | | INFO | Setup Script | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Setup/InstallSchema.php | Ampersand\TestVendor\Setup\InstallSchema | +| IGNR | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/ignore.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/ignore.html | | IGNR | Override (phtml/js/html) | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/ignore.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/ignore.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 59 +WARN count: 60 INFO count: 395 -IGNORE count: 1 +IGNORE count: 2 For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom24.out.txt b/dev/phpunit/functional/expected_output/magentom24.out.txt index c60cd6e1..616dfff6 100644 --- a/dev/phpunit/functional/expected_output/magentom24.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24.out.txt @@ -57,9 +57,10 @@ | WARN | Preference | vendor/magento/module-weee/Model/Total/Quote/Weee.php | Ampersand\Test\Model\WebApiSoap\Total\Quote\Weee | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete | +| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html | | WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 57 +WARN count: 58 INFO count: 395 (to view re-run this tool with --show-info) -IGNORE count: 1 (to view re-run this tool with --show-ignore) +IGNORE count: 2 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom2451-nodb.out.txt b/dev/phpunit/functional/expected_output/magentom2451-nodb.out.txt index ccb2fdad..45f71d59 100644 --- a/dev/phpunit/functional/expected_output/magentom2451-nodb.out.txt +++ b/dev/phpunit/functional/expected_output/magentom2451-nodb.out.txt @@ -59,9 +59,10 @@ | WARN | Preference | vendor/magento/module-weee/Model/Total/Quote/Weee.php | Ampersand\Test\Model\WebApiSoap\Total\Quote\Weee | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete | +| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html | | WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 59 +WARN count: 60 INFO count: 384 (to view re-run this tool with --show-info) -IGNORE count: 1 (to view re-run this tool with --show-ignore) +IGNORE count: 2 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt b/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt index e8451ac5..6d0b8ad2 100644 --- a/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt @@ -59,6 +59,7 @@ | WARN | Preference | vendor/magento/module-weee/Model/Total/Quote/Weee.php | Ampersand\Test\Model\WebApiSoap\Total\Quote\Weee | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php | Ampersand\Test\Model\ToPreferenceAndDelete | | WARN | Preference Removed | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php | Ampersand\Test\Model\ToPreferenceAndExtendAndDelete | +| WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html | app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html | | WARN | Redundant Override | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ Outputting diff commands below @@ -70,6 +71,7 @@ phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/module/Api/E phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/SomeClass.php app/code/Ampersand/Test/Model/ThirdPartyClass.php vendor_orig/ampersand/upgrade-patch-helper-test-module/src/module/Model/SomeClass.php phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php app/code/Ampersand/Test/Model/ToPreferenceAndDelete.php vendor_orig/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndDelete.php phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php Ampersand\Test\Model\ToPreferenceAndExtendAndDelete vendor_orig/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndExtendAndDelete.php +phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html app/design/frontend/Ampersand/theme/Ampersand_TestVendor/email/redundant.html vendor_orig/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/email/redundant.html phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/templates/checkout/something.phtml vendor/ampersand/upgrade-patch-helper-test-hyva-theme-extended/theme/Ampersand_TestVendor/templates/checkout/something.phtml vendor_orig/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/templates/checkout/something.phtml phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/templates/checkout/something.phtml app/design/frontend/Ampersand/theme/Ampersand_TestVendor/templates/checkout/something.phtml vendor_orig/ampersand/upgrade-patch-helper-test-module/src/module/view/frontend/templates/checkout/something.phtml phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/templates/cart/form.phtml vendor/ampersand/upgrade-patch-helper-test-hyva-theme-extended/theme/Magento_Checkout/templates/cart/form.phtml vendor_orig/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/templates/cart/form.phtml @@ -106,7 +108,7 @@ phpstorm diff vendor/magento/theme-frontend-luma/Magento_Sales/email/order_new.h phpstorm diff vendor/magento/theme-frontend-luma/etc/view.xml vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/etc/view.xml vendor_orig/magento/theme-frontend-luma/etc/view.xml phpstorm diff vendor/magento/theme-frontend-luma/etc/view.xml vendor/ampersand/upgrade-patch-helper-test-module/src/theme/etc/view.xml vendor_orig/magento/theme-frontend-luma/etc/view.xml phpstorm diff vendor/paypal/module-braintree-core/view/base/web/js/form-builder.js vendor/paypal/module-braintree-core/view/frontend/web/js/form-builder.js vendor_orig/paypal/module-braintree-core/view/base/web/js/form-builder.js -WARN count: 59 +WARN count: 60 INFO count: 395 (to view re-run this tool with --show-info) -IGNORE count: 1 (to view re-run this tool with --show-ignore) +IGNORE count: 2 (to view re-run this tool with --show-ignore) For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md \ No newline at end of file diff --git a/src/Ampersand/PatchHelper/Checks/EmailTemplateHtml.php b/src/Ampersand/PatchHelper/Checks/EmailTemplateHtml.php index 46ad423e..329b3b59 100644 --- a/src/Ampersand/PatchHelper/Checks/EmailTemplateHtml.php +++ b/src/Ampersand/PatchHelper/Checks/EmailTemplateHtml.php @@ -49,7 +49,13 @@ function ($potentialFilePath) use ($module, $templatePart) { foreach ($potentialOverrides as $override) { if (!str_ends_with($override, $this->patchEntry->getPath())) { - $this->warnings[Checks::TYPE_FILE_OVERRIDE][] = $override; + if ($this->patchEntry->isRedundantOverride($override)) { + $this->warnings[Checks::TYPE_REDUNDANT_OVERRIDE][] = $override; + } elseif ($this->patchEntry->vendorChangeIsNotMeaningful()) { + $this->ignored[Checks::TYPE_FILE_OVERRIDE][] = $override; + } else { + $this->warnings[Checks::TYPE_FILE_OVERRIDE][] = $override; + } } } }