diff --git a/README.md b/README.md index 798d7fe1..bd116966 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,7 @@ For those of you who would prefer to work over these results in a GUI rather tha | WARN | Preference | vendor/magento/module-advanced-pricing-import-export/Model/Export/AdvancedPricing.php | Ampersand\Test\Model\Admin\Export\AdvancedPricing | | WARN | Preference | vendor/magento/module-weee/Model/Total/Quote/Weee.php | Ampersand\Test\Model\Frontend\Total\Quote\Weee | | WARN | Preference | vendor/magento/module-weee/Model/Total/Quote/Weee.php | Ampersand\Test\Model\Total\Quote\Weee | +| WARN | Redundant Override | vendor/ampersand/some-nice-theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+----------------------------------------------------------------------------------------------+---------------------------------------------------------------------------------------------+ WARN count: 18 INFO count: 381 (to view re-run this tool with --show-info) diff --git a/dev/phpunit/functional/expected_output/magentom23.out.txt b/dev/phpunit/functional/expected_output/magentom23.out.txt index dc7f8ce6..e4615ae7 100644 --- a/dev/phpunit/functional/expected_output/magentom23.out.txt +++ b/dev/phpunit/functional/expected_output/magentom23.out.txt @@ -63,7 +63,9 @@ | 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/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 62 +WARN count: 63 INFO count: 309 (to view re-run this tool with --show-info) +IGNORE count: 1 (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 434277a7..e7a08afe 100644 --- a/dev/phpunit/functional/expected_output/magentom23VendorNamespaces.out.txt +++ b/dev/phpunit/functional/expected_output/magentom23VendorNamespaces.out.txt @@ -64,7 +64,9 @@ | 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/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: 314 (to view re-run this tool with --show-info) +IGNORE count: 1 (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 d78c5d11..b5e9fb9e 100644 --- a/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt @@ -59,7 +59,9 @@ | 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/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 58 +WARN count: 59 INFO count: 395 (to view re-run this tool with --show-info) +IGNORE count: 1 (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 3714f5dc..290c13c0 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/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 | | INFO | DB schema added | vendor/magento/module-customer/etc/db_schema.xml | customer_group_excluded_website | @@ -454,7 +455,9 @@ | 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/theme/Magento_Ui/web/templates/ignore.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/ignore.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 58 +WARN count: 59 INFO count: 395 +IGNORE count: 1 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 87202110..c60cd6e1 100644 --- a/dev/phpunit/functional/expected_output/magentom24.out.txt +++ b/dev/phpunit/functional/expected_output/magentom24.out.txt @@ -57,7 +57,9 @@ | 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/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ -WARN count: 56 +WARN count: 57 INFO count: 395 (to view re-run this tool with --show-info) +IGNORE count: 1 (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 7a3e0964..3807a4c0 100644 --- a/dev/phpunit/functional/expected_output/magentom2451-nodb.out.txt +++ b/dev/phpunit/functional/expected_output/magentom2451-nodb.out.txt @@ -59,7 +59,9 @@ | 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/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ WARN count: 58 INFO count: 384 (to view re-run this tool with --show-info) +IGNORE count: 1 (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 77591295..5b43cc74 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/theme/Magento_Ui/web/templates/redundant.html | app/design/frontend/Ampersand/theme/Magento_Ui/web/templates/redundant.html | +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+ Outputting diff commands below phpstorm diff vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml vendor/ampersand/upgrade-patch-helper-test-hyva-theme-extended/theme/Magento_Customer/templates/account/dashboard/info.phtml vendor_orig/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/Magento_Customer/templates/account/dashboard/info.phtml @@ -75,6 +76,7 @@ phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magent 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-stub/theme/Magento_Checkout/templates/cart/form.phtml vendor_orig/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/templates/cart/form.phtml phpstorm diff vendor/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/templates/cart/form.phtml app/design/frontend/Ampersand/theme/Magento_Checkout/templates/cart/form.phtml vendor_orig/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Checkout/templates/cart/form.phtml phpstorm diff vendor/magento/framework/Locale/Format.php app/code/Ampersand/Test/Model/Locale/Format.php vendor_orig/magento/framework/Locale/Format.php +phpstorm diff 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 vendor_orig/ampersand/upgrade-patch-helper-test-module/src/theme/Magento_Ui/web/templates/redundant.html phpstorm diff vendor/magento/module-advanced-pricing-import-export/Model/Export/AdvancedPricing.php app/code/Ampersand/Test/Model/Admin/Export/AdvancedPricing.php vendor_orig/magento/module-advanced-pricing-import-export/Model/Export/AdvancedPricing.php phpstorm diff vendor/magento/module-catalog/view/frontend/layout/catalog_category_view.xml app/design/frontend/Ampersand/theme/Magento_Catalog/layout/catalog_category_view.xml vendor_orig/magento/module-catalog/view/frontend/layout/catalog_category_view.xml phpstorm diff vendor/magento/module-catalog-widget/view/frontend/templates/product/widget/content/grid.phtml app/design/frontend/Ampersand/theme/Magento_CatalogWidget/templates/product/widget/content/grid.phtml vendor_orig/magento/module-catalog-widget/view/frontend/templates/product/widget/content/grid.phtml @@ -104,6 +106,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: 58 +WARN count: 59 INFO count: 395 (to view re-run this tool with --show-info) +IGNORE count: 1 (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