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.

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

[Backport] Apply PHP-CS-Fixer "braces" fixes on if and foreach statements #9

Merged
merged 381 commits into from
Feb 14, 2019

Conversation

yogeshsuhagiya
Copy link
Owner

Original Pull Request

magento#21097

Description (*)

Applied following fixer rules:

  • PHP CS Fixer: method_argument_space
  • PHP CS Fixer: braces

Fixed Issues (if relevant)

  1. N/A

Manual testing scenarios (*)

  1. N/A

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 on Travis CI are green)

magento-engcom-team and others added 30 commits February 4, 2019 04:24
…mer Segment is persisted under long-term cookie
…igurable products without any tiered pricing
# Conflicts:
#	app/code/Magento/SalesRule/Test/Mftf/Data/SalesRuleData.xml
…mftf-pr14

# Conflicts:
#	app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
…igurable products without any tiered pricing
…ing does not work if there is already option with the same number without the zero [REST API] magento#19612
…e: Permanent Redirect for old URL is missed when product was imported magento#20737

 - Merge Pull Request magento#20737 from shikhamis11/magento2:2.2-develop-PR-port-20344
 - Merged commits:
   1. 1cb5e51
   2. 7de5e7e
Accepted Public Pull Requests:
 - magento#20929: resolve typo errors for js record.js (by @neeta-wagento)
 - magento#20837: [Backport] Fixed apply discount button alignment on checkout page (by @amol2jcommerce)
 - magento#20886: [Backport] magento#20409 Fixed Unnecessary slash in namespace (by @milindsingh)
 - magento#20863: [Backport] Update Filter.php fix issue magento#20624 (by @irajneeshgupta)
 - magento#20784: [Backport] Gift-option-message-overlap-edit-and-remove-button-2.2 (by @ajay2jcommerce)
 - magento#20642: [Backport] magento#12194: Tier price on configurable product sorting so� (by @amol2jcommerce)
 - magento#19612: [Backport] Fix: Attribute Option with zero at the beginning does not work if there is already option with the same number without the zero [REST API] (by @SikailoISM)
 - magento#19667: [Backport] chore: remove old code for IE9 (by @DanielRuf)


Fixed GitHub Issues:
 - magento#20137: On checkout page apply discount button is not align with input box (reported by @nainesh2jcommerce) has been fixed in magento#20837 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 4a3354a
     2. 1a75856
     3. 496c6af

 - magento#20409: Magento\Catalog\Api\ProductRenderListInterface returns products regardless of visibility (reported by @Floddy) has been fixed in magento#20886 by @milindsingh in 2.2-develop branch
   Related commits:
     1. 9092e7a

 - magento#20624: `\Magento\ImportExport\Block\Adminhtml\Export\Filter::_getSelectHtmlWithValue()` method overwrites self $value argument (reported by @andkirby) has been fixed in magento#20863 by @irajneeshgupta in 2.2-develop branch
   Related commits:
     1. 05bc8a6
     2. 34da4ca

 - magento#20604: Gift option message overlap edit and remove button (reported by @ajay2jcommerce) has been fixed in magento#20784 by @ajay2jcommerce in 2.2-develop branch
   Related commits:
     1. adf8d4c

 - magento#19436: Attribute Option with zero at the bigining does not work if there is already option with the same number without the zero (REST API)) (reported by @zexperto) has been fixed in magento#19612 by @SikailoISM in 2.2-develop branch
   Related commits:
     1. 14aa091
Accepted Public Pull Requests:
 - magento#20540: [Backport] issue fixed magento#20259 Store switcher not sliding up and down, only dropd… (by @irajneeshgupta)


Fixed GitHub Issues:
 - magento#20259: Store switcher not sliding up and down, only dropdown arrow working  (reported by @cedarvinda) has been fixed in magento#20540 by @irajneeshgupta in 2.2-develop branch
   Related commits:
     1. 4741489
     2. cd75f29
     3. 1f01d92
… swatch option, it delet… magento#20745

 - Merge Pull Request magento#20745 from amol2jcommerce/magento2:2.2-develop-PR-port-20421
 - Merged commits:
   1. 4ad7bd3
   2. b136710
… ::Time fields misaligne-2.2 magento#20602

 - Merge Pull Request magento#20602 from amol2jcommerce/magento2:Fixed-Start-time-field-Date-Field-order-misaligned-in-iPad-2.2
 - Merged commits:
   1. ebca6b3
…21163

 - Merge Pull Request magento#21163 from amol2jcommerce/magento2:2.2-develop-PR-port-20817
 - Merged commits:
   1. ce53cee
… valid coupon to cart by an integra… magento#21155

 - Merge Pull Request magento#21155 from eduard13/magento2:2.2-develop-PR-port-21028
 - Merged commits:
   1. 2fc33b4
   2. 1a31aee
[TSG] Backporting for 2.2 (pr76) (2.2)
…reek VAT numbers, should… magento#21169

 - Merge Pull Request magento#21169 from amol2jcommerce/magento2:2.2-develop-PR-port-20548
 - Merged commits:
   1. bfa4e1f
… Schedule magento#21160

 - Merge Pull Request magento#21160 from mage2pratik/magento2:2.2-develop-PR-port-20967
 - Merged commits:
   1. b82bf39
   2. c59b231
 - merged latest code from mainline branch
Accepted Public Pull Requests:
 - magento#21156: [Backport] [SendFriend] Covering the Send to friend by integration tests (by @eduard13)
 - magento#21155: [Backport] [Checkout] Covering the successfully adding a valid coupon to cart by an integra… (by @eduard13)
 - magento#20821: [Backport] Fixing the styling issue on customizable options (by @eduard13)


Fixed GitHub Issues:
 - magento#20497: Product customizable options issue (reported by @eduard13) has been fixed in magento#20821 by @eduard13 in 2.2-develop branch
   Related commits:
     1. 06f7430
… Schedule magento#21160

 - Merge Pull Request magento#21160 from mage2pratik/magento2:2.2-develop-PR-port-20967
 - Merged commits:
   1. b82bf39
   2. c59b231
   3. e5afdb2
magento#20404

 - Merge Pull Request magento#20404 from amol2jcommerce/magento2:Changes-Schedule-Update-Form-filed-misalign
 - Merged commits:
   1. 2eeecdb
Fixed issues:
- MAGETWO-97313: [Backport 2.2.x] Mysql reconnect does not work
Accepted Public Pull Requests:
 - magento#20404: [Backport] Changes-Schedule-Update-Form-filed-misalign-2.2 (by @amol2jcommerce)
 - magento#21160: [Backport] Fixed redirection issue in Admin-> Content -> Schedule (by @mage2pratik)
 - magento#21169: [Backport] Fixes incorrect country code being used for Greek VAT numbers, should� (by @amol2jcommerce)
 - magento#21163: [Backport] Orders-and-Returns-layout-not-proper (by @amol2jcommerce)
 - magento#21161: [Backport] Extra space from left in top message section (Notification section) (by @mage2pratik)
 - magento#21140: [Backport] Fixed store switcher doesn't work multistore setup with different product urls issue (by @janakbhimani)
 - magento#21114: [Backport] Fixed issue magento#20157 On advanced search page Price field misaligned on mobile view (by @amol2jcommerce)
 - magento#20616: [Backport] Fixed admin multiselect and select ui arrow toggle issue (by @niravkrish)


Fixed GitHub Issues:
 - magento#20402: Schedule update from filed misalignment in 768 x 1147 resolution (reported by @amol2jcommerce) has been fixed in magento#20404 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. 2eeecdb

 - magento#6960: Greek vat numbers cannot be validated (reported by @schnappenberger) has been fixed in magento#21169 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. bfa4e1f

 - magento#20816: Orders and Returns layout not proper (reported by @yashwant2jcommerce) has been fixed in magento#21163 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. ce53cee

 - magento#19714: Store switcher doesn't work multistore setup with different product urls (reported by @sreichel) has been fixed in magento#21140 by @janakbhimani in 2.2-develop branch
   Related commits:
     1. bd1e538
     2. a886103
     3. 78df524
     4. 7ebc03f
     5. 7e4fe31

 - magento#20157: On advanced search page Price field misaligned on mobile view (reported by @ajay2jcommerce) has been fixed in magento#21114 by @amol2jcommerce in 2.2-develop branch
   Related commits:
     1. cb67c97
     2. 665dbef
     3. 246a344
     4. 09c0f01

 - magento#20240: Admin - dropdown toggle arrow not working on closing (reported by @saphaljha) has been fixed in magento#20616 by @niravkrish in 2.2-develop branch
   Related commits:
     1. b8fa8f3
@yogeshsuhagiya yogeshsuhagiya merged this pull request into 2.2-develop Feb 14, 2019
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.