Skip to content

Commit b31b264

Browse files
committed
MAGETWO-51824: Pull request preparation
1 parent 2ec382f commit b31b264

File tree

4 files changed

+6
-13
lines changed
  • app/code/Magento
  • dev/tests/js/JsTestDriver/testsuite/mage/calendar
  • lib/internal/Magento/Framework/EntityManager/Operation/Write

4 files changed

+6
-13
lines changed

app/code/Magento/Catalog/etc/di.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -534,18 +534,6 @@
534534
</argument>
535535
</arguments>
536536
</type>
537-
<type name="Magento\Framework\EntityManager\OperationPool">
538-
<arguments>
539-
<argument name="operations" xsi:type="array">
540-
<item name="default" xsi:type="array">
541-
<item name="read" xsi:type="string">Magento\Framework\EntityManager\Operation\Read</item>
542-
<item name="create" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Create</item>
543-
<item name="update" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Update</item>
544-
<item name="delete" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Delete</item>
545-
</item>
546-
</argument>
547-
</arguments>
548-
</type>
549537
<type name="Magento\Framework\Model\Entity\RepositoryFactory">
550538
<arguments>
551539
<argument name="entities" xsi:type="array">

app/code/Magento/Ui/view/base/web/js/form/element/date.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ define([
116116
} else {
117117
shiftedValue = '';
118118
}
119+
119120
if (shiftedValue !== this.shiftedValue()) {
120121
this.shiftedValue(shiftedValue);
121122
}
@@ -131,6 +132,7 @@ define([
131132
var value;
132133

133134
if (shiftedValue) {
135+
134136
if (this.showsTime) {
135137
value = moment.utc(shiftedValue, this.datetimeFormat);
136138
value = value.subtract(this.timeOffset, 'seconds').toISOString();
@@ -141,6 +143,7 @@ define([
141143
} else {
142144
value = '';
143145
}
146+
144147
if (value !== this.value()) {
145148
this.value(value);
146149
}

dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ CalendarTest.prototype.testDateTimeMapping = function() {
7575
/*:DOC += <input type="text" id="calendar" /> */
7676
var calendar = $('#calendar').calendar({dateFormat: 'M/d/yy', timeFormat: 'h:mm a'});
7777
assertEquals('mm/d/yy', calendar.calendar('option', 'dateFormat'));
78-
assertEquals('h:mm tt', calendar.calendar('option', 'timeFormat'));
78+
assertEquals('h:mm TT', calendar.calendar('option', 'timeFormat'));
7979
calendar.calendar('destroy');
8080
calendar.calendar({dateFormat: 'MMMM/EEEE/yyyy', timeFormat: 'HH:mm'});
8181
assertEquals('MM/DD/yy', calendar.calendar('option', 'dateFormat'));

lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
/**
1818
* Class Delete
19+
*
20+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1921
*/
2022
class Delete
2123
{

0 commit comments

Comments
 (0)