Skip to content
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

MC-36959 Remove "compareArraysRecursively" logic duplication #29733

Merged
merged 145 commits into from
Aug 25, 2020
Merged

MC-36959 Remove "compareArraysRecursively" logic duplication #29733

merged 145 commits into from
Aug 25, 2020

Conversation

le0n4ik
Copy link
Contributor

@le0n4ik le0n4ik commented Aug 24, 2020 •
edited
Loading

Description (*)

The compareArraysRecursively logic is realized in:

\Magento\TestFramework\Helper\CompareArraysRecursively

and

\Magento\TestFramework\TestCase\GraphQlAbstract::compareArraysRecursively

Realization and usage of \Magento\TestFramework\TestCase\GraphQlAbstract::compareArraysRecursively should be removed.

Related Pull Requests

magento/catalog-storefront#234
https://github.com/magento/partners-magento2ee/pull/312

Fixed Issues (if relevant)

https://jira.corp.magento.com/browse/MC-36959

  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)

Rudolf Vince and others added 30 commits March 30, 2020 10:32
Implement ActionInterface for Wishlist/Shared
a4c74d8
Unit test for Wishlist/Shared Controller
18e7519
PSR2 linted
a002bf2
Implement ActionInterface for Wishlist/Shared/Cart + unit test
df2c759
Static test fixes
3ac458b
conflicts resolved; Merge branch '2.4-develop' into refactor/wishlist
935bdfa 
# Conflicts:
#	app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php
#	app/code/Magento/Wishlist/Test/Unit/Controller/Shared/CartTest.php
suppress ExcessiveMethodLength notice
f474439
@Ynhockey
Grammar fixes in Registry.php
204d0c3
@Scarbous
Use Variable for border-radius
eface05 
The border-radius was hard coded, so i changed it to: @button__border-radius
@Scarbous
Merge branch '2.4-develop' into patch-1
9bd16ba
@medigeek
#28802: Fix typo retires => retries
2dfa221 
#28802: Fix typo retires => retries
Merge branch '2.4-develop' into refactor/wishlist
2ce3982
added extend Action back, updated tests
4a85364
removed unnecessary properties
979ab1f
Merge branch '2.4-develop' into refactor/wishlist
2f65f66
fixed tests
6d8f77c
fixed tests
2616ba1
reverted fixed tests
e2db162
objectmanager added to test
2f08064
@engcom-Charlie
Merge branch '2.4-develop' into refactor/wishlist
9a1da8a
@engcom-Charlie
impr
21f9fa4
@DmitryTsymbal
Enabling Email To Friend Functionality
1b0f8df
@engcom-Kilo
Added testCaseId to MFTF test.
680ca2b
@engcom-Kilo
Merge branch '2.4-develop' into enableEmailToFriendFunctionality
2a76cb3
@DmitryTsymbal
Severity adding
44a6504
@DmitryTsymbal
reformat code
d95fa18
@Scarbous
Merge branch '2.4-develop' into patch-1
a59cd76
@engcom-Kilo
Merge branch '2.4-develop' into enableEmailToFriendFunctionality
53d86d7
@guidance-automotan
#29315: \Magento\Config\Model\Config\Source\Email\Template::toOptionA…
e786d51 
…rray throws error when setPath() is not called first

- Guard against an edge case where toOptionArray is called without having set a path first
@guidance-automotan
#29315: \Magento\Config\Model\Config\Source\Email\Template::toOptionA…
e0972bf 
…rray throws error when setPath() is not called first

- Fix formatting for static tests
sidolov and others added 7 commits August 21, 2020 12:21
@sidolov
ENGCOM-7804: MFTF: Enabling Email To Friend Functionality. Assert Opt…
c6e48ab 
…ions #29042
@sidolov
ENGCOM-7716: #28802: Fix typo retires => retries #28816
9ede49c
@sidolov
ENGCOM-7630: Use Variable for border-radius #28548
aac9be8
@magento-engcom-team
[Magento Community Engineering] Community Contributions - 2.4-develop…
03aecf2 
…-prs

 - merged with '2.4-develop-fast-lane-prs' branch
@magento-engcom-team
🔃 [Magento Community Engineering] Community Contributions - 2.4-develop
7fbae46 
Accepted Community Pull Requests:
 - #29703: Fixed the wrong code style in return type declaration (by @andrewbess)
 - #29460: [MFTF] Add ActionGroup for clicking edit link on customer grid (by @Usik2203)
 - #29510: #28422 :- Newsletter subscription confirmation email never sent again (by @konarshankar07)
 - #29474: fix Same store name overriding in the store view grid filter (by @engcom-Charlie)
 - #27494: Implement ActionInterface for wishlist/shared (by @dxx004)
 - #28512: Grammar fixes in Registry.php PHPDoc (by @Ynhockey)
 - #29042: MFTF: Enabling Email To Friend Functionality. Assert Options (by @DmitryTsymbal)
 - #28816:  #28802: Fix typo retires => retries (by @medigeek)
 - #28548: Use Variable for border-radius (by @Scarbous)


Fixed GitHub Issues:
 - #29712: [Issue] Fixed the wrong code style in return type declaration (reported by @m2-assistant[bot]) has been fixed in #29703 by @andrewbess in 2.4-develop branch
   Related commits:
     1. 01e90b1

 - #29501: [Issue] [MFTF] Add ActionGroup for clicking edit link on customer grid (reported by @m2-assistant[bot]) has been fixed in #29460 by @Usik2203 in 2.4-develop branch
   Related commits:
     1. 83b4012
     2. 152c29b
     3. fca9f6f
     4. 7df7ae3

 - #28422: Newsletter subscription confirmation email never sent again (reported by @VincentMarmiesse) has been fixed in #29510 by @konarshankar07 in 2.4-develop branch
   Related commits:
     1. 1a7c8cd
     2. 6e53e0d
     3. ea584f9
     4. ab3db16

 - #29267: Same store name overriding in the store view grid filter   (reported by @jigar48) has been fixed in #29474 by @engcom-Charlie in 2.4-develop branch
   Related commits:
     1. 1b39196
     2. 9a98048
     3. 5fbb3cf
     4. 5565349

 - #29537: [Issue] Implement ActionInterface for wishlist/shared (reported by @m2-assistant[bot]) has been fixed in #27494 by @dxx004 in 2.4-develop branch
   Related commits:
     1. a4c74d8
     2. 18e7519
     3. a002bf2
     4. df2c759
     5. 3ac458b
     6. 935bdfa
     7. f474439
     8. 2ce3982
     9. 4a85364
     10. 979ab1f
     11. 2f65f66
     12. 6d8f77c
     13. 2616ba1
     14. e2db162
     15. 2f08064
     16. 9a1da8a
     17. 21f9fa4
     18. 26cd80d
     19. c5f6a1f
     20. a7da7fd

 - #29661: [Issue] Grammar fixes in Registry.php PHPDoc (reported by @m2-assistant[bot]) has been fixed in #28512 by @Ynhockey in 2.4-develop branch
   Related commits:
     1. 204d0c3

 - #29145: [Issue] MFTF: Enabling Email To Friend Functionality. Assert Options (reported by @m2-assistant[bot]) has been fixed in #29042 by @DmitryTsymbal in 2.4-develop branch
   Related commits:
     1. 1b0f8df
     2. 680ca2b
     3. 2a76cb3
     4. 44a6504
     5. d95fa18
     6. 53d86d7

 - #28802: typo: setup:config:set  --session-save-redis-sentinel-connect-retires (instead of retries) (reported by @medigeek) has been fixed in #28816 by @medigeek in 2.4-develop branch
   Related commits:
     1. 2dfa221

 - #28674: [Issue] Use Variable for border-radius (reported by @m2-assistant[bot]) has been fixed in #28548 by @Scarbous in 2.4-develop branch
   Related commits:
     1. eface05
     2. 9bd16ba
     3. a59cd76
@le0n4ik
Merge branch '2.4-develop' of github.com:magento/magento2ce into 2.4-…
f80022b 
…develop
@le0n4ik
MC-36959: Remove "compareArraysRecursively" logic duplication
db188b6
@m2-assistant
Copy link

m2-assistant bot commented Aug 24, 2020

Hi @le0n4ik. 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 develop-storefront 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

@bricht bricht mentioned this pull request Aug 24, 2020
Merged
4 tasks
@rogyar rogyar self-assigned this Aug 25, 2020
rogyar
rogyar requested changes Aug 25, 2020
View reviewed changes
Copy link
Contributor

@rogyar rogyar left a comment

Choose a reason for hiding this comment

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

Hi @le0n4ik. Thank you for your collaboration. Please, make sure the current PR contains only necessary commits and the target branch is 2.4-develop.

@lbajsarowicz lbajsarowicz changed the base branch from develop-storefront to 2.4-develop August 25, 2020 10:10
@lbajsarowicz
Copy link
Contributor

@le0n4ik I changed the base to 2.4-develop for you.

@sidolov sidolov added the Catalog Storefront don't merge with 2.4-develop. PR for project https://github.com/magento/catalog-storefront/wiki label Aug 25, 2020
@mslabko
Copy link
Member

mslabko commented Aug 25, 2020

@lbajsarowicz please, don't change target if it was created to "develop-storefront"

@lbajsarowicz lbajsarowicz changed the base branch from 2.4-develop to develop-storefront August 25, 2020 14:42
@lbajsarowicz
Copy link
Contributor

@le0n4ik OK. Please notify us when you rebase your code to be reviewable :)

@le0n4ik le0n4ik requested a review from rogyar August 25, 2020 14:44
@le0n4ik
Copy link
Contributor Author

le0n4ik commented Aug 25, 2020

@rogyar can you please approve review?

@mslabko mslabko merged commit 7f18db2 into develop-storefront Aug 25, 2020
@m2-assistant
Copy link

m2-assistant bot commented Aug 25, 2020

Hi @le0n4ik, 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.

@okorshenko okorshenko deleted the MC-36959 branch August 25, 2020 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rogyar rogyar Awaiting requested review from rogyar

Assignees

@rogyar rogyar

Labels
Catalog Storefront don't merge with 2.4-develop. PR for project https://github.com/magento/catalog-storefront/wiki Progress: needs update
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.