Skip to content

Comments

Split Magento and Mage-OS versions in ProductMetadata for compatibility#115

Merged
fballiano merged 5 commits intomage-os:release/1.xfrom
rhoerr:feat/getversion-compatibility
Jan 28, 2025
Merged

Split Magento and Mage-OS versions in ProductMetadata for compatibility#115
fballiano merged 5 commits intomage-os:release/1.xfrom
rhoerr:feat/getversion-compatibility

Conversation

@rhoerr
Copy link
Contributor

@rhoerr rhoerr commented Jan 13, 2025

Description (*)

Some extensions use version comparison in Magento to determine what code to run. This is a problem for Mage-OS, where we replace Magento's getVersion() number (IE 2.4.7) with the Mage-OS version (IE 1.0.5), which makes some extensions think it's an old version of Magento and run old incompatible code.

The idea here is:

  • Magento gets the version from composer.lock for magento/product-community-edition, via https://github.com/rhoerr/mageos-magento2/blob/7bed30c9ea2b6e31130d4cead3e191871fb9b98e/lib/internal/Magento/Framework/App/ProductMetadata.php#L118
  • Mage-OS replaces that version number during our existing build/release process.
  • To fix it, we change getVersion to return the equivalent Magento version, and add a separate method to get the Mage-OS version.
  • feat: add upstream version to metapackage composer.json for runtime use generate-mirror-repo-js#189 will store the upstream version as extra.magento_version on the product metapackage composer JSON, which is stored in composer.lock and already read by Magento.
  • getVersion() (via getSystemPackageVersion()) is changed to read that upstream version (like 2.4.7-p3), for intercompatibility with Magento. That will return the equivalent version for releases going forward. Side benefit: it'll be easier to know what the equivalent version being run actually is.
  • A new getDistributionVersion() (via getSystemDistroVersion()) will return the distribution version (like 1.0.5), from the metapackage version. If any code needs to know the exact Mage-OS version, it can use this to get it.
  • All references to version number (admin footer, CLI, /magento_version, swagger) have to be changed to use getDistributionVersion() instead of getVersion().

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes MageOS version #108

Manual testing scenarios (*)

  1. Build a Mage-OS preview release (currently unable to; see related PR above).
  2. Run CLI command bin/magento --version; see output like: Mage-OS CLI 1.0.5 (based on Magento 2.4.7-p3)
  3. Open the admin panel and log in; view the footer. See output like: Mage-OS ver. 1.0.5

Questions or comments

Opening this as a draft PR due to inability to test it end to end, as the build process is currently broken.

Unit/integration tests might be affected and require further attention. I didn't get there yet.

I split getVersion(), but not getName(), which returns Mage-OS rather than Magento. Should that be split too?

I created a new interface DistributionMetadataInterface, on the thinking that third parties could use that (instanceof DistributionMetadataInterface) to help determine whether an install is Mage-OS, and that this would be better for backwards compatibility by not introducing new methods to ProductMetadataInterface. Thoughts?

Contribution checklist (*)

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • README.md files for modified modules are updated and included in the pull request if any README.md predefined sections require an update
  • All automated tests passed successfully (all builds are green)

Copy link
Contributor

@fballiano fballiano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the fact that the original getVersion() goes back to return the magento version. I see that there's a getDistributionVersion(), is there also a getDistributionName()?

@rhoerr
Copy link
Contributor Author

rhoerr commented Jan 14, 2025

Code changes, for further consideration.

I was able to create a test build with the composer data, so I can try the actual UX aspect now (maybe later this week).

@rhoerr
Copy link
Contributor Author

rhoerr commented Jan 15, 2025

Tested end-to-end with generated packages from the associated PR.

Admin footer:
image

CLI:

$ bin/magento -V
Mage-OS CLI 1.0.5-p24 (based on Magento 2.4.7-p3)

@rhoerr rhoerr marked this pull request as ready for review January 15, 2025 02:06
@rhoerr rhoerr requested a review from a team as a code owner January 15, 2025 02:06
Copy link
Contributor

@fballiano fballiano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like this a lot

@rhoerr
Copy link
Contributor Author

rhoerr commented Jan 19, 2025

I fixed unit test errors, those pass now.

Integration tests keep failing for unrelated process errors. I'm not sure if there are any issues caused by these changes.

@fballiano fballiano merged commit 4eb2b41 into mage-os:release/1.x Jan 28, 2025
7 of 8 checks passed
rhoerr added a commit to rhoerr/mageos-magento2 that referenced this pull request Feb 5, 2025
@peterjaap
Copy link
Contributor

peterjaap commented Feb 14, 2025

Just ran into another version check mismatch (I was upgrading to Mage-OS 1.0.6 and trying to test it out on an automated review environment):

[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io] run magerun2 -n --root-dir=/data/web/releases/20250214073444 db:add-default-authorization-entries
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io] You are running an incompatible version of n98-magerun2!
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io] Your shop version has to be >2.3.0
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io] Current Magento Version     : 1.0.5
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io] Current n98-magerun2 Version: 7.4.0
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io] Please download an older version of n98-magerun2.
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io] Visit: https://files.magerun.net/old_versions.php
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io]     Magento 2.2.x => n98-magerun2 v3.2.0
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io]     Magento 2.1.x => n98-magerun2 v3.2.0
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io]     Magento 2.0.x => n98-magerun2 v2.3.3
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io]  error  in review.php on line 231:
[pluim-renovate-mage-os-pro.37-72-165-250.magento2.elgentos.io] exit code 1 (General error)

This wasn't an issue with 1.0.5;

~/current$ cat composer.json |grep mage-os/product
        "mage-os/product-community-edition": "1.0.5",
~/current$ magerun2 sys:info
| Name                                             | Mage-OS                                                                                                                                                                                                                                       |
| Version                                          | 1.0.5   

But it is on 1.0.6 (same magerun2 version);

~/release$ cat composer.json |grep mage-os/product
        "mage-os/product-community-edition": "1.0.6",
~/release$ magerun2 sys:info

You are running an incompatible version of n98-magerun2!
Your shop version has to be >2.3.0


Current Magento Version     : 1.0.5
Current n98-magerun2 Version: 7.4.0


Please download an older version of n98-magerun2.

Visit: https://files.magerun.net/old_versions.php

    Magento 2.2.x => n98-magerun2 v3.2.0
    Magento 2.1.x => n98-magerun2 v3.2.0
    Magento 2.0.x => n98-magerun2 v2.3.3

Using the latest magerun2 doesn't help;

~/release$ ./n98-magerun2.phar db:add-default-authorization-entries

You are running an incompatible version of n98-magerun2!
Your shop version has to be >2.3.0


Current Magento Version     : 1.0.5
Current n98-magerun2 Version: 7.5.0

Workaround for now is; magerun2 db:add-default-authorization-entries --skip-magento-compatibility-check

@rhoerr
Copy link
Contributor Author

rhoerr commented Feb 14, 2025

@peterjaap That's strange. Any idea why it's picking up the version as 1.0.5 despite updating to 1.0.6?

Probably Magerun2 has its own detection code for Mage-OS that got broken by the changes here. We'll have to coordinate that with them.

@fballiano
Copy link
Contributor

Hey @cmuench, sorry to bother but I think you're the right person to see what's happening here 😅🙏

@fballiano fballiano mentioned this pull request Feb 18, 2025
@cmuench
Copy link
Contributor

cmuench commented Feb 18, 2025

@fballiano I will have a look on that. Magerun is already prepared in the code. We can then add a logic in that method.

\N98\Magento\Application\Console\EventSubscriber\CheckCompatibility::checkMageOsDistribution

image

@rhoerr rhoerr deleted the feat/getversion-compatibility branch March 10, 2025 00:58
mage-os-ci added a commit that referenced this pull request Nov 30, 2025
* Integration tests/ fix failed tests (#61)

* Fix \Magento\Paypal\Model\Express\CheckoutTest - dbIsolation missing

* Fix tests Magento\CatalogImportExport\Model\Import\ProductTest\ProductStockTest::testProductStockStatusShouldBeUpdatedOnSchedule
          Zend_Db_Exception: Table "catalog_category_product_index_store0_replica" does not exist

Partially reverting fix from Vinai:
`Create category-product index table for store 0 (#47)

 This fixes a regression introduced by pull request
 https://github.com/mage-os/mageos-magento2/pull/25`

* Fix failing tests with error `undefined key 'product_id`' from app/code/Magento/CatalogInventory/Model/StockManagement.php:110

Test: dev/tests/integration/testsuite/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/DownloadableTest.php

* Fix failed tests: \Magento\Wishlist\Controller\Index\AddTest

Failed due to visibility filter in whishlist collection. Products were not added to root category and not reindexed. So visibility filter ued to exclude them from wishlist items collection: app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php:390

* Decrease test-cases - use php 8.2 only for testing purposes
Include and use changed workflow to have more unitary tests executions

* Mark tests as incomplete as actual fix is in: mage-os/mageos-magento-zend-db#1

Error that was fixed:
Unable to revert fixture: Magento/Framework/Backup/_files/trigger.php
#0 /var/www/html/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php(42): Magento\Framework\Backup\DbTest->testBackupAndRollbackIncludesCustomTriggers()
...

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testRotate with data set #4 ('/var/www/html/dev/tests/integ...st.png', 45, array(157, 35), 'IMAGEMAGICK')
ImagickException: unrecognized color `srgb255,255,255' @ warning/color.c/GetColorCompliance/1064

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
ImagickException: unable to read font `' @ error/annotate.c/RenderFreetype/1636

* Fix integration tests error:

Magento\Dhl\Model\CarrierTest::testRequestToShip with data set #0 ('GB', 'EU', 'US')
Failed asserting that two DOM documents are equal.

-      <SoftwareName>Magento</SoftwareName>
+      <SoftwareName>Mage-OS</SoftwareName>

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
PHPUnit\Framework\Exception: Deprecated: Implicit conversion from float 11.34375 to int loses precision in /var/www/html/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php:505.

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
PHPUnit\Framework\Exception: Deprecated: Implicit conversion from float 11.34375 to int loses precision in /var/www/html/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php:505.

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testRotate with data set #4 ('/var/www/html/dev/tests/integ...st.png', 45, array(157, 35), 'IMAGEMAGICK')
ImagickException: unrecognized color `srgb255,255,255' @ warning/color.c/GetColorCompliance/1064

* Revert "feat(catalog): faster category product count (#25)"

This reverts commit f01535b.

* Revert "Create category-product index table for store 0 (#47)"

This reverts commit 7be2613.

* Add optional param to run tests over specific directory only.

* Fix failed tests: \Magento\Version\Controller\Index\IndexTest

Update package name to mage-os

* Fix integration tests (most likely caused by incorrect merge conflict resolving):

error msg:
1) Magento\Catalog\Block\Adminhtml\Category\Checkboxes\TreeTest::testGetTreeJson
Error: Call to a member function getConnectionName() on null

/var/www/html/lib/internal/Magento/Framework/App/ResourceConnection.php:110
/var/www/html/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php:570
...

ref: https://github.com/vpodorozh/mageos-magento2/actions/runs/7472531139/job/20334972566#step:6:39

* Fix failed integration tests in \Magento\Customer

* Revert "Fix failed integration tests in \Magento\Customer"

* Update full-integration-tests.yaml

---------

Co-authored-by: Maksym Novik <m.novik@vconnect.dk>
Co-authored-by: Maksym Novik <novik.kor@gmail.com>
Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>

* #81 - update dataset for `testProductListOutOfStockSortOrderWithElasticsearch`. Based on tickets ACP2E-322 and ACP2E-748 - moving down in catalog results out-of-stock configurable items was removed, so data-set needs to be updated accordingly. (#89)

* GraphQl mutation state check | PlaceOrder and Customer actions - skip list adjustments (#90)

* #82 - exclude Ealsticsearch classes from mutation state check, as they are going to be used for product reindexation need once indexer state is set OnDemand.

* #82 - exclude Redis client and logger classes for customer create&update operations. Session start with redis is tightly coupled yet with any customer related activity - even in GraphQl. I assume that is in TODO list to resolve by Adobe engeneers.

* #82 - exclude Redis client and logger classes for customer create&update operations. Session start with redis is tightly coupled yet with any customer related activity - even in GraphQl. I assume that is in TODO list to resolve by Adobe engeneers.

* Skip some of the Bundle tests as the underlying problems are too big … (#92)

* Skip some of the Bundle tests as the underlying problems are too big to solve them out now.

* Ignore testAutoChangingIsInStockForNewConfigurable test as underlying problem is bigger then we can handle now. Hopefuly Magento wil lfix this bug in future releases.

* #83 - fix expireDate formating for user expiration integration test. (#91)

* #79 - add shutdown functions wrapper to make sure TestModules will be… (#93)

* #79 - add shutdown functions wrapper to make sure TestModules will be removed ONLY after all other shut down fucntions be executed.

* #79 - add shutdown functions wrapper to make sure TestModules will be removed ONLY after all other shut down fucntions be executed.

* Fix failed testes after the upstream update - db&app isolation were missed. (#94)

* Fix invalid data-sets for unit tests (#95)

* Fix invalid data-sets for catalog unit tests

* Fix invalid data-sets for ImportExport unit tests

* Fix invalid data-sets for Framework\MessageQueue unit tests

* Fix static tests.

* Fix invalid data-sets for Sales unit test

* Fix invalid data-sets for Integration unit test

* Fix invalid data-sets for Email unit test

* Fix data providers for unit tests - Config and Directory

* Remove totally unnessesary PHP version ifcondition. I tested it on 8.1 8.2 8.3 - all worked good.

* Run test workflows on all branch PRs

* Fixed branches constraint syntax

* 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 <glo25731@adobe.com>
Co-authored-by: Banvari Lal <glo60612@adobe.com>
Co-authored-by: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Co-authored-by: magento-devops-queue-mgr-svc <139211740+magento-devops-queue-mgr-svc@users.noreply.github.com>
Co-authored-by: Abhishek Pathak <107833467+wip44850@users.noreply.github.com>
Co-authored-by: Sergio Vera <svera@adobe.com>
Co-authored-by: lakshmana49 <glo28218@adobe.com>
Co-authored-by: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Co-authored-by: Arularasan <glo02433@adobe.com>
Co-authored-by: Manjusha S <glo24116@adobe.com>
Co-authored-by: manjusha729 <93243302+manjusha729@users.noreply.github.com>
Co-authored-by: Rajesh Kumar <glo71317@adobe.com>
Co-authored-by: “Pavan-bj”  <pavan@BLR1-LMC-N71897.local>
Co-authored-by: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Co-authored-by: Shantanu Dasgupta <108055538+cod40403@users.noreply.github.com>
Co-authored-by: Chhandak.Barua <chhandak.barua@BLR1-LMC-N73490.local>
Co-authored-by: Alexandra Zota <zota@adobe.com>
Co-authored-by: manishranjan-adobe <del55204@adobe.com>
Co-authored-by: Saurabh Kumar <glo17680@adobe.com>
Co-authored-by: Mircea Rosmeteniuc <mircea.rosm@gmail.com>
Co-authored-by: flowers <flowers@adobe.com>
Co-authored-by: Pavan-bj <140481523+Pavan-bj@users.noreply.github.com>
Co-authored-by: Manish Ranjan <105285471+manishranjan-adobe@users.noreply.github.com>
Co-authored-by: Nishant Rana <glo04412@adobe.com>
Co-authored-by: Raj Mohan <cod43156@Rajs-MacBook-Pro.local>
Co-authored-by: Nishant Rana <89177947+nishant04412@users.noreply.github.com>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <arnsaha@adobe.com>
Co-authored-by: Dmytro Voskoboinikov <voskoboi@adobe.com>
Co-authored-by: Sumesh P <142383015+sumesh-GL@users.noreply.github.com>
Co-authored-by: mohit-adobe <84013331+mohit-adobe@users.noreply.github.com>
Co-authored-by: Stanislav Idolov <sidolov@adobe.com>
Co-authored-by: Rafal Janicki <rjanicki@adobe.com>
Co-authored-by: Dmytro Horytskyi <5802616+dhorytskyi@users.noreply.github.com>
Co-authored-by: chittima <chittima@adobe.com>
Co-authored-by: cod43156 <cod43156@adobe.com>
Co-authored-by: Sarmistha <glo23503@adobe.com>
Co-authored-by: Ryan Hoerr <rhoerr@users.noreply.github.com>

* Bugfix: autocomplete suggests nonsearchable terms (#102)

* added additional check to ensure autocomplete suggests only searchable terms

---------

Co-authored-by: Ryan Sun <ryansun@isnweb.com>

* Bugfix: workflow not waiting for called workflow to complete (#74)

* Fixed missed closing newline

* Update unit test for autocomplete suggests fix (#104)

* added additional check to ensure autocomplete suggests only searchable terms

* updated unitest for search suggest fix

* added type casting for isSuggestible

* reverted suggestible flag and fixed getSuggestFields method

* updated suggest contructor params to avoid bic

* updated unit test with new dependency productAttributeCollectionFactory for Suggestions

* add fieldProvider back to Suggestions constructor

---------

Co-authored-by: Ryan Sun <ryansun@isnweb.com>

* Add Sansec eComscan workflow

* Add Sansec eComscan workflow

* Solve bug #116 - Setting number of address line lower than existing entry breaks all checkouts for existing address data

* adjust doc blocks for addressHelper and mock in tests

* Add addressHelper object into child classes

* Add Sansec eComscan workflow

* Improved menu/toolbar settings for TinyMCE 6 (#109)

* Split Magento and Mage-OS versions in ProductMetadata for compatibility (#115)

* feat: run setup:di:compile on push (#33)

* Update supported-services.json for Magento 2.4.8

* Update supported-services.json

* Any composer 2 version

* Update supported-services.json for Warden available packages

* Try build with Valkey

* fix rabbitmq version to 4.0

* Change redis version to 7.4

* feat!: prevent catalog and sales rules from being disclosed publicly by default

* feat!: prevent disclosure of customer groups by default (#136)

* Fix integration tests for Magento_Backend and Magento_Bundle (#134)

* Fix  Magento/Beckend/Block/Page/Footer integration test

* Fix Magento/Bundle/Model/Product/IsSaleableTest

* Fix all other bundle test

* Integrate code review changes

* Fix CatalogInventory test

* Fix stockitem criteria

* Fix test on price indexing because of confiurable out of stock

* Fix ButtonLock dependency

* Fix tests for Magento_Customer

* Fix CustomerImportExport module test

* Fix Mage-OS Product Name

* Fix Magento_Downloadable integration tests

* Backward compatibility

* Fix customer adresses with empty line

* Code review

* PHPCS

---------

Co-authored-by: s.humeau <humeau@antadis.com>
Co-authored-by: simsComputing <simsComputing>
Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>

* Fix PHP 8.4 Deprecation: Explicitly Mark Nullable Parameter (#157)

* fix product export of configurable_variations for configurable products with multiple super attributes (#142)

* Managed by Terraform

* Add Sansec eComscan workflow

* Managed by Terraform

---------

Co-authored-by: Mage-OS <info@mage-os.org>
Co-authored-by: Vladyslav Podorozhnyi <vpodorozh@gmail.com>
Co-authored-by: Maksym Novik <m.novik@vconnect.dk>
Co-authored-by: Maksym Novik <novik.kor@gmail.com>
Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Co-authored-by: Vinai Kopp <vinai@netzarbeiter.com>
Co-authored-by: Mage-OS <100189073+mage-os-ci@users.noreply.github.com>
Co-authored-by: Shanthi Rajendran <glo25731@adobe.com>
Co-authored-by: Banvari Lal <glo60612@adobe.com>
Co-authored-by: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Co-authored-by: magento-devops-queue-mgr-svc <139211740+magento-devops-queue-mgr-svc@users.noreply.github.com>
Co-authored-by: Abhishek Pathak <107833467+wip44850@users.noreply.github.com>
Co-authored-by: Sergio Vera <svera@adobe.com>
Co-authored-by: lakshmana49 <glo28218@adobe.com>
Co-authored-by: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Co-authored-by: Arularasan <glo02433@adobe.com>
Co-authored-by: Manjusha S <glo24116@adobe.com>
Co-authored-by: manjusha729 <93243302+manjusha729@users.noreply.github.com>
Co-authored-by: Rajesh Kumar <glo71317@adobe.com>
Co-authored-by: “Pavan-bj”  <pavan@BLR1-LMC-N71897.local>
Co-authored-by: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Co-authored-by: Shantanu Dasgupta <108055538+cod40403@users.noreply.github.com>
Co-authored-by: Chhandak.Barua <chhandak.barua@BLR1-LMC-N73490.local>
Co-authored-by: Alexandra Zota <zota@adobe.com>
Co-authored-by: manishranjan-adobe <del55204@adobe.com>
Co-authored-by: Saurabh Kumar <glo17680@adobe.com>
Co-authored-by: Mircea Rosmeteniuc <mircea.rosm@gmail.com>
Co-authored-by: flowers <flowers@adobe.com>
Co-authored-by: Pavan-bj <140481523+Pavan-bj@users.noreply.github.com>
Co-authored-by: Manish Ranjan <105285471+manishranjan-adobe@users.noreply.github.com>
Co-authored-by: Nishant Rana <glo04412@adobe.com>
Co-authored-by: Raj Mohan <cod43156@Rajs-MacBook-Pro.local>
Co-authored-by: Nishant Rana <89177947+nishant04412@users.noreply.github.com>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <arnsaha@adobe.com>
Co-authored-by: Dmytro Voskoboinikov <voskoboi@adobe.com>
Co-authored-by: Sumesh P <142383015+sumesh-GL@users.noreply.github.com>
Co-authored-by: mohit-adobe <84013331+mohit-adobe@users.noreply.github.com>
Co-authored-by: Stanislav Idolov <sidolov@adobe.com>
Co-authored-by: Rafal Janicki <rjanicki@adobe.com>
Co-authored-by: Dmytro Horytskyi <5802616+dhorytskyi@users.noreply.github.com>
Co-authored-by: chittima <chittima@adobe.com>
Co-authored-by: cod43156 <cod43156@adobe.com>
Co-authored-by: Sarmistha <glo23503@adobe.com>
Co-authored-by: Ryan Sun <ryansun81@gmail.com>
Co-authored-by: Ryan Sun <ryansun@isnweb.com>
Co-authored-by: Adam <adam.crossland@zero1.co.uk>
Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Co-authored-by: Lucas van Staden <sales@proxiblue.com.au>
Co-authored-by: Tjitse <Tjitse@vendic.nl>
Co-authored-by: Damien Retzinger <damienwebdev@gmail.com>
Co-authored-by: simsComputing <simon.jm.humeau@hotmail.fr>
Co-authored-by: s.humeau <humeau@antadis.com>
Co-authored-by: Abdellatif EL MIZEB <aelmizeb@gmail.com>
Co-authored-by: mage-os-terraform[bot] <104196000+mage-os-terraform[bot]@users.noreply.github.com>
mage-os-ci added a commit that referenced this pull request Nov 30, 2025
* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* ACP2E-4019: CE copyright updates for 2.4.9-beta1

* Chore: Resolve merge of 2.4 develop upstream (#182)

* Integration tests/ fix failed tests (#61)

* Fix \Magento\Paypal\Model\Express\CheckoutTest - dbIsolation missing

* Fix tests Magento\CatalogImportExport\Model\Import\ProductTest\ProductStockTest::testProductStockStatusShouldBeUpdatedOnSchedule
          Zend_Db_Exception: Table "catalog_category_product_index_store0_replica" does not exist

Partially reverting fix from Vinai:
`Create category-product index table for store 0 (#47)

 This fixes a regression introduced by pull request
 https://github.com/mage-os/mageos-magento2/pull/25`

* Fix failing tests with error `undefined key 'product_id`' from app/code/Magento/CatalogInventory/Model/StockManagement.php:110

Test: dev/tests/integration/testsuite/Magento/Downloadable/Block/Sales/Order/Email/Items/Order/DownloadableTest.php

* Fix failed tests: \Magento\Wishlist\Controller\Index\AddTest

Failed due to visibility filter in whishlist collection. Products were not added to root category and not reindexed. So visibility filter ued to exclude them from wishlist items collection: app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection.php:390

* Decrease test-cases - use php 8.2 only for testing purposes
Include and use changed workflow to have more unitary tests executions

* Mark tests as incomplete as actual fix is in: mage-os/mageos-magento-zend-db#1

Error that was fixed:
Unable to revert fixture: Magento/Framework/Backup/_files/trigger.php
#0 /var/www/html/dev/tests/integration/testsuite/Magento/Framework/Backup/DbTest.php(42): Magento\Framework\Backup\DbTest->testBackupAndRollbackIncludesCustomTriggers()
...

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testRotate with data set #4 ('/var/www/html/dev/tests/integ...st.png', 45, array(157, 35), 'IMAGEMAGICK')
ImagickException: unrecognized color `srgb255,255,255' @ warning/color.c/GetColorCompliance/1064

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
ImagickException: unable to read font `' @ error/annotate.c/RenderFreetype/1636

* Fix integration tests error:

Magento\Dhl\Model\CarrierTest::testRequestToShip with data set #0 ('GB', 'EU', 'US')
Failed asserting that two DOM documents are equal.

-      <SoftwareName>Magento</SoftwareName>
+      <SoftwareName>Mage-OS</SoftwareName>

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
PHPUnit\Framework\Exception: Deprecated: Implicit conversion from float 11.34375 to int loses precision in /var/www/html/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php:505.

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testCreatePngFromString with data set #1 (array(5, 12), array(0, 0, 0), array(0, 20), array(255, 255, 255), 'IMAGEMAGICK')
PHPUnit\Framework\Exception: Deprecated: Implicit conversion from float 11.34375 to int loses precision in /var/www/html/lib/internal/Magento/Framework/Image/Adapter/ImageMagick.php:505.

* Fix integration tests error:

Magento\Framework\Image\Adapter\InterfaceTest::testRotate with data set #4 ('/var/www/html/dev/tests/integ...st.png', 45, array(157, 35), 'IMAGEMAGICK')
ImagickException: unrecognized color `srgb255,255,255' @ warning/color.c/GetColorCompliance/1064

* Revert "feat(catalog): faster category product count (#25)"

This reverts commit f01535b.

* Revert "Create category-product index table for store 0 (#47)"

This reverts commit 7be2613.

* Add optional param to run tests over specific directory only.

* Fix failed tests: \Magento\Version\Controller\Index\IndexTest

Update package name to mage-os

* Fix integration tests (most likely caused by incorrect merge conflict resolving):

error msg:
1) Magento\Catalog\Block\Adminhtml\Category\Checkboxes\TreeTest::testGetTreeJson
Error: Call to a member function getConnectionName() on null

/var/www/html/lib/internal/Magento/Framework/App/ResourceConnection.php:110
/var/www/html/app/code/Magento/Catalog/Model/ResourceModel/Category/Collection.php:570
...

ref: https://github.com/vpodorozh/mageos-magento2/actions/runs/7472531139/job/20334972566#step:6:39

* Fix failed integration tests in \Magento\Customer

* Revert "Fix failed integration tests in \Magento\Customer"

* Update full-integration-tests.yaml

---------

Co-authored-by: Maksym Novik <m.novik@vconnect.dk>
Co-authored-by: Maksym Novik <novik.kor@gmail.com>
Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>

* #81 - update dataset for `testProductListOutOfStockSortOrderWithElasticsearch`. Based on tickets ACP2E-322 and ACP2E-748 - moving down in catalog results out-of-stock configurable items was removed, so data-set needs to be updated accordingly. (#89)

* GraphQl mutation state check | PlaceOrder and Customer actions - skip list adjustments (#90)

* #82 - exclude Ealsticsearch classes from mutation state check, as they are going to be used for product reindexation need once indexer state is set OnDemand.

* #82 - exclude Redis client and logger classes for customer create&update operations. Session start with redis is tightly coupled yet with any customer related activity - even in GraphQl. I assume that is in TODO list to resolve by Adobe engeneers.

* #82 - exclude Redis client and logger classes for customer create&update operations. Session start with redis is tightly coupled yet with any customer related activity - even in GraphQl. I assume that is in TODO list to resolve by Adobe engeneers.

* Skip some of the Bundle tests as the underlying problems are too big … (#92)

* Skip some of the Bundle tests as the underlying problems are too big to solve them out now.

* Ignore testAutoChangingIsInStockForNewConfigurable test as underlying problem is bigger then we can handle now. Hopefuly Magento wil lfix this bug in future releases.

* #83 - fix expireDate formating for user expiration integration test. (#91)

* #79 - add shutdown functions wrapper to make sure TestModules will be… (#93)

* #79 - add shutdown functions wrapper to make sure TestModules will be removed ONLY after all other shut down fucntions be executed.

* #79 - add shutdown functions wrapper to make sure TestModules will be removed ONLY after all other shut down fucntions be executed.

* Fix failed testes after the upstream update - db&app isolation were missed. (#94)

* Fix invalid data-sets for unit tests (#95)

* Fix invalid data-sets for catalog unit tests

* Fix invalid data-sets for ImportExport unit tests

* Fix invalid data-sets for Framework\MessageQueue unit tests

* Fix static tests.

* Fix invalid data-sets for Sales unit test

* Fix invalid data-sets for Integration unit test

* Fix invalid data-sets for Email unit test

* Fix data providers for unit tests - Config and Directory

* Remove totally unnessesary PHP version ifcondition. I tested it on 8.1 8.2 8.3 - all worked good.

* Run test workflows on all branch PRs

* Fixed branches constraint syntax

* 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 <glo25731@adobe.com>
Co-authored-by: Banvari Lal <glo60612@adobe.com>
Co-authored-by: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Co-authored-by: magento-devops-queue-mgr-svc <139211740+magento-devops-queue-mgr-svc@users.noreply.github.com>
Co-authored-by: Abhishek Pathak <107833467+wip44850@users.noreply.github.com>
Co-authored-by: Sergio Vera <svera@adobe.com>
Co-authored-by: lakshmana49 <glo28218@adobe.com>
Co-authored-by: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Co-authored-by: Arularasan <glo02433@adobe.com>
Co-authored-by: Manjusha S <glo24116@adobe.com>
Co-authored-by: manjusha729 <93243302+manjusha729@users.noreply.github.com>
Co-authored-by: Rajesh Kumar <glo71317@adobe.com>
Co-authored-by: “Pavan-bj”  <pavan@BLR1-LMC-N71897.local>
Co-authored-by: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Co-authored-by: Shantanu Dasgupta <108055538+cod40403@users.noreply.github.com>
Co-authored-by: Chhandak.Barua <chhandak.barua@BLR1-LMC-N73490.local>
Co-authored-by: Alexandra Zota <zota@adobe.com>
Co-authored-by: manishranjan-adobe <del55204@adobe.com>
Co-authored-by: Saurabh Kumar <glo17680@adobe.com>
Co-authored-by: Mircea Rosmeteniuc <mircea.rosm@gmail.com>
Co-authored-by: flowers <flowers@adobe.com>
Co-authored-by: Pavan-bj <140481523+Pavan-bj@users.noreply.github.com>
Co-authored-by: Manish Ranjan <105285471+manishranjan-adobe@users.noreply.github.com>
Co-authored-by: Nishant Rana <glo04412@adobe.com>
Co-authored-by: Raj Mohan <cod43156@Rajs-MacBook-Pro.local>
Co-authored-by: Nishant Rana <89177947+nishant04412@users.noreply.github.com>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <arnsaha@adobe.com>
Co-authored-by: Dmytro Voskoboinikov <voskoboi@adobe.com>
Co-authored-by: Sumesh P <142383015+sumesh-GL@users.noreply.github.com>
Co-authored-by: mohit-adobe <84013331+mohit-adobe@users.noreply.github.com>
Co-authored-by: Stanislav Idolov <sidolov@adobe.com>
Co-authored-by: Rafal Janicki <rjanicki@adobe.com>
Co-authored-by: Dmytro Horytskyi <5802616+dhorytskyi@users.noreply.github.com>
Co-authored-by: chittima <chittima@adobe.com>
Co-authored-by: cod43156 <cod43156@adobe.com>
Co-authored-by: Sarmistha <glo23503@adobe.com>
Co-authored-by: Ryan Hoerr <rhoerr@users.noreply.github.com>

* Bugfix: autocomplete suggests nonsearchable terms (#102)

* added additional check to ensure autocomplete suggests only searchable terms

---------

Co-authored-by: Ryan Sun <ryansun@isnweb.com>

* Bugfix: workflow not waiting for called workflow to complete (#74)

* Fixed missed closing newline

* Update unit test for autocomplete suggests fix (#104)

* added additional check to ensure autocomplete suggests only searchable terms

* updated unitest for search suggest fix

* added type casting for isSuggestible

* reverted suggestible flag and fixed getSuggestFields method

* updated suggest contructor params to avoid bic

* updated unit test with new dependency productAttributeCollectionFactory for Suggestions

* add fieldProvider back to Suggestions constructor

---------

Co-authored-by: Ryan Sun <ryansun@isnweb.com>

* Add Sansec eComscan workflow

* Add Sansec eComscan workflow

* Solve bug #116 - Setting number of address line lower than existing entry breaks all checkouts for existing address data

* adjust doc blocks for addressHelper and mock in tests

* Add addressHelper object into child classes

* Add Sansec eComscan workflow

* Improved menu/toolbar settings for TinyMCE 6 (#109)

* Split Magento and Mage-OS versions in ProductMetadata for compatibility (#115)

* feat: run setup:di:compile on push (#33)

* Update supported-services.json for Magento 2.4.8

* Update supported-services.json

* Any composer 2 version

* Update supported-services.json for Warden available packages

* Try build with Valkey

* fix rabbitmq version to 4.0

* Change redis version to 7.4

* feat!: prevent catalog and sales rules from being disclosed publicly by default

* feat!: prevent disclosure of customer groups by default (#136)

* Fix integration tests for Magento_Backend and Magento_Bundle (#134)

* Fix  Magento/Beckend/Block/Page/Footer integration test

* Fix Magento/Bundle/Model/Product/IsSaleableTest

* Fix all other bundle test

* Integrate code review changes

* Fix CatalogInventory test

* Fix stockitem criteria

* Fix test on price indexing because of confiurable out of stock

* Fix ButtonLock dependency

* Fix tests for Magento_Customer

* Fix CustomerImportExport module test

* Fix Mage-OS Product Name

* Fix Magento_Downloadable integration tests

* Backward compatibility

* Fix customer adresses with empty line

* Code review

* PHPCS

---------

Co-authored-by: s.humeau <humeau@antadis.com>
Co-authored-by: simsComputing <simsComputing>
Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>

* Fix PHP 8.4 Deprecation: Explicitly Mark Nullable Parameter (#157)

* fix product export of configurable_variations for configurable products with multiple super attributes (#142)

* Managed by Terraform

* Add Sansec eComscan workflow

* Managed by Terraform

---------

Co-authored-by: Mage-OS <info@mage-os.org>
Co-authored-by: Vladyslav Podorozhnyi <vpodorozh@gmail.com>
Co-authored-by: Maksym Novik <m.novik@vconnect.dk>
Co-authored-by: Maksym Novik <novik.kor@gmail.com>
Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Co-authored-by: Vinai Kopp <vinai@netzarbeiter.com>
Co-authored-by: Mage-OS <100189073+mage-os-ci@users.noreply.github.com>
Co-authored-by: Shanthi Rajendran <glo25731@adobe.com>
Co-authored-by: Banvari Lal <glo60612@adobe.com>
Co-authored-by: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Co-authored-by: magento-devops-queue-mgr-svc <139211740+magento-devops-queue-mgr-svc@users.noreply.github.com>
Co-authored-by: Abhishek Pathak <107833467+wip44850@users.noreply.github.com>
Co-authored-by: Sergio Vera <svera@adobe.com>
Co-authored-by: lakshmana49 <glo28218@adobe.com>
Co-authored-by: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Co-authored-by: Arularasan <glo02433@adobe.com>
Co-authored-by: Manjusha S <glo24116@adobe.com>
Co-authored-by: manjusha729 <93243302+manjusha729@users.noreply.github.com>
Co-authored-by: Rajesh Kumar <glo71317@adobe.com>
Co-authored-by: “Pavan-bj”  <pavan@BLR1-LMC-N71897.local>
Co-authored-by: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Co-authored-by: Shantanu Dasgupta <108055538+cod40403@users.noreply.github.com>
Co-authored-by: Chhandak.Barua <chhandak.barua@BLR1-LMC-N73490.local>
Co-authored-by: Alexandra Zota <zota@adobe.com>
Co-authored-by: manishranjan-adobe <del55204@adobe.com>
Co-authored-by: Saurabh Kumar <glo17680@adobe.com>
Co-authored-by: Mircea Rosmeteniuc <mircea.rosm@gmail.com>
Co-authored-by: flowers <flowers@adobe.com>
Co-authored-by: Pavan-bj <140481523+Pavan-bj@users.noreply.github.com>
Co-authored-by: Manish Ranjan <105285471+manishranjan-adobe@users.noreply.github.com>
Co-authored-by: Nishant Rana <glo04412@adobe.com>
Co-authored-by: Raj Mohan <cod43156@Rajs-MacBook-Pro.local>
Co-authored-by: Nishant Rana <89177947+nishant04412@users.noreply.github.com>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <arnsaha@adobe.com>
Co-authored-by: Dmytro Voskoboinikov <voskoboi@adobe.com>
Co-authored-by: Sumesh P <142383015+sumesh-GL@users.noreply.github.com>
Co-authored-by: mohit-adobe <84013331+mohit-adobe@users.noreply.github.com>
Co-authored-by: Stanislav Idolov <sidolov@adobe.com>
Co-authored-by: Rafal Janicki <rjanicki@adobe.com>
Co-authored-by: Dmytro Horytskyi <5802616+dhorytskyi@users.noreply.github.com>
Co-authored-by: chittima <chittima@adobe.com>
Co-authored-by: cod43156 <cod43156@adobe.com>
Co-authored-by: Sarmistha <glo23503@adobe.com>
Co-authored-by: Ryan Sun <ryansun81@gmail.com>
Co-authored-by: Ryan Sun <ryansun@isnweb.com>
Co-authored-by: Adam <adam.crossland@zero1.co.uk>
Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Co-authored-by: Lucas van Staden <sales@proxiblue.com.au>
Co-authored-by: Tjitse <Tjitse@vendic.nl>
Co-authored-by: Damien Retzinger <damienwebdev@gmail.com>
Co-authored-by: simsComputing <simon.jm.humeau@hotmail.fr>
Co-authored-by: s.humeau <humeau@antadis.com>
Co-authored-by: Abdellatif EL MIZEB <aelmizeb@gmail.com>
Co-authored-by: mage-os-terraform[bot] <104196000+mage-os-terraform[bot]@users.noreply.github.com>

---------

Co-authored-by: Alexandra Zota <zota@adobe.com>
Co-authored-by: magento-devops-queue-mgr-svc <139211740+magento-devops-queue-mgr-svc@users.noreply.github.com>
Co-authored-by: alzota <97607802+alzota@users.noreply.github.com>
Co-authored-by: Ryan Hoerr <rhoerr@users.noreply.github.com>
Co-authored-by: Vladyslav Podorozhnyi <vpodorozh@gmail.com>
Co-authored-by: Maksym Novik <m.novik@vconnect.dk>
Co-authored-by: Maksym Novik <novik.kor@gmail.com>
Co-authored-by: Ihor Sviziev <ihor-sviziev@users.noreply.github.com>
Co-authored-by: Vinai Kopp <vinai@netzarbeiter.com>
Co-authored-by: Shanthi Rajendran <glo25731@adobe.com>
Co-authored-by: Banvari Lal <glo60612@adobe.com>
Co-authored-by: jayrangnani-gl <142883278+jayrangnani-gl@users.noreply.github.com>
Co-authored-by: Abhishek Pathak <107833467+wip44850@users.noreply.github.com>
Co-authored-by: Sergio Vera <svera@adobe.com>
Co-authored-by: lakshmana49 <glo28218@adobe.com>
Co-authored-by: Dnyaneshwar Jambhulkar <pru34625@adobe.com>
Co-authored-by: Arularasan <glo02433@adobe.com>
Co-authored-by: Manjusha S <glo24116@adobe.com>
Co-authored-by: manjusha729 <93243302+manjusha729@users.noreply.github.com>
Co-authored-by: Rajesh Kumar <glo71317@adobe.com>
Co-authored-by: “Pavan-bj”  <pavan@BLR1-LMC-N71897.local>
Co-authored-by: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Co-authored-by: Shantanu Dasgupta <108055538+cod40403@users.noreply.github.com>
Co-authored-by: Chhandak.Barua <chhandak.barua@BLR1-LMC-N73490.local>
Co-authored-by: manishranjan-adobe <del55204@adobe.com>
Co-authored-by: Saurabh Kumar <glo17680@adobe.com>
Co-authored-by: Mircea Rosmeteniuc <mircea.rosm@gmail.com>
Co-authored-by: flowers <flowers@adobe.com>
Co-authored-by: Pavan-bj <140481523+Pavan-bj@users.noreply.github.com>
Co-authored-by: Manish Ranjan <105285471+manishranjan-adobe@users.noreply.github.com>
Co-authored-by: Nishant Rana <glo04412@adobe.com>
Co-authored-by: Raj Mohan <cod43156@Rajs-MacBook-Pro.local>
Co-authored-by: Nishant Rana <89177947+nishant04412@users.noreply.github.com>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <arnsaha@adobe.com>
Co-authored-by: Dmytro Voskoboinikov <voskoboi@adobe.com>
Co-authored-by: Sumesh P <142383015+sumesh-GL@users.noreply.github.com>
Co-authored-by: mohit-adobe <84013331+mohit-adobe@users.noreply.github.com>
Co-authored-by: Stanislav Idolov <sidolov@adobe.com>
Co-authored-by: Rafal Janicki <rjanicki@adobe.com>
Co-authored-by: Dmytro Horytskyi <5802616+dhorytskyi@users.noreply.github.com>
Co-authored-by: chittima <chittima@adobe.com>
Co-authored-by: cod43156 <cod43156@adobe.com>
Co-authored-by: Sarmistha <glo23503@adobe.com>
Co-authored-by: Ryan Sun <ryansun81@gmail.com>
Co-authored-by: Ryan Sun <ryansun@isnweb.com>
Co-authored-by: Adam <adam.crossland@zero1.co.uk>
Co-authored-by: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Co-authored-by: Lucas van Staden <sales@proxiblue.com.au>
Co-authored-by: Tjitse <Tjitse@vendic.nl>
Co-authored-by: Damien Retzinger <damienwebdev@gmail.com>
Co-authored-by: simsComputing <simon.jm.humeau@hotmail.fr>
Co-authored-by: s.humeau <humeau@antadis.com>
Co-authored-by: Abdellatif EL MIZEB <aelmizeb@gmail.com>
Co-authored-by: mage-os-terraform[bot] <104196000+mage-os-terraform[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants