Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1203 commits
Select commit Hold shift + click to select a range
5e6da7b
ENGCOM-2725: small misspelling fixed #17470
Aug 10, 2018
f76ff32
ENGCOM-2714: [Forwardport] Refactory to Magento_Backend module class.…
Aug 10, 2018
fdd8a5d
ENGCOM-2713: [Forwardport] MAGETWO-84608: Cannot perform setup:instal…
Aug 10, 2018
2c8638b
ENGCOM-2712: [Forwardport] Allows modules with underscores in name to…
Aug 10, 2018
ef6f3d2
ENGCOM-2705: [Forwardport] fix: remove disabled attribute on region l…
Aug 10, 2018
310d8df
ENGCOM-2703: Replacing deprecated methods from Magento_Sales module. …
Aug 10, 2018
69e182c
ENGCOM-2701: [Forwardport] Remove unnecessary translation of HTML tag…
Aug 10, 2018
728f29d
ENGCOM-2685: Declare module namespace before template path name #17394
Aug 10, 2018
730e1ea
ENGCOM-2711: [Forwardport] Improvements in UI component MassActions …
magento-engcom-team Aug 10, 2018
1736b9d
ENGCOM-2647: [Forwardport] Fix false cache_lifetime usage in xml layo…
magento-engcom-team Aug 10, 2018
acd9947
ENGCOM-2711: [Forwardport] Improvements in UI component MassActions …
Aug 10, 2018
bb9a652
ENGCOM-2647: [Forwardport] Fix false cache_lifetime usage in xml layo…
Aug 10, 2018
2026ce8
MAGETWO-91808: Categories of the Main menu in the different Store Vie…
dhorytskyi Aug 10, 2018
e9e5c74
Merge branch '2.3-develop' of https://github.com/magento/magento2ce i…
dhorytskyi Aug 10, 2018
f57f4b8
MAGETWO-91524: "element.disabled is not a function"error is thrown wh…
davgrigoryan1992 Aug 10, 2018
4711dad
MAGETWO-93286: [2.3] Gift Message lost at Checkout when logging in
yelahin-serhiy Aug 10, 2018
e4861d3
Code style fixes
Aug 10, 2018
7a3e795
Merge remote-tracking branch 'origin/MAGETWO-94029' into chaika_august2
Aug 10, 2018
353b4b6
Merge remote-tracking branch 'origin/MAGETWO-91737' into chaika_august2
Aug 10, 2018
0c885b4
Merge remote-tracking branch 'origin/MAGETWO-91771' into chaika_august2
Aug 10, 2018
05e9b78
Merge remote-tracking branch 'origin/MAGETWO-93949' into chaika_august2
Aug 10, 2018
1e6f2e6
MAGETWO-93286: [2.3] Gift Message lost at Checkout when logging in
yelahin-serhiy Aug 10, 2018
8544ae5
Static test failures fix
Aug 10, 2018
50503f2
Merge pull request #3007 from magento-tango/MAGETWO-91808
dhorytskyi Aug 10, 2018
356c0f2
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 10, 2018
8bfb6a0
merge magento/2.3-develop into magento-borg/MAGETWO-90719-reorder-exc…
Aug 10, 2018
2fc851f
Merge branch '2.3-develop' into MAGETWO-93286
yelahin-serhiy Aug 10, 2018
234d2be
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-9086…
Aug 10, 2018
be50fc3
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-90632
Aug 10, 2018
279e1f5
MAGETWO-91620: It is not possible to use function setInAllAttributeSe…
oksana-kr Aug 10, 2018
3b4ed79
merge magento/2.3-develop into magento-honey-badgers/MAGETWO-91504-pd…
Aug 10, 2018
a756e06
MQE-1172: Bump MFTF version and deliver Magento branches
KevinBKozan Aug 10, 2018
f32c719
Disabled Magento.Annotation.MethodArguments sniff due to MAGETWO-94083
Aug 10, 2018
26bd947
Merge remote-tracking branch 'mainline/2.3-develop' into chaika_august2
Aug 10, 2018
cea62ec
Magento 2.2.5: Year-to-date dropdown in Stores>Configuration>General>…
teddysie Jul 30, 2018
1c70659
Update YtdStart.php
ronak2ram Aug 7, 2018
811c6ca
MQE-1172: Bump MFTF version and deliver Magento branches
KevinBKozan Aug 10, 2018
3ab543e
Added unit test for AvailabilityChecker
dmytro-ch Aug 8, 2018
2d85db3
Braintree: Add unit test for PaymentAdditionalInformationProvider
dmytro-ch Aug 9, 2018
13fc94b
Fix typo
dmytro-ch Aug 9, 2018
23f12b9
Braintree: Add unit test for LocaleResolver
dmytro-ch Aug 9, 2018
2892b05
Update namespace
dmytro-ch Aug 9, 2018
da81fcc
MQE-1172: Bump MFTF version and deliver Magento branches
KevinBKozan Aug 10, 2018
a8e5de8
MAGETWO-90632: DHL Shipping Method not available
Aug 10, 2018
e5f3a62
Merge pull request #36 from magento-epam/SPRINT-1-MAGETWO-91500
vital5p Aug 10, 2018
96b4710
Merge pull request #38 from magento-epam/SPRINT-1-MAGETWO-91524
vital5p Aug 10, 2018
9779e03
Merge pull request #37 from magento-epam/SPRINT-1-MAGETWO-91762
vital5p Aug 10, 2018
6603a24
Improve code quality for Subscriber/NewAction
Jul 28, 2018
2f189c0
MAGETWO-94083: Impossible get information about static errors on PR
melnikovi Aug 10, 2018
ddf2509
fix: Doesn't work if use date as condition for Catalog Price Rules
GlennCheng Jul 16, 2018
68da866
MQE-1172: Bump MFTF version and deliver Magento branches
KevinBKozan Aug 10, 2018
2ca876c
Merge branch '2.3-develop' into 2.3-dev-pan-2.3.4
KevinBKozan Aug 10, 2018
46c300e
MAGETWO-94083: Impossible get information about static errors on PR
melnikovi Aug 10, 2018
9db2bd0
MAGETWO-94083: Impossible get information about static errors on PR
melnikovi Aug 11, 2018
12fb1cb
Merge pull request #3015 from magento-epam/EPAM-PR-01
rganin Aug 11, 2018
db0522f
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 11, 2018
b9b9476
Added translation for comment tag
yogeshsuhagiya Aug 11, 2018
6116023
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 11, 2018
8d96de1
ENGCOM-2744: Added translation comment tags #17519
magento-engcom-team Aug 11, 2018
b95b1a5
AD-HOC feat (Profiler): Allow supplying complex profiler configuration
andrewhowdencom May 12, 2018
2a515ef
Small refactoring for better readability
Aug 9, 2018
3977ef4
ENGCOM-2749: [Forwardport] AD-HOC feat (Profiler): Allow supplying co…
magento-engcom-team Aug 11, 2018
e1a01e9
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-9408…
melnikovi Aug 11, 2018
a119df4
MAGETWO-94083: Impossible get information about static errors on PR
melnikovi Aug 11, 2018
1cb9235
Merge pull request #3016 from magento-obsessive-owls/MAGETWO-94083-im…
Aug 11, 2018
d81b6f2
merge magento/2.3-develop into magento-pangolin/2.3-dev-pan-2.3.4
Aug 11, 2018
969985f
MQE-1172: Bump MFTF version and deliver Magento branches
okolesnyk Aug 11, 2018
7dcc6ae
MQE-1172: Bump MFTF version and deliver Magento branches
okolesnyk Aug 11, 2018
7187c2e
Merge 'develop' into 'fix/2.3-issue-16555-multi-shipping-exception'
dmytro-ch Aug 12, 2018
9868428
Fix the issue with "Shipping address is not set" exception, Fix the i…
dmytro-ch Aug 12, 2018
2c546c4
Update PHPUnit tests
dmytro-ch Aug 12, 2018
36ffdb3
ENGCOM-2326: [Forwardport] Fix the issue with 'Shipping address is no…
magento-engcom-team Aug 12, 2018
d46d36a
Fixed typo in module AdminNotification
Aug 12, 2018
088a910
Fixed typos in module CatalogRule
Aug 12, 2018
f49084f
Fixed typo 'Infomation'
Aug 12, 2018
df54a26
bug: Fix possible undefined index when caching config data
mimarcel Feb 14, 2018
1c74f55
Adding roles to images array
Aug 12, 2018
fd19955
Replacing deprecated methods.
tiagosampaio Aug 12, 2018
c7d22db
Replacing deprecated methods for Magento_Security module.
tiagosampaio Aug 12, 2018
f9f98b0
ENGCOM-2751: [Forwardport] Fix #10687 - Product image roles disappear…
magento-engcom-team Aug 12, 2018
164943d
Replacing deprecated methods for Magento_Search module.
tiagosampaio Aug 12, 2018
36b4878
ENGCOM-2754: [Forwardport] Fix possible undefined index when caching …
magento-engcom-team Aug 12, 2018
78289ea
ENGCOM-2756: Fixed typos in module CatalogRule #17549
magento-engcom-team Aug 12, 2018
05336fe
ENGCOM-2757: Fixed typo in module AdminNotification #17548
magento-engcom-team Aug 12, 2018
2361813
ENGCOM-2763: [Forwardport] Doesn't work if use date as condition for …
magento-engcom-team Aug 12, 2018
1b0619b
ENGCOM-2765: [Forwardport] Magento 2.2.5: Year-to-date dropdown in St…
magento-engcom-team Aug 12, 2018
b5ef100
Merge pull request https://github.com/magento/magento2/pull/17558 to …
magento-engcom-team Aug 12, 2018
1db1ef4
Merge pull request https://github.com/magento/magento2/pull/17555 to …
magento-engcom-team Aug 12, 2018
9051208
ENGCOM-2766: Replacing deprecated methods for Magento_Security module…
magento-engcom-team Aug 12, 2018
587db19
MQE-1172: Bump MFTF version and deliver Magento branches
okolesnyk Aug 13, 2018
d665902
Merge pull request https://github.com/magento/magento2/pull/17549 to …
magento-engcom-team Aug 13, 2018
d22c1bc
ENGCOM-2755: Fixed typo 'Infomation' #17550
magento-engcom-team Aug 13, 2018
84b6824
ENGCOM-2766: Replacing deprecated methods for Magento_Security module…
Aug 13, 2018
f186ab8
ENGCOM-2757: Fixed typo in module AdminNotification #17548
Aug 13, 2018
628905d
ENGCOM-2756: Fixed typos in module CatalogRule #17549
Aug 13, 2018
cc22e62
ENGCOM-2755: Fixed typo 'Infomation' #17550
Aug 13, 2018
538b16f
ENGCOM-2749: [Forwardport] AD-HOC feat (Profiler): Allow supplying co…
Aug 13, 2018
63f6535
ENGCOM-2744: Added translation comment tags #17519
Aug 13, 2018
949773b
ENGCOM-2719: Add Currency Converter API connecting feature #15542
Aug 13, 2018
897e7df
Fix wrong return type in StockRegistryInterface API
Aug 13, 2018
8fe076a
Merge branch '2.3-develop' into MAGETWO-93963
serhii-balko Aug 13, 2018
f31c9ab
Merge branch '2.3-develop' into MAGETWO-73774
nikita-shcherbatykh Aug 13, 2018
6a6ea40
ENGCOM-2773: Fix wrong return type in StockRegistryInterface API #17562
magento-engcom-team Aug 13, 2018
7d73804
MAGETWO-73774: [2.3] Custom option price field disallows negative val…
nikita-shcherbatykh Aug 13, 2018
ae05af1
Merge remote-tracking branch 'mainline/2.3-develop' into chaika_august2
Aug 13, 2018
40e4ae6
ENGCOM-2719: Add Currency Converter API connecting feature #15542
Aug 13, 2018
5897c80
ENGCOM-2765: [Forwardport] Magento 2.2.5: Year-to-date dropdown in St…
Aug 13, 2018
61d8bc3
ENGCOM-2719: Add Currency Converter API connecting feature #15542
Aug 13, 2018
bcdd598
Refactor: remove some code duplication
Aug 10, 2018
ce9993c
ENGCOM-2774: [Forwardport] Refactor: remove some code duplication #17571
magento-engcom-team Aug 13, 2018
50e74cd
Catalog: Add unit tests for Cron classes
dmytro-ch Aug 13, 2018
c982b62
removed lib-url-check
Karlasa Aug 9, 2018
15fbeb6
removed lib-url-check
Karlasa Aug 9, 2018
ae9d62a
remove lib-url-check
Karlasa Aug 9, 2018
074bc27
remove lib-url-check
Karlasa Aug 9, 2018
a7ddbb7
remove lib-url-check
Karlasa Aug 9, 2018
9872e74
remove lib-url-check
Karlasa Aug 9, 2018
358cbdf
remove lib-url-check
Karlasa Aug 9, 2018
96af19c
remove lib-url-check
Karlasa Aug 9, 2018
917394c
remove lib-url-check
Karlasa Aug 9, 2018
3d8d522
remove lib-url-check
Karlasa Aug 9, 2018
290fd99
remove lib-url-check
Karlasa Aug 9, 2018
da798ae
remove lib-url-check
Karlasa Aug 9, 2018
ddfb194
remove lib-url-check
Karlasa Aug 9, 2018
183c998
remove lib-url-check
Karlasa Aug 9, 2018
373cbae
remove lib-url-check
Karlasa Aug 9, 2018
f550c9b
remove lib-url-check
Karlasa Aug 9, 2018
e886063
remove lib-url-check
Karlasa Aug 9, 2018
5e7b9e7
remove lib-url-check
Karlasa Aug 9, 2018
7f173f6
remove lib-url-check
Karlasa Aug 9, 2018
988820b
remove lib-url-check
Karlasa Aug 9, 2018
3fe5676
remove lib-url-check
Karlasa Aug 9, 2018
475ee79
remove lib-url-check
Karlasa Aug 9, 2018
904b168
remove lib-url-check
Karlasa Aug 9, 2018
f34491b
remove lib-url-check
Karlasa Aug 9, 2018
49ddf60
remove lib-url-check
Karlasa Aug 9, 2018
af767c9
ENGCOM-2775: [Forwardport] updating lib LESS docs #17573
magento-engcom-team Aug 13, 2018
0d7dc6c
Solution for User role issue with customer group
Aug 11, 2018
d2ad2b9
GraphQL-127: Fixed return value for getGraphQlClient in API-functiona…
Aug 13, 2018
22679c1
Merge remote-tracking branch 'origin/2.3-develop' into test-abstract-…
Aug 13, 2018
b572ddc
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-9086…
Aug 13, 2018
28c84eb
ENGCOM-2777: [Forwardport] Catalog: Add unit tests for Cron classes #…
magento-engcom-team Aug 13, 2018
abc68c5
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-9071…
Aug 13, 2018
69d0c01
MQE-1172: Bump MFTF version and deliver Magento branches
okolesnyk Aug 13, 2018
103af2e
ENGCOM-2778: Fixed return value for getGraphQlClient in API-functiona…
magento-engcom-team Aug 13, 2018
11ade1f
Merge pull request #3013 from magento-pangolin/2.3-dev-pan-2.3.4
okolesnyk Aug 13, 2018
4f6b8a2
merge magento/2.3-develop into magento-honey-badgers/MAGETWO-91504-pd…
Aug 13, 2018
8243252
MAGETWO-90719:Exception is thrown when you re-order a product with cu…
Aug 13, 2018
8c1bd4c
Merge pull request #2999 from magento-honey-badgers/MAGETWO-91504-pdp…
cpartica Aug 14, 2018
96021c7
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 14, 2018
6bf8b33
Fix wrong class name for Unit test
Aug 14, 2018
86b9410
ENGCOM-2782: [Forwardport] Solution for User role issue with customer…
magento-engcom-team Aug 14, 2018
05f9df7
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
Aug 14, 2018
9174aa6
ENGCOM-2778: Fixed return value for getGraphQlClient in API-functiona…
Aug 14, 2018
ce29e13
ENGCOM-2777: [Forwardport] Catalog: Add unit tests for Cron classes #…
Aug 14, 2018
c1dd5a9
ENGCOM-2775: [Forwardport] updating lib LESS docs #17573
Aug 14, 2018
aa44cf0
ENGCOM-2774: [Forwardport] Refactor: remove some code duplication #17571
Aug 14, 2018
147b0f0
ENGCOM-2773: Fix wrong return type in StockRegistryInterface API #17562
Aug 14, 2018
48a1c80
ENGCOM-2763: [Forwardport] Doesn't work if use date as condition for …
Aug 14, 2018
467fa0a
ENGCOM-2754: [Forwardport] Fix possible undefined index when caching …
Aug 14, 2018
a24471d
ENGCOM-2751: [Forwardport] Fix #10687 - Product image roles disappear…
Aug 14, 2018
8e85a85
ENGCOM-2326: [Forwardport] Fix the issue with "Shipping address is no…
Aug 14, 2018
9e1caf9
Minor code style fixes
Aug 14, 2018
9a5bfd3
Fixed typo
Aug 14, 2018
0ea1ba3
ENGCOM-2786: Typo in Magento\Cms\Model\Wysiwyg\Images\Storage functio…
magento-engcom-team Aug 14, 2018
6a86074
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-9071…
Aug 14, 2018
8db43e7
Merge pull request #51 from magento-epam/EPAM-MAGETWO-91620
vital5p Aug 14, 2018
34f9814
ENGCOM-2788: Improve code quality subscriber new action #17232
magento-engcom-team Aug 14, 2018
e735178
add block config source
thomas-kl1 Jun 11, 2018
b00d4b2
add coverage test
thomas-kl1 Jun 11, 2018
d371176
MAGETWO-94060: [2.3.x] Unlink CatalogWidget from EAV indexer
RuslanKostiv1 Aug 14, 2018
ff3a3a2
Merge remote-tracking branch 'origin/MAGETWO-94060' into PANDA-2.3-de…
RuslanKostiv1 Aug 14, 2018
22fa8bd
Merge remote-tracking branch 'origin/MAGETWO-94070' into PANDA-2.3-de…
RuslanKostiv1 Aug 14, 2018
3823134
Covering Magento\Braintree\Model\InstantPurchase\CreditCard\TokenForm…
Aug 14, 2018
b6df8e7
UI Component category_form - set default sort order for General fieldset
Aug 11, 2018
d60b3cf
6305 Resolved product custom option title save issue
Madhumalak May 19, 2018
71ce3fa
Update DefaultValidator.php
May 20, 2018
170d029
2.2.6-dev-6305 fixed issue on displaying option title in invoice and …
Madhumalak May 24, 2018
6aebfe8
2.2.6-dev-6305 changes comment and repushed again for pdf issue
Madhumalak May 25, 2018
43bbdb5
Link logo in web setup wizard to back-end base URL
Aug 11, 2018
9697e0d
Fixed static test failure
Aug 15, 2018
c18fccb
ENGCOM-2791: [Forwardport] Braintree: Add unit test for CreditCard/To…
magento-engcom-team Aug 15, 2018
5224d83
ENGCOM-2792: [Forwardport] Fix for #15041 Adding a new fieldset to th…
magento-engcom-team Aug 15, 2018
c40f2ff
ENGCOM-2793: [Forwardport] 6305 - Resolved product custom option titl…
magento-engcom-team Aug 15, 2018
6b8e3ed
ENGCOM-2796: [Forwardport] Link logo in web setup wizard to back-end …
magento-engcom-team Aug 15, 2018
af6a4ff
ENGCOM-2798: [Forwardport] Braintree: test coverage #17499
magento-engcom-team Aug 15, 2018
8a8ab64
ENGCOM-2798: [Forwardport] Braintree: test coverage #17499
Aug 15, 2018
aff0142
ENGCOM-2796: [Forwardport] Link logo in web setup wizard to back-end …
Aug 15, 2018
91d188d
ENGCOM-2792: [Forwardport] Fix for #15041 Adding a new fieldset to th…
Aug 15, 2018
91a82b5
ENGCOM-2791: [Forwardport] Braintree: Add unit test for CreditCard/To…
Aug 15, 2018
a94b895
ENGCOM-2786: Typo in Magento\Cms\Model\Wysiwyg\Images\Storage functio…
Aug 15, 2018
370dc84
[Forwardport] Fix type error in Cart/Totals.
Aug 15, 2018
ce7f2b5
ENGCOM-2801: [Forwardport] Fix type error in Cart/Totals. #17620
magento-engcom-team Aug 15, 2018
a7893f9
Merge pull request #3021 from magento-panda/PANDA-2.3-develop-PR
Aug 15, 2018
3ec14e7
ENGCOM-2793: [Forwardport] 6305 - Resolved product custom option titl…
Aug 15, 2018
867f780
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 15, 2018
c123f05
Merge remote-tracking branch 'mainline/2.3-develop' into chaika_august2
Aug 15, 2018
077bf2b
Changed according PHPUnit version.
jignesh-baldha Aug 15, 2018
a756249
Merge remote-tracking branch 'origin/MAGETWO-90719-reorder-exception'…
Aug 15, 2018
de0db4d
Merge remote-tracking branch 'origin/MAGETWO-90632' into BugFixPR
Aug 15, 2018
a93ac34
Merge remote-tracking branch 'origin/MAGETWO-90862-paypal-link' into …
Aug 15, 2018
03ab0fd
Merge pull request #3023 from magento-chaika/chaika_august2
Aug 15, 2018
e1fe73a
merge magento/2.3-develop into magento-borg/BugFixPR
Aug 16, 2018
a489b28
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 16, 2018
5332072
ENGCOM-2777: [Forwardport] Catalog: Add unit tests for Cron classes #…
magento-engcom-team Aug 16, 2018
1583f8d
Merge remote-tracking branch 'origin/ENGCOM-2777-magento-magento2-175…
Aug 16, 2018
02e4bf3
Fixed code style issue
Aug 16, 2018
6f66e95
Merge remote-tracking branch 'origin/MAGETWO-93963' into 2.3-develop-pr1
serhii-balko Aug 16, 2018
338b958
Merge remote-tracking branch 'origin/MAGETWO-73774' into 2.3-develop-pr1
serhii-balko Aug 16, 2018
925f038
Merge remote-tracking branch 'origin/MAGETWO-93286' into 2.3-develop-pr1
serhii-balko Aug 16, 2018
ff67e24
Merge remote-tracking branch 'origin/MAGETWO-93692' into 2.3-develop-pr1
serhii-balko Aug 16, 2018
5c2c6ff
MAGETWO-91620: It is not possible to use function setInAllAttributeSe…
nikshostko Aug 16, 2018
db76b7d
Merge pull request #55 from magento-epam/EPAM-MAGETWO-91620
nikshostko Aug 16, 2018
5ab1fa5
Merge pull request #56 from magento-epam/2.3-develop
nikshostko Aug 16, 2018
7563605
add declare strict type tag
thomas-kl1 Aug 16, 2018
c0cc6e1
Fix exception message to avoid coupling of stock management with catalog
Aug 16, 2018
bd16533
Fixture correction to have correctly loaded invoice for creditmemo
Aug 16, 2018
b5a95c9
ENGCOM-2810: Change error message about low stock #17642
magento-engcom-team Aug 16, 2018
9f90203
Merge remote-tracking branch 'origin/MAGETWO-93963' into 2.3-develop
serhii-balko Aug 16, 2018
0f4de03
Merge remote-tracking branch 'origin/MAGETWO-73774' into 2.3-develop
serhii-balko Aug 16, 2018
ace38cd
Merge remote-tracking branch 'origin/MAGETWO-93286' into 2.3-develop
serhii-balko Aug 16, 2018
2cf900d
Merge remote-tracking branch 'origin/MAGETWO-93692' into 2.3-develop
serhii-balko Aug 16, 2018
1a968e0
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 16, 2018
30c1f25
merge magento/2.3-develop into magento-tsg-csl3/2.3-develop-pr1
Aug 16, 2018
f755cb3
Merge remote-tracking branch 'origin/2.3-develop' into 2.3-develop-pr1
serhii-balko Aug 16, 2018
6cad837
ENGCOM-2800: [Forwardport] Introduce Block Config Source #17598
magento-engcom-team Aug 16, 2018
0838f66
ENGCOM-2637: Corrected field descriptions #138
magento-engcom-team Aug 16, 2018
2963e9a
Merge remote-tracking branch 'upstream/2.3-develop' into BugFixPR
Aug 16, 2018
b8c8617
Merge branch 'BugFixPR' of https://github.com/magento-borg/magento2ce…
Aug 16, 2018
9b01481
Merge pull request #3035 from magento-borg/BugFixPR
Aug 16, 2018
81a13b7
merge magento/2.3-develop into magento-tsg-csl3/2.3-develop-pr1
Aug 17, 2018
218fa28
Merge remote-tracking branch 'mainline/2.3-develop' into 2.3-develop
serhii-balko Aug 17, 2018
96e0f8d
Merge branch '2.3-develop' into 2.3-develop-pr1
serhii-balko Aug 17, 2018
d80a4aa
ENGCOM-2810: Change error message about low stock #17642
Aug 17, 2018
1ad5bcb
ENGCOM-2801: [Forwardport] Fix type error in Cart/Totals. #17620
Aug 17, 2018
3586810
ENGCOM-2800: [Forwardport] Introduce Block Config Source #17598
Aug 17, 2018
292f928
ENGCOM-2793: [Forwardport] 6305 - Resolved product custom option titl…
Aug 17, 2018
d217225
ENGCOM-2788: Improve code quality subscriber new action #17232
Aug 17, 2018
694ee0a
ENGCOM-2782: [Forwardport] Solution for User role issue with customer…
Aug 17, 2018
17794b6
ENGCOM-2637: Corrected field descriptions #138
Aug 17, 2018
51e3616
Merge pull request #59 from magento-epam/2.3-develop
nikshostko Aug 17, 2018
498d679
Merge pull request #3032 from magento-tsg-csl3/2.3-develop-pr1
Aug 17, 2018
3ef35a7
Merge branch '2.3-develop' of github.com:magento/magento2ce into EPAM…
Aug 17, 2018
8013b3e
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 17, 2018
7fac89a
Merge pull request #3048 from magento-epam/EPAM-PR-3
rganin Aug 17, 2018
e1eebe4
[EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 17, 2018
6d3dab2
:arrows_clockwise: [EngCom] Public Pull Requests - 2.3-develop
magento-engcom-team Aug 19, 2018
2d774fa
Fixed undefinded shipping method name issue
gelanivishal Aug 11, 2018
241d445
Fixed undefinded shipping method name issue #17492
VladimirZaets Aug 12, 2018
930696a
Merge branch '2.3-develop' into 2.3-develop-PR-port-17526
gelanivishal Aug 20, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 10 additions & 2 deletions app/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,16 @@
&& isset($_SERVER['HTTP_ACCEPT'])
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
) {
\Magento\Framework\Profiler::applyConfig(
(isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])) ? $_SERVER['MAGE_PROFILER'] : trim(file_get_contents(BP . '/var/profiler.flag')),
$profilerConfig = isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])
? $_SERVER['MAGE_PROFILER']
: trim(file_get_contents(BP . '/var/profiler.flag'));

if ($profilerConfig) {
$profilerConfig = json_decode($profilerConfig, true) ?: $profilerConfig;
}

Magento\Framework\Profiler::applyConfig(
$profilerConfig,
BP,
!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public function __construct(
}

/**
* Predispath admin action controller
* Predispatch admin action controller
*
* @param \Magento\Framework\Event\Observer $observer
* @return void
Expand Down
20 changes: 0 additions & 20 deletions app/code/Magento/AdminNotification/Test/Mftf/composer.json

This file was deleted.

This file was deleted.

41 changes: 29 additions & 12 deletions app/code/Magento/AdvancedSearch/Model/ResourceModel/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,22 @@
namespace Magento\AdvancedSearch\Model\ResourceModel;

use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
use Magento\Framework\Search\Request\IndexScopeResolverInterface;
use Magento\Store\Model\StoreManagerInterface;
use Magento\Framework\Model\ResourceModel\Db\Context;
use Magento\Framework\EntityManager\MetadataPool;
use Magento\Catalog\Api\Data\CategoryInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
use Magento\Framework\Search\Request\Dimension;
use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
use Magento\Framework\Search\Request\IndexScopeResolverInterface as TableResolver;
use Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory;

/**
* @api
* @since 100.1.0
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Index extends AbstractDb
{
Expand All @@ -38,25 +42,34 @@ class Index extends AbstractDb
*/
private $tableResolver;

/**
* @var DimensionCollectionFactory|null
*/
private $dimensionCollectionFactory;

/**
* Index constructor.
* @param Context $context
* @param StoreManagerInterface $storeManager
* @param MetadataPool $metadataPool
* @param null $connectionName
* @param TableResolver|null $tableResolver
* @param DimensionCollectionFactory|null $dimensionCollectionFactory
*/
public function __construct(
Context $context,
StoreManagerInterface $storeManager,
MetadataPool $metadataPool,
$connectionName = null,
TableResolver $tableResolver = null
TableResolver $tableResolver = null,
DimensionCollectionFactory $dimensionCollectionFactory = null
) {
parent::__construct($context, $connectionName);
$this->storeManager = $storeManager;
$this->metadataPool = $metadataPool;
$this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(TableResolver::class);
$this->tableResolver = $tableResolver ?: ObjectManager::getInstance()->get(IndexScopeResolverInterface::class);
$this->dimensionCollectionFactory = $dimensionCollectionFactory
?: ObjectManager::getInstance()->get(DimensionCollectionFactory::class);
}

/**
Expand All @@ -78,18 +91,22 @@ protected function _construct()
protected function _getCatalogProductPriceData($productIds = null)
{
$connection = $this->getConnection();

$select = $connection->select()->from(
$this->getTable('catalog_product_index_price'),
['entity_id', 'customer_group_id', 'website_id', 'min_price']
);

if ($productIds) {
$select->where('entity_id IN (?)', $productIds);
$catalogProductIndexPriceSelect = [];

foreach ($this->dimensionCollectionFactory->create() as $dimensions) {
$catalogProductIndexPriceSelect[] = $connection->select()->from(
$this->tableResolver->resolve('catalog_product_index_price', $dimensions),
['entity_id', 'customer_group_id', 'website_id', 'min_price']
);
if ($productIds) {
current($catalogProductIndexPriceSelect)->where('entity_id IN (?)', $productIds);
}
}

$catalogProductIndexPriceUnionSelect = $connection->select()->union($catalogProductIndexPriceSelect);

$result = [];
foreach ($connection->fetchAll($select) as $row) {
foreach ($connection->fetchAll($catalogProductIndexPriceUnionSelect) as $row) {
$result[$row['website_id']][$row['entity_id']][$row['customer_group_id']] = round($row['min_price'], 2);
}

Expand Down
22 changes: 0 additions & 22 deletions app/code/Magento/AdvancedSearch/Test/Mftf/composer.json

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
use Magento\Framework\App\ResourceConnection;
use Magento\Framework\DB\Select;

/**
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class IndexTest extends \PHPUnit\Framework\TestCase
{
/**
Expand Down Expand Up @@ -59,10 +62,24 @@ protected function setUp()
$this->resourceConnectionMock->expects($this->any())->method('getConnection')->willReturn($this->adapterMock);
$this->metadataPoolMock = $this->createMock(MetadataPool::class);

$indexScopeResolverMock = $this->createMock(
\Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver::class
);
$traversableMock = $this->createMock(\Traversable::class);
$dimensionsMock = $this->createMock(\Magento\Framework\Indexer\MultiDimensionProvider::class);
$dimensionsMock->method('getIterator')->willReturn($traversableMock);
$dimensionFactoryMock = $this->createMock(
\Magento\Catalog\Model\Indexer\Product\Price\DimensionCollectionFactory::class
);
$dimensionFactoryMock->method('create')->willReturn($dimensionsMock);

$this->model = new Index(
$this->resourceContextMock,
$this->storeManagerMock,
$this->metadataPoolMock
$this->metadataPoolMock,
'connectionName',
$indexScopeResolverMock,
$dimensionFactoryMock
);
}

Expand All @@ -71,11 +88,13 @@ public function testGetPriceIndexDataUsesFrontendPriceIndexerTable()
$storeId = 1;
$storeMock = $this->createMock(StoreInterface::class);
$storeMock->expects($this->any())->method('getId')->willReturn($storeId);
$storeMock->method('getWebsiteId')->willReturn(1);
$this->storeManagerMock->expects($this->once())->method('getStore')->with($storeId)->willReturn($storeMock);

$selectMock = $this->createMock(Select::class);
$selectMock->expects($this->any())->method('from')->willReturnSelf();
$selectMock->expects($this->any())->method('where')->willReturnSelf();
$selectMock->expects($this->any())->method('union')->willReturnSelf();
$this->adapterMock->expects($this->once())->method('select')->willReturn($selectMock);
$this->adapterMock->expects($this->once())->method('fetchAll')->with($selectMock)->willReturn([]);

Expand Down
3 changes: 2 additions & 1 deletion app/code/Magento/AdvancedSearch/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
},
"type": "magento2-module",
"license": [
"proprietary"
"OSL-3.0",
"AFL-3.0"
],
"autoload": {
"files": [
Expand Down
13 changes: 13 additions & 0 deletions app/code/Magento/AdvancedSearch/etc/di.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,25 @@
<argument name="title" xsi:type="string" translatable="true">Did you mean</argument>
</arguments>
</type>
<type name="Magento\AdvancedSearch\Model\Client\ClientResolver">
<arguments>
<argument name="path" xsi:type="const">Magento\CatalogSearch\Model\ResourceModel\EngineInterface::CONFIG_ENGINE_PATH</argument>
<argument name="scopeType" xsi:type="const">\Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
</arguments>
</type>
<type name="Magento\AdvancedSearch\Model\SuggestedQueries">
<arguments>
<argument name="data" xsi:type="array">
<item name="mysql" xsi:type="string">Magento\AdvancedSearch\Model\DataProvider\Suggestions</item>
</argument>
</arguments>
</type>
<type name="Magento\AdvancedSearch\Model\ResourceModel\Index">
<arguments>
<argument name="tableResolver" xsi:type="object">
Magento\Catalog\Model\Indexer\Product\Price\PriceTableResolver
</argument>
</arguments>
</type>
<preference for="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProviderInterface" type="Magento\AdvancedSearch\Model\Adapter\DataMapper\AdditionalFieldsProvider" />
</config>
17 changes: 0 additions & 17 deletions app/code/Magento/Amqp/Test/Mftf/composer.json

This file was deleted.

3 changes: 2 additions & 1 deletion app/code/Magento/Amqp/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
},
"type": "magento2-module",
"license": [
"proprietary"
"OSL-3.0",
"AFL-3.0"
],
"autoload": {
"files": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
</after>
<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
<amOnPage stepKey="amOnAdminConfig" url="{{AdminConfigPage.url}}"/>
<waitForPageLoad stepKey="waitForAdminConfig"/>
<click stepKey="clickAdvancedReportingConfigMenu" selector="{{AdminConfigSection.advancedReportingMenuItem}}"/>
<see stepKey="seeAdvancedReportingIndustryLabel" selector="{{AdminConfigSection.advancedReportingIndustryLabel}}" userInput="Industry"/>
<selectOption stepKey="selectAdvancedReportingIndustry" selector="{{AdminConfigSection.advancedReportingIndustry}}" userInput="--Please Select--"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@
<severity value="MAJOR"/>
<testCaseId value="MAGETWO-66465"/>
<group value="analytics"/>
<!-- MAGETWO-90659 -->
<group value="skip"/>
<skip>
<issueId value="MAGETWO-90659"/>
</skip>
</annotations>
<after>
<amOnPage stepKey="amOnLogoutPage" url="admin/admin/auth/logout/"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
<severity value="MAJOR"/>
<testCaseId value="MAGETWO-63898"/>
<group value="analytics"/>
<!-- MAGETWO-90659 -->
<group value="skip"/>
<skip>
<issueId value="MAGETWO-90659"/>
</skip>
</annotations>

<actionGroup ref="LoginActionGroup" stepKey="loginAsAdmin"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-82648"/>
<group value="analytics"/>
<!-- MAGETWO-90659 -->
<group value="skip"/>
<skip>
<issueId value="MAGETWO-90659"/>
</skip>
</annotations>
<before>
<createData stepKey="noReportUserRole" entity="adminNoReportRole"/>
Expand Down
20 changes: 0 additions & 20 deletions app/code/Magento/Analytics/Test/Mftf/composer.json

This file was deleted.

24 changes: 0 additions & 24 deletions app/code/Magento/AsynchronousOperations/Test/Mftf/composer.json

This file was deleted.

Loading