Skip to content

Use one format in all places for array_merge #30002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Oct 15, 2020
Merged

Use one format in all places for array_merge #30002

merged 3 commits into from
Oct 15, 2020

Conversation

ihor-sviziev
Copy link
Contributor

@ihor-sviziev ihor-sviziev commented Sep 11, 2020 •
edited
Loading

Fix potential issues when no items in array
Convert all array_merge into single format, related to magento/magento-coding-standard#195

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

  1. Fixes magento/magento2#<issue_number>

Manual testing scenarios (*)

  1. ...
  2. ...

Questions or comments

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)
  • All automated tests passed successfully (all builds are green)

Resolved issues:

  1. resolves [Issue] Use one format in all places for array_merge #30005: Use one format in all places for array_merge

@ihor-sviziev ihor-sviziev added Cleanup Severity: S4 Affects aesthetics, professional look and feel, “quality” or “usability”. labels Sep 11, 2020
@m2-assistant
Copy link

m2-assistant bot commented Sep 11, 2020

Hi @ihor-sviziev. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

  • @magento give me test instance - deploy test instance based on PR changes
  • @magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

  • @magento run all tests - run or re-run all required tests against the PR changes
  • @magento run <test-build(s)> - run or re-run specific test build(s)
    For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

  1. Database Compare
  2. Functional Tests CE
  3. Functional Tests EE,
  4. Functional Tests B2B
  5. Integration Tests
  6. Magento Health Index
  7. Sample Data Tests CE
  8. Sample Data Tests EE
  9. Sample Data Tests B2B
  10. Static Tests
  11. Unit Tests
  12. WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@sidolov sidolov added the Priority: P4 No current plan to fix. Fixing can be deferred as a logical part of more important work. label Sep 11, 2020
@sidolov
Copy link
Contributor

sidolov commented Sep 11, 2020

@magento create issue

@m2-assistant m2-assistant bot mentioned this pull request Sep 11, 2020
Closed
4 tasks
@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

1 similar comment
@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev ihor-sviziev marked this pull request as draft September 12, 2020 04:27
@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev
Copy link
Contributor Author

@sidolov @naydav @lenaorobei could you add some info why integration & web api tests are failing?

@sidolov
Copy link
Contributor

sidolov commented Sep 14, 2020

@ihor-sviziev I see an error in console

PHP Fatal error:  Uncaught TypeError: Argument 1 passed to Magento\TestFramework\Workaround\Override\Config\RelationsCollector::getRelations() must be of the type string, array given, called in /var/www/html/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Config/RelationsCollector.php on line 53 and defined in /var/www/html/dev/tests/integration/framework/Magento/TestFramework/Workaround/Override/Config/RelationsCollector.php:47

@ihor-sviziev
Copy link
Contributor Author

@magento run Integration Tests, WebAPI Tests, Static Tests

@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev ihor-sviziev force-pushed the improve-array-merge branch 3 times, most recently from 05c4806 to 9ab9235 Compare September 16, 2020 12:36
@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev
Use one format in all places for array_merge
a2b9380 
Fix potential issues when no items in array
Convert all array_merge into single format
@ihor-sviziev
Use one format in all places for array_merge
f6c4cbd 
Fix failing static tests
@ihor-sviziev
Copy link
Contributor Author

@magento run all tests

@ihor-sviziev ihor-sviziev mentioned this pull request Sep 23, 2020
Merged
5 tasks
@ihor-sviziev
Copy link
Contributor Author

ihor-sviziev commented Sep 23, 2020 •
edited
Loading

I reverted all changes that were causing integration tests failures and extracted them to #30153, will debug them separately.

@lbajsarowicz could you review my PR?

@ihor-sviziev ihor-sviziev marked this pull request as ready for review September 23, 2020 11:24
@ihor-sviziev
Copy link
Contributor Author

ihor-sviziev commented Sep 23, 2020 •
edited
Loading

Just resolved conflict
@magento run all tests

@ghost ghost assigned lbajsarowicz Sep 23, 2020
@magento-engcom-team
Copy link
Contributor

Hi @lbajsarowicz, thank you for the review.
ENGCOM-8261 has been created to process this Pull Request
✳️ @lbajsarowicz, could you please add one of the following labels to the Pull Request?

Label Description
Auto-Tests: Covered All changes in Pull Request is covered by auto-tests
Auto-Tests: Not Covered Changes in Pull Request requires coverage by auto-tests
Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests

@m2-assistant m2-assistant bot mentioned this pull request Sep 24, 2020
Closed
4 tasks
@engcom-Alfa engcom-Alfa self-assigned this Oct 8, 2020
@engcom-Alfa
Copy link
Contributor

QA not applicable

@engcom-Foxtrot engcom-Foxtrot self-assigned this Oct 9, 2020
@engcom-Foxtrot engcom-Foxtrot added the Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests label Oct 9, 2020
magento-engcom-team pushed a commit that referenced this pull request Oct 15, 2020
@gabrieldagama
ENGCOM-8261: Use one format in all places for array_merge #30002
de81a98
@magento-engcom-team magento-engcom-team merged commit fa5e131 into magento:2.4-develop Oct 15, 2020
@m2-assistant
Copy link

m2-assistant bot commented Oct 15, 2020

Hi @ihor-sviziev, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lbajsarowicz lbajsarowicz lbajsarowicz approved these changes

Assignees

@lbajsarowicz lbajsarowicz

@engcom-Alfa engcom-Alfa

@engcom-Foxtrot engcom-Foxtrot

Labels
Area: Frontend Auto-Tests: Not Required Changes in Pull Request does not require coverage by auto-tests Award: category of expertise Cleanup Component: multiple Priority: P4 No current plan to fix. Fixing can be deferred as a logical part of more important work. Progress: accept Release Line: 2.4 Severity: S4 Affects aesthetics, professional look and feel, “quality” or “usability”.
Projects
Pull Requests Dashboard
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Issue] Use one format in all places for array_merge
6 participants
@ihor-sviziev @sidolov @lbajsarowicz @magento-engcom-team @engcom-Alfa @engcom-Foxtrot