Merge branch 'develop' of https://github.corp.magento.com/magento2/ma…

…gento2ce into MTA-3295
magento · Apr 18, 2016 · e808b12 · e808b12
2 parents 4d2d8c5 + 8cf5dc6
commit e808b12
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 27 deletions.
diff --git 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
@@ -542,18 +542,6 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\Model\OrchestratorPool">
-        <arguments>
-            <argument name="operations" xsi:type="array">
-                <item name="default" xsi:type="array">
-                    <item name="read" xsi:type="string">Magento\Framework\Model\Operation\Read</item>
-                    <item name="create" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Create</item>
-                    <item name="update" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Update</item>
-                    <item name="delete" xsi:type="string">Magento\Framework\EntityManager\Operation\Write\Delete</item>
-                </item>
-            </argument>
-        </arguments>
-    </type>
     <type name="Magento\Framework\Model\Entity\RepositoryFactory">
         <arguments>
             <argument name="entities" xsi:type="array">

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
@@ -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,17 +132,20 @@ define([
             var value;
 
             if (shiftedValue) {
+
                 if (this.showsTime) {
                     value = moment.utc(shiftedValue, this.datetimeFormat);
                     value = value.subtract(this.timeOffset, 'seconds').toISOString();
                 } else {
                     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
@@ -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
@@ -75,7 +75,7 @@ CalendarTest.prototype.testDateTimeMapping = function() {
     /*:DOC += <input type="text" id="calendar" /> */
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -394,7 +394,7 @@
                         'yy': 'yy' // Always long year format on frontend
                     },
                     time: {
-                        'a': 'tt',
+                        'a': 'TT',
                         'HH': 'hh',
                         'H': 'h'
                     }