Skip to content

Conversation

@danslo
Copy link
Contributor

@danslo danslo commented Sep 1, 2022

Description (*)

This pull request adds a workflow that automatically attempts to pull from upstream. It is done every morning at 10:10am. This gives the mirror sync some time to complete.

When the merge succeeds, we simply allow it to happen and push it to our repository.

When the merge fails, we create a 2.x-develop-upstream branch. This branch is then used to create a (draft) Pull Request that can be manually handled by a human.

As long as this 2.x-develop-upstream branch exists (in other words: as long as there hasn't been a conflict resolution), we will not attempt an automatic merge again. This does mean that we need to ensure to also manually delete the upstream branch whenever we have solved the conflict. I intend to create a separate github action in a separate PR to handle this automatically.

Finally, after the Pull Request has been created, we send a notification to the Mage-OS discord with a link to the PR and the output of the (failed) merge.

Please note that this workflow requires a secret called DISCORD_WEBHOOK. It must be configured in the repository settings.

If you have any comments or questions, I'm happy to hear them!

Copy link
Contributor

@Vinai Vinai left a comment

Choose a reason for hiding this comment

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

Thank you!

@Vinai Vinai merged commit 771b0fa into mage-os:2.4-develop Sep 1, 2022
@damienwebdev
Copy link
Member

damienwebdev commented Sep 1, 2022

WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO!

Sorry for spam, I couldn't help myself.

@ihor-sviziev
Copy link
Contributor

Great job! 👍👍👍

mage-os-ci pushed a commit that referenced this pull request Nov 25, 2022
mage-os-ci pushed a commit that referenced this pull request Apr 19, 2023
…\Language\\AST\\FieldNode, GraphQL\\Language\\AST\\InlineFragmentNode given - Added Inline Fragment Fields
mage-os-ci pushed a commit that referenced this pull request Apr 19, 2023
…\Language\\AST\\FieldNode, GraphQL\\Language\\AST\\InlineFragmentNode given - Fixed Static Test
mage-os-ci pushed a commit that referenced this pull request Dec 5, 2023
…iven in magento/framework/Setup/Patch/PatchApplier
mage-os-ci pushed a commit that referenced this pull request Dec 5, 2023
…iven in magento/framework/Setup/Patch/PatchApplier
Vinai pushed a commit that referenced this pull request Jan 25, 2024
* 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 <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Ihor Sviziev <[email protected]>
mage-os-ci pushed a commit that referenced this pull request Jul 5, 2024
mage-os-ci pushed a commit that referenced this pull request Oct 30, 2024
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 <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Ihor Sviziev <[email protected]>

* #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 <[email protected]>
Co-authored-by: Banvari Lal <[email protected]>
Co-authored-by: jayrangnani-gl <[email protected]>
Co-authored-by: magento-devops-queue-mgr-svc <[email protected]>
Co-authored-by: Abhishek Pathak <[email protected]>
Co-authored-by: Sergio Vera <[email protected]>
Co-authored-by: lakshmana49 <[email protected]>
Co-authored-by: Dnyaneshwar Jambhulkar <[email protected]>
Co-authored-by: Arularasan <[email protected]>
Co-authored-by: Manjusha S <[email protected]>
Co-authored-by: manjusha729 <[email protected]>
Co-authored-by: Rajesh Kumar <[email protected]>
Co-authored-by: “Pavan-bj”  <[email protected]>
Co-authored-by: Indrani <[email protected]>
Co-authored-by: Shantanu Dasgupta <[email protected]>
Co-authored-by: Chhandak.Barua <[email protected]>
Co-authored-by: Alexandra Zota <[email protected]>
Co-authored-by: manishranjan-adobe <[email protected]>
Co-authored-by: Saurabh Kumar <[email protected]>
Co-authored-by: Mircea Rosmeteniuc <[email protected]>
Co-authored-by: flowers <[email protected]>
Co-authored-by: Pavan-bj <[email protected]>
Co-authored-by: Manish Ranjan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: Raj Mohan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <[email protected]>
Co-authored-by: Dmytro Voskoboinikov <[email protected]>
Co-authored-by: Sumesh P <[email protected]>
Co-authored-by: mohit-adobe <[email protected]>
Co-authored-by: Stanislav Idolov <[email protected]>
Co-authored-by: Rafal Janicki <[email protected]>
Co-authored-by: Dmytro Horytskyi <[email protected]>
Co-authored-by: chittima <[email protected]>
Co-authored-by: cod43156 <[email protected]>
Co-authored-by: Sarmistha <[email protected]>
Co-authored-by: Ryan Hoerr <[email protected]>

* Bugfix: autocomplete suggests nonsearchable terms (#102)

* added additional check to ensure autocomplete suggests only searchable terms

---------

Co-authored-by: Ryan Sun <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: simsComputing <simsComputing>
Co-authored-by: Fabrizio Balliano <[email protected]>

* 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 <[email protected]>
Co-authored-by: Vladyslav Podorozhnyi <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Ihor Sviziev <[email protected]>
Co-authored-by: Vinai Kopp <[email protected]>
Co-authored-by: Mage-OS <[email protected]>
Co-authored-by: Shanthi Rajendran <[email protected]>
Co-authored-by: Banvari Lal <[email protected]>
Co-authored-by: jayrangnani-gl <[email protected]>
Co-authored-by: magento-devops-queue-mgr-svc <[email protected]>
Co-authored-by: Abhishek Pathak <[email protected]>
Co-authored-by: Sergio Vera <[email protected]>
Co-authored-by: lakshmana49 <[email protected]>
Co-authored-by: Dnyaneshwar Jambhulkar <[email protected]>
Co-authored-by: Arularasan <[email protected]>
Co-authored-by: Manjusha S <[email protected]>
Co-authored-by: manjusha729 <[email protected]>
Co-authored-by: Rajesh Kumar <[email protected]>
Co-authored-by: “Pavan-bj”  <[email protected]>
Co-authored-by: Indrani <[email protected]>
Co-authored-by: Shantanu Dasgupta <[email protected]>
Co-authored-by: Chhandak.Barua <[email protected]>
Co-authored-by: Alexandra Zota <[email protected]>
Co-authored-by: manishranjan-adobe <[email protected]>
Co-authored-by: Saurabh Kumar <[email protected]>
Co-authored-by: Mircea Rosmeteniuc <[email protected]>
Co-authored-by: flowers <[email protected]>
Co-authored-by: Pavan-bj <[email protected]>
Co-authored-by: Manish Ranjan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: Raj Mohan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <[email protected]>
Co-authored-by: Dmytro Voskoboinikov <[email protected]>
Co-authored-by: Sumesh P <[email protected]>
Co-authored-by: mohit-adobe <[email protected]>
Co-authored-by: Stanislav Idolov <[email protected]>
Co-authored-by: Rafal Janicki <[email protected]>
Co-authored-by: Dmytro Horytskyi <[email protected]>
Co-authored-by: chittima <[email protected]>
Co-authored-by: cod43156 <[email protected]>
Co-authored-by: Sarmistha <[email protected]>
Co-authored-by: Ryan Sun <[email protected]>
Co-authored-by: Ryan Sun <[email protected]>
Co-authored-by: Adam <[email protected]>
Co-authored-by: Fabrizio Balliano <[email protected]>
Co-authored-by: Lucas van Staden <[email protected]>
Co-authored-by: Tjitse <[email protected]>
Co-authored-by: Damien Retzinger <[email protected]>
Co-authored-by: simsComputing <[email protected]>
Co-authored-by: s.humeau <[email protected]>
Co-authored-by: Abdellatif EL MIZEB <[email protected]>
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 <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Ihor Sviziev <[email protected]>

* #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 <[email protected]>
Co-authored-by: Banvari Lal <[email protected]>
Co-authored-by: jayrangnani-gl <[email protected]>
Co-authored-by: magento-devops-queue-mgr-svc <[email protected]>
Co-authored-by: Abhishek Pathak <[email protected]>
Co-authored-by: Sergio Vera <[email protected]>
Co-authored-by: lakshmana49 <[email protected]>
Co-authored-by: Dnyaneshwar Jambhulkar <[email protected]>
Co-authored-by: Arularasan <[email protected]>
Co-authored-by: Manjusha S <[email protected]>
Co-authored-by: manjusha729 <[email protected]>
Co-authored-by: Rajesh Kumar <[email protected]>
Co-authored-by: “Pavan-bj”  <[email protected]>
Co-authored-by: Indrani <[email protected]>
Co-authored-by: Shantanu Dasgupta <[email protected]>
Co-authored-by: Chhandak.Barua <[email protected]>
Co-authored-by: Alexandra Zota <[email protected]>
Co-authored-by: manishranjan-adobe <[email protected]>
Co-authored-by: Saurabh Kumar <[email protected]>
Co-authored-by: Mircea Rosmeteniuc <[email protected]>
Co-authored-by: flowers <[email protected]>
Co-authored-by: Pavan-bj <[email protected]>
Co-authored-by: Manish Ranjan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: Raj Mohan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <[email protected]>
Co-authored-by: Dmytro Voskoboinikov <[email protected]>
Co-authored-by: Sumesh P <[email protected]>
Co-authored-by: mohit-adobe <[email protected]>
Co-authored-by: Stanislav Idolov <[email protected]>
Co-authored-by: Rafal Janicki <[email protected]>
Co-authored-by: Dmytro Horytskyi <[email protected]>
Co-authored-by: chittima <[email protected]>
Co-authored-by: cod43156 <[email protected]>
Co-authored-by: Sarmistha <[email protected]>
Co-authored-by: Ryan Hoerr <[email protected]>

* Bugfix: autocomplete suggests nonsearchable terms (#102)

* added additional check to ensure autocomplete suggests only searchable terms

---------

Co-authored-by: Ryan Sun <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: simsComputing <simsComputing>
Co-authored-by: Fabrizio Balliano <[email protected]>

* 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 <[email protected]>
Co-authored-by: Vladyslav Podorozhnyi <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Ihor Sviziev <[email protected]>
Co-authored-by: Vinai Kopp <[email protected]>
Co-authored-by: Mage-OS <[email protected]>
Co-authored-by: Shanthi Rajendran <[email protected]>
Co-authored-by: Banvari Lal <[email protected]>
Co-authored-by: jayrangnani-gl <[email protected]>
Co-authored-by: magento-devops-queue-mgr-svc <[email protected]>
Co-authored-by: Abhishek Pathak <[email protected]>
Co-authored-by: Sergio Vera <[email protected]>
Co-authored-by: lakshmana49 <[email protected]>
Co-authored-by: Dnyaneshwar Jambhulkar <[email protected]>
Co-authored-by: Arularasan <[email protected]>
Co-authored-by: Manjusha S <[email protected]>
Co-authored-by: manjusha729 <[email protected]>
Co-authored-by: Rajesh Kumar <[email protected]>
Co-authored-by: “Pavan-bj”  <[email protected]>
Co-authored-by: Indrani <[email protected]>
Co-authored-by: Shantanu Dasgupta <[email protected]>
Co-authored-by: Chhandak.Barua <[email protected]>
Co-authored-by: Alexandra Zota <[email protected]>
Co-authored-by: manishranjan-adobe <[email protected]>
Co-authored-by: Saurabh Kumar <[email protected]>
Co-authored-by: Mircea Rosmeteniuc <[email protected]>
Co-authored-by: flowers <[email protected]>
Co-authored-by: Pavan-bj <[email protected]>
Co-authored-by: Manish Ranjan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: Raj Mohan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <[email protected]>
Co-authored-by: Dmytro Voskoboinikov <[email protected]>
Co-authored-by: Sumesh P <[email protected]>
Co-authored-by: mohit-adobe <[email protected]>
Co-authored-by: Stanislav Idolov <[email protected]>
Co-authored-by: Rafal Janicki <[email protected]>
Co-authored-by: Dmytro Horytskyi <[email protected]>
Co-authored-by: chittima <[email protected]>
Co-authored-by: cod43156 <[email protected]>
Co-authored-by: Sarmistha <[email protected]>
Co-authored-by: Ryan Sun <[email protected]>
Co-authored-by: Ryan Sun <[email protected]>
Co-authored-by: Adam <[email protected]>
Co-authored-by: Fabrizio Balliano <[email protected]>
Co-authored-by: Lucas van Staden <[email protected]>
Co-authored-by: Tjitse <[email protected]>
Co-authored-by: Damien Retzinger <[email protected]>
Co-authored-by: simsComputing <[email protected]>
Co-authored-by: s.humeau <[email protected]>
Co-authored-by: Abdellatif EL MIZEB <[email protected]>
Co-authored-by: mage-os-terraform[bot] <104196000+mage-os-terraform[bot]@users.noreply.github.com>

---------

Co-authored-by: Alexandra Zota <[email protected]>
Co-authored-by: magento-devops-queue-mgr-svc <[email protected]>
Co-authored-by: alzota <[email protected]>
Co-authored-by: Ryan Hoerr <[email protected]>
Co-authored-by: Vladyslav Podorozhnyi <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Maksym Novik <[email protected]>
Co-authored-by: Ihor Sviziev <[email protected]>
Co-authored-by: Vinai Kopp <[email protected]>
Co-authored-by: Shanthi Rajendran <[email protected]>
Co-authored-by: Banvari Lal <[email protected]>
Co-authored-by: jayrangnani-gl <[email protected]>
Co-authored-by: Abhishek Pathak <[email protected]>
Co-authored-by: Sergio Vera <[email protected]>
Co-authored-by: lakshmana49 <[email protected]>
Co-authored-by: Dnyaneshwar Jambhulkar <[email protected]>
Co-authored-by: Arularasan <[email protected]>
Co-authored-by: Manjusha S <[email protected]>
Co-authored-by: manjusha729 <[email protected]>
Co-authored-by: Rajesh Kumar <[email protected]>
Co-authored-by: “Pavan-bj”  <[email protected]>
Co-authored-by: Indrani <[email protected]>
Co-authored-by: Shantanu Dasgupta <[email protected]>
Co-authored-by: Chhandak.Barua <[email protected]>
Co-authored-by: manishranjan-adobe <[email protected]>
Co-authored-by: Saurabh Kumar <[email protected]>
Co-authored-by: Mircea Rosmeteniuc <[email protected]>
Co-authored-by: flowers <[email protected]>
Co-authored-by: Pavan-bj <[email protected]>
Co-authored-by: Manish Ranjan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: Raj Mohan <[email protected]>
Co-authored-by: Nishant Rana <[email protected]>
Co-authored-by: internal-magento-queue-manager[bot] <70415199+internal-magento-queue-manager[bot]@users.noreply.github.com>
Co-authored-by: arnsaha <[email protected]>
Co-authored-by: Dmytro Voskoboinikov <[email protected]>
Co-authored-by: Sumesh P <[email protected]>
Co-authored-by: mohit-adobe <[email protected]>
Co-authored-by: Stanislav Idolov <[email protected]>
Co-authored-by: Rafal Janicki <[email protected]>
Co-authored-by: Dmytro Horytskyi <[email protected]>
Co-authored-by: chittima <[email protected]>
Co-authored-by: cod43156 <[email protected]>
Co-authored-by: Sarmistha <[email protected]>
Co-authored-by: Ryan Sun <[email protected]>
Co-authored-by: Ryan Sun <[email protected]>
Co-authored-by: Adam <[email protected]>
Co-authored-by: Fabrizio Balliano <[email protected]>
Co-authored-by: Lucas van Staden <[email protected]>
Co-authored-by: Tjitse <[email protected]>
Co-authored-by: Damien Retzinger <[email protected]>
Co-authored-by: simsComputing <[email protected]>
Co-authored-by: s.humeau <[email protected]>
Co-authored-by: Abdellatif EL MIZEB <[email protected]>
Co-authored-by: mage-os-terraform[bot] <104196000+mage-os-terraform[bot]@users.noreply.github.com>
DavidLambauer added a commit to DavidLambauer/mageos-magento2 that referenced this pull request Dec 14, 2025
Removed "admin" as the default username to force users to choose
their own username, improving security by avoiding the most common
brute-force target.

## What Changed

**AdminConfig:**
- Removed default value from username question
- Changed from: `? Admin username [admin]:`
- Changed to: `? Admin username:`
- Added validation: Username required, minimum 3 characters
- Removed 'admin' fallback in return statement

## Security Benefits

1. **Prevents default credentials**: No more admin/password combos
2. **Forces conscious choice**: Users must think about username
3. **Reduces brute-force risk**: "admin" is mage-os#1 target for attacks
4. **Best practice**: Security-first approach

## User Experience

**Before:**
```
? Admin username [admin]: ← Just press Enter = "admin" 💀
```

**After:**
```
? Admin username: john_doe  ← Must type something!
```

**If user tries to skip:**
```
? Admin username:
❌ Username cannot be empty

? Validation failed. Do you want to try again? [Y/n]: y
? Admin username: myusername
```

**Validation:**
- ✅ Cannot be empty
- ✅ Must be at least 3 characters
- ✅ No default fallback

This small change significantly improves security posture by
eliminating the most common attack vector for Magento admin panels.
DavidLambauer added a commit to DavidLambauer/mageos-magento2 that referenced this pull request Dec 14, 2025
Fixed type mismatch errors when creating VOs from collector data.

RedisConfiguration::fromArray():
- Now handles nested format from RedisConfig::collect():
  {session: {enabled, host, port, database}, cache: {...}, fpc: {...}}
- Also handles flat format from saved config:
  {session: bool, cache: bool, fpc: bool, host, port, ...}
- Automatically detects which format and parses accordingly
- Extracts host/port from first available backend

RabbitMQConfiguration::fromArray():
- Now accepts null (when RabbitMQ not configured)
- Returns disabled config when null passed
- Handles both 'virtualHost' and 'virtualhost' key formats

This fixes runtime error:
"Argument mage-os#1 ($session) must be of type bool, array given"

The issue was that collectors return more complex structures
than our initial VO design assumed. Now VOs intelligently
parse both collector format and saved config format.
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.

4 participants