Skip to content

[Backport] Wrong annotation in _toOptionArray : lib\internal\Magento\Framework\D…#26

Merged
gelanivishal merged 27 commits into2.1-developfrom
2.1-develop-PR-port-15892
Jun 8, 2018
Merged

[Backport] Wrong annotation in _toOptionArray : lib\internal\Magento\Framework\D…#26
gelanivishal merged 27 commits into2.1-developfrom
2.1-develop-PR-port-15892

Conversation

@gelanivishal
Copy link
Copy Markdown
Owner

Original Pull Request

magento#15892

Original Pull Request

Set correct annotation in _toOptionArray - lib\internal\Magento\Framework\Data\SearchResultProcessor.php

Description

Set correct annotation in _toOptionArray - lib\internal\Magento\Framework\Data\SearchResultProcessor.php

Fixed Issues (if relevant)

  1. magento/magento2#<12820>: Wrong annotation in _toOptionArray - lib\internal\Magento\Framework\Data\SearchResultProcessor.php

Manual testing scenarios

  1. Please check request parameter in _toOptionArray - magento/framework/Data/Collection/AbstractDb.php

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)

VitaliyBoyko and others added 27 commits May 17, 2018 22:17
…5290

 - Merge Pull Request magento#15290 from VitaliyBoyko/magento2:Fix-typo-in-database-column-comment
 - Merged commits:
   1. bf18e7a
 - Merge Pull Request magento#15866 from dmytro-ch/magento2:2.1-develop-PR-port-15845
 - Merged commits:
   1. 228b765
…les magento#15887

 - Merge Pull Request magento#15887 from rahul-kachhadiya/magento2:2.1-develop-PR-port-15371
 - Merged commits:
   1. 6ab1020
 - Merge Pull Request magento#15920 from DanielRuf/magento2:2.1-develop-PR-port-15871
 - Merged commits:
   1. fc35b01
…s list magento#15924

 - Merge Pull Request magento#15924 from dmytro-ch/magento2:2.1-develop-PR-port-14473
 - Merged commits:
   1. 6c6d67f
 - Merge Pull Request magento#15925 from dmytro-ch/magento2:2.1-develop-PR-port-14358
 - Merged commits:
   1. 6027744
…15926

 - Merge Pull Request magento#15926 from dmytro-ch/magento2:2.1-develop-PR-port-14350
 - Merged commits:
   1. 6257807
…ento#15927

 - Merge Pull Request magento#15927 from dmytro-ch/magento2:2.1-develop-PR-port-14306
 - Merged commits:
   1. 0658873
Accepted Public Pull Requests:
 - magento#15927: [Backport]  [magento#14089] Add Malaysian Locale Code (by @dmytro-ch)
 - magento#15926: [Backport] precision for price overriding by js (by @dmytro-ch)
 - magento#15925: [Backport] Format code (by @dmytro-ch)
 - magento#15924: [Backport] Added spanish Bolivia locale to allowedLocales list (by @dmytro-ch)
 - magento#15920: [Backport] chore: remove unused less import (by @DanielRuf)
 - magento#15887: [Backport-2.1] Added language translation in template files (by @rahul-kachhadiya)
 - magento#15866: [Backport] Update webapi.xml to fix typo (by @dmytro-ch)
 - magento#15290: [Backport] Fix typo in database column comment (by @VitaliyBoyko)


Fixed GitHub Issues:
 - magento#14089: Malaysian (Malaysia) missing from locale list (reported by @superdav42) has been fixed in magento#15927 by @dmytro-ch in 2.1-develop branch
   Related commits:
     1. 0658873

 - magento#14249: Priduct page price is using the hardcoded digits in js (reported by @cdiacon) has been fixed in magento#15926 by @dmytro-ch in 2.1-develop branch
   Related commits:
     1. 6257807
@gelanivishal gelanivishal merged commit 7136c3a into 2.1-develop Jun 8, 2018
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.

10 participants