diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
index a57a461960c16..079a6ad8f9f92 100644
--- a/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Model/ProductLink/RepositoryTest.php
@@ -97,7 +97,7 @@ protected function setUp()
false
);
$this->hydratorMock = $this->getMock(
- 'Magento\Framework\Model\Entity\EntityHydrator',
+ 'Magento\Framework\Model\Entity\Hydrator',
['extract'],
[],
'',
diff --git a/app/code/Magento/Catalog/etc/di.xml b/app/code/Magento/Catalog/etc/di.xml
index 46de140b2c5a8..21f2882cab72d 100644
--- a/app/code/Magento/Catalog/etc/di.xml
+++ b/app/code/Magento/Catalog/etc/di.xml
@@ -542,18 +542,6 @@
-
-
-
- -
-
- Magento\Framework\Model\Operation\Read
- - Magento\Framework\EntityManager\Operation\Write\Create
- - Magento\Framework\EntityManager\Operation\Write\Update
- - Magento\Framework\EntityManager\Operation\Write\Delete
-
-
-
-
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
index f6b86377d6fd2..a0a82291e98ad 100644
--- a/app/code/Magento/Ui/view/base/web/js/form/element/date.js
+++ b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
@@ -113,10 +113,12 @@ define([
}
shiftedValue = shiftedValue.format(this.datetimeFormat);
+ } else {
+ shiftedValue = '';
+ }
- if (shiftedValue !== this.shiftedValue()) {
- this.shiftedValue(shiftedValue);
- }
+ if (shiftedValue !== this.shiftedValue()) {
+ this.shiftedValue(shiftedValue);
}
},
@@ -130,6 +132,7 @@ define([
var value;
if (shiftedValue) {
+
if (this.showsTime) {
value = moment.utc(shiftedValue, this.datetimeFormat);
value = value.subtract(this.timeOffset, 'seconds').toISOString();
@@ -137,10 +140,12 @@ define([
value = moment(shiftedValue, this.datetimeFormat);
value = value.format(this.outputDateFormat);
}
+ } else {
+ value = '';
+ }
- if (value !== this.value()) {
- this.value(value);
- }
+ if (value !== this.value()) {
+ this.value(value);
}
},
diff --git a/app/code/Magento/Ui/view/base/web/js/modal/modal.js b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
index 560f9c82b5b5f..759ea3be5e624 100644
--- a/app/code/Magento/Ui/view/base/web/js/modal/modal.js
+++ b/app/code/Magento/Ui/view/base/web/js/modal/modal.js
@@ -221,8 +221,8 @@ define([
this._createOverlay();
this._setActive();
this._setKeyListener();
- this.modal.one(this.options.transitionEvent, _.bind(this._trigger, this, 'opened'));
this.modal.one(this.options.transitionEvent, _.bind(this._setFocus, this, 'end', 'opened'));
+ this.modal.one(this.options.transitionEvent, _.bind(this._trigger, this, 'opened'));
this.modal.addClass(this.options.modalVisibleClass);
if (!this.options.transitionEvent) {
diff --git a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js b/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js
index ce4a2d4ea219b..c2b0f1652717d 100644
--- a/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js
+++ b/dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js
@@ -75,7 +75,7 @@ CalendarTest.prototype.testDateTimeMapping = function() {
/*:DOC += */
var calendar = $('#calendar').calendar({dateFormat: 'M/d/yy', timeFormat: 'h:mm a'});
assertEquals('mm/d/yy', calendar.calendar('option', 'dateFormat'));
- assertEquals('h:mm tt', calendar.calendar('option', 'timeFormat'));
+ assertEquals('h:mm TT', calendar.calendar('option', 'timeFormat'));
calendar.calendar('destroy');
calendar.calendar({dateFormat: 'MMMM/EEEE/yyyy', timeFormat: 'HH:mm'});
assertEquals('MM/DD/yy', calendar.calendar('option', 'dateFormat'));
diff --git a/lib/internal/Magento/Framework/EntityManager/CallbackHandler.php b/lib/internal/Magento/Framework/EntityManager/CallbackHandler.php
index c8e69ddf21074..4f24b32844b8f 100644
--- a/lib/internal/Magento/Framework/EntityManager/CallbackHandler.php
+++ b/lib/internal/Magento/Framework/EntityManager/CallbackHandler.php
@@ -25,7 +25,7 @@ class CallbackHandler
protected $logger;
/**
- * CommitCallback constructor.
+ * CallbackHandler constructor.
*
* @param MetadataPool $metadataPool
* @param LoggerInterface $logger
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Create.php b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Create.php
index 66d0fd3043058..43b7f2efa2835 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Create.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Create.php
@@ -6,7 +6,6 @@
namespace Magento\Framework\EntityManager\Operation\Write;
-use Magento\Framework\EntityManager\Operation\Write\Create\ValidateCreate;
use Magento\Framework\EntityManager\Operation\Write\Create\CreateMain;
use Magento\Framework\EntityManager\Operation\Write\Create\CreateAttributes;
use Magento\Framework\EntityManager\Operation\Write\Create\CreateExtensions;
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete.php b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete.php
index f4105d818858f..33b02761e3176 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Delete.php
@@ -6,7 +6,6 @@
namespace Magento\Framework\EntityManager\Operation\Write;
-use Magento\Framework\EntityManager\Operation\Write\Delete\ValidateDelete;
use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteMain;
use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteAttributes;
use Magento\Framework\EntityManager\Operation\Write\Delete\DeleteExtensions;
@@ -17,6 +16,8 @@
/**
* Class Delete
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class Delete
{
diff --git a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Update.php b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Update.php
index c84311b5e49bb..7916d886b10dd 100644
--- a/lib/internal/Magento/Framework/EntityManager/Operation/Write/Update.php
+++ b/lib/internal/Magento/Framework/EntityManager/Operation/Write/Update.php
@@ -6,7 +6,6 @@
namespace Magento\Framework\EntityManager\Operation\Write;
-use Magento\Framework\EntityManager\Operation\Write\Update\ValidateUpdate;
use Magento\Framework\EntityManager\Operation\Write\Update\UpdateMain;
use Magento\Framework\EntityManager\Operation\Write\Update\UpdateAttributes;
use Magento\Framework\EntityManager\Operation\Write\Update\UpdateExtensions;
diff --git a/lib/internal/Magento/Framework/EntityManager/OperationPool.php b/lib/internal/Magento/Framework/EntityManager/OperationPool.php
index 6fe0f259e20f0..14f88a129c18a 100644
--- a/lib/internal/Magento/Framework/EntityManager/OperationPool.php
+++ b/lib/internal/Magento/Framework/EntityManager/OperationPool.php
@@ -24,7 +24,7 @@ class OperationPool
private $objectManager;
/**
- * OrchestratorPool constructor.
+ * OperationPool constructor.
* @param ObjectManager $objectManager
* @param string[] $operations
*/
diff --git a/lib/web/mage/calendar.js b/lib/web/mage/calendar.js
index a75d457522e79..971c0668c2f93 100644
--- a/lib/web/mage/calendar.js
+++ b/lib/web/mage/calendar.js
@@ -394,7 +394,7 @@
'yy': 'yy' // Always long year format on frontend
},
time: {
- 'a': 'tt',
+ 'a': 'TT',
'HH': 'hh',
'H': 'h'
}