Merge pull request #122 from convenient/patch-1

Test 2.4.7-p3
AmpersandHQ · Nov 11, 2024 · 19c4fbb · 19c4fbb
2 parents e1de43f + 46b7eb4
commit 19c4fbb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Helper scripts to aid upgrading magento 2 websites, or when upgrading a magento
 
 [![Build Status](https://travis-ci.org/AmpersandHQ/ampersand-magento2-upgrade-patch-helper.svg?branch=master)](https://app.travis-ci.com/github/AmpersandHQ/ampersand-magento2-upgrade-patch-helper)
 
-This tool looks for files which have been modified as part of an upgrade and highlights any overrides for those specific files in your magento instance. This allows you to focus in on only the things that have changed, and gives you an actionable list of things to review specifically for your site.
+This tool looks for files which have been modified as part of an upgrade and highlights any overrides for those specific files in your magento instance. This allows you to focus in on only the things that have changed, and gives you an actionable list of things to review specifically for your site. 
 
 This tool does a number of checks split into three categories
 - `WARN` - Warning level items are something that you should review and often require direct code changes. Something you or a third party have customised may need adjustment or no longer be valid based on the upgraded codebase.

diff --git a/dev/Docker/docker-compose.yml b/dev/Docker/docker-compose.yml
@@ -58,8 +58,8 @@ services:
       - PHP_FROM=7.2.34
       - MAGE_FROM=2.3.5
       - COMPOSER_TO=composer2
-      - PHP_TO=8.2.2
-      - MAGE_TO=2.4.7-beta1
+      - PHP_TO=8.3.0
+      - MAGE_TO=2.4.7-p3
       - NODB=1
       - FUNCTIONAL_TESTS_EXCLUDE_GROUP=v22,v23,v24,v2451nodb
   m24:
@@ -80,8 +80,8 @@ services:
       - PHP_FROM=7.2.34
       - MAGE_FROM=2.3.5
       - COMPOSER_TO=composer2
-      - PHP_TO=8.2.2
-      - MAGE_TO=2.4.7-beta1
+      - PHP_TO=8.3.0
+      - MAGE_TO=2.4.7-p3
       - NODB=0
       - FUNCTIONAL_TESTS_EXCLUDE_GROUP=v22,v23,v24nodb,v2451nodb
   m23:

diff --git a/dev/TestHyvaFallbackTheme/theme/etc/view.xml b/dev/TestHyvaFallbackTheme/theme/etc/view.xml
@@ -292,7 +292,7 @@
         <item type="directory">Lib::varien</item>
         <item type="directory">Lib::jquery/editableMultiselect</item>
         <item type="directory">Lib::jquery/jstree</item>
-        <item type="directory">Lib::jquery/fileUploader</item>
+        <item type="directory">Lib::jquery/uppy</item>
         <item type="directory">Lib::css</item>
         <item type="directory">Lib::lib</item>
         <item type="directory">Lib::extjs</item>

diff --git a/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt b/dev/phpunit/functional/expected_output/magentom24-nodb.out.txt
@@ -68,6 +68,6 @@
 | WARN  | Redundant Override       | vendor/paypal/module-braintree-core/view/base/web/js/form-builder.js                                                               | vendor/paypal/module-braintree-core/view/frontend/web/js/form-builder.js                                                           |
 +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 WARN count: 65
-INFO count: 395 (to view re-run this tool with --show-info)
+INFO count: 396 (to view re-run this tool with --show-info)
 IGNORE count: 7 (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
diff --git a/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt b/dev/phpunit/functional/expected_output/magentom24-show-info.out.txt
@@ -439,6 +439,7 @@
 | INFO  | DB schema changed        | vendor/magento/module-wishlist/etc/db_schema.xml                                                                                   | wishlist_item_option                                                                                                               |
 | INFO  | DB schema removed        | vendor/ampersand/upgrade-patch-helper-test-module-to-be-removed/src/module/etc/db_schema.xml                                       | some_removed_table                                                                                                                 |
 | INFO  | Queue consumer added     | vendor/magento/module-async-config/etc/queue_consumer.xml                                                                          | saveConfigProcessor                                                                                                                |
+| INFO  | Queue consumer added     | vendor/magento/module-catalog/etc/queue_consumer.xml                                                                               | catalog_website_attribute_value_sync                                                                                               |
 | INFO  | Queue consumer added     | vendor/magento/module-inventory-indexer/etc/queue_consumer.xml                                                                     | inventory.indexer.sourceItem                                                                                                       |
 | INFO  | Queue consumer added     | vendor/magento/module-inventory-indexer/etc/queue_consumer.xml                                                                     | inventory.indexer.stock                                                                                                            |
 | INFO  | Queue consumer added     | vendor/magento/module-inventory-indexer/etc/queue_consumer.xml                                                                     | inventory.reservations.updateSalabilityStatus                                                                                      |
@@ -470,6 +471,6 @@
 | IGNR  | Preference               | vendor/ampersand/upgrade-patch-helper-test-module/src/module/Model/ToPreferenceAndIgnore.php                                       | Ampersand\Test\Model\ToPreferenceAndIgnore                                                                                         |
 +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 WARN count: 65
-INFO count: 395
+INFO count: 396
 IGNORE count: 7
 For docs on each check see https://github.com/AmpersandHQ/ampersand-magento2-upgrade-patch-helper/blob/master/docs/CHECKS_AVAILABLE.md
diff --git a/dev/phpunit/functional/expected_output/magentom24.out.txt b/dev/phpunit/functional/expected_output/magentom24.out.txt
@@ -66,6 +66,6 @@
 | WARN  | Redundant Override       | vendor/paypal/module-braintree-core/view/base/web/js/form-builder.js                                                               | vendor/paypal/module-braintree-core/view/frontend/web/js/form-builder.js                                                           |
 +-------+--------------------------+------------------------------------------------------------------------------------------------------------------------------------+------------------------------------------------------------------------------------------------------------------------------------+
 WARN count: 63
-INFO count: 395 (to view re-run this tool with --show-info)
+INFO count: 396 (to view re-run this tool with --show-info)
 IGNORE count: 7 (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
diff --git a/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt b/dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt
@@ -115,6 +115,6 @@ phpstorm diff vendor/magento/theme-frontend-luma/etc/view.xml vendor/ampersand/u
 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: 65
-INFO count: 395 (to view re-run this tool with --show-info)
+INFO count: 396 (to view re-run this tool with --show-info)
 IGNORE count: 7 (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