ACP2E-2622: Unable to save changes to phone number in existing order details

     - Fixed build failures

Author: lakshmana49

app/code/Magento/Sales/Model/ResourceModel/Order/Address.php

@@ -15,7 +15,7 @@
 class Address extends SalesResource implements OrderAddressResourceInterface
 {
     /**
-     * Event prefix
+     * Sales order address event prefix
      *
      * @var string
      */
@@ -33,10 +33,10 @@ class Address extends SalesResource implements OrderAddressResourceInterface
 
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute
-     * @param \Magento\SalesSequence\Model\Manager $sequenceManager
      * @param Snapshot $entitySnapshot
      * @param \Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite $entityRelationComposite
+     * @param \Magento\Sales\Model\ResourceModel\Attribute $attribute
+     * @param \Magento\SalesSequence\Model\Manager $sequenceManager
      * @param \Magento\Sales\Model\Order\Address\Validator $validator
      * @param \Magento\Sales\Model\ResourceModel\GridPool $gridPool
      * @param string $connectionName

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/Order/AddressTest.php

@@ -98,10 +98,6 @@ public function testSave()
             ->method('validate')
             ->with($this->addressMock)
             ->willReturn([]);
-        $this->entitySnapshotMock->expects($this->once())
-            ->method('isModified')
-            ->with($this->addressMock)
-            ->willReturn(true);
         $this->addressMock->expects($this->once())
             ->method('getParentId')
             ->willReturn(1);
@@ -116,10 +112,6 @@ public function testSaveValidationFailed()
     {
         $this->expectException('Magento\Framework\Exception\LocalizedException');
         $this->expectExceptionMessage('We can\'t save the address:');
-        $this->entitySnapshotMock->expects($this->once())
-            ->method('isModified')
-            ->with($this->addressMock)
-            ->willReturn(true);
         $this->addressMock->expects($this->any())
             ->method('hasDataChanges')
             ->willReturn(true);

lib/internal/Magento/Framework/Model/ResourceModel/Db/VersionControl/Snapshot.php

@@ -59,7 +59,14 @@ public function registerSnapshot(\Magento\Framework\DataObject $entity)
      */
     public function getSnapshotData(\Magento\Framework\DataObject $entity)
     {
-        return $this->snapshotData[get_class($entity)][$entity->getId()];
+        $entityClass = get_class($entity);
+        $entityId = $entity->getId();
+
+        if (isset($this->snapshotData[$entityClass][$entityId])) {
+            return $this->snapshotData[$entityClass][$entityId];
+        }
+
+        return [];
     }
 
     /**