Merge pull request #149 from tigranmaestro/master

Make Some Properties Not Required

Author: emarukyan

src/ProjectData/Screen/Area/Entity/TextArea.php

@@ -16,8 +16,6 @@ class TextArea extends AbstractArea
         self::KEY_CORDS,
         self::KEY_HEIGHT,
         self::KEY_WIDTH,
-        self::KEY_ORIGINAL_HEIGHT,
-        self::KEY_ORIGINAL_WIDTH,
         self::KEY_ORDER,
         self::KEY_WORD_COUNT,
         self::KEY_TITLE,
@@ -27,10 +25,10 @@ class TextArea extends AbstractArea
     /** @var string */
     protected $type = self::AREA_TYPE_TEXT;
 
-    /** @var int */
+    /** @var int|null */
     protected $originalHeight;
 
-    /** @var int */
+    /** @var int|null */
     protected $originalWidth;
 
     /** @var bool|null */
@@ -160,11 +158,13 @@ public function exchangeArray(array $textAreaArrayData)
             }
         }
 
-        $originalHeight = $textAreaArrayData[self::KEY_ORIGINAL_HEIGHT];
-        $this->setOriginalHeight($originalHeight);
+        if (array_key_exists(self::KEY_ORIGINAL_HEIGHT, $textAreaArrayData)) {
+            $this->setOriginalHeight($textAreaArrayData[self::KEY_ORIGINAL_HEIGHT]);
+        }
 
-        $originalWidth = $textAreaArrayData[self::KEY_ORIGINAL_WIDTH];
-        $this->setOriginalWidth($originalWidth);
+        if (array_key_exists(self::KEY_ORIGINAL_WIDTH, $textAreaArrayData)) {
+            $this->setOriginalWidth($textAreaArrayData[self::KEY_ORIGINAL_WIDTH]);
+        }
 
         if (array_key_exists(self::KEY_REMOVED, $textAreaArrayData)) {
             $this->setRemoved($textAreaArrayData[self::KEY_REMOVED]);
@@ -188,10 +188,16 @@ public function getArrayCopy(): array
     {
         $arrayCopy = [
             self::KEY_TYPE => self::AREA_TYPE_TEXT,
-            self::KEY_ORIGINAL_HEIGHT => $this->getOriginalHeight(),
-            self::KEY_ORIGINAL_WIDTH => $this->getOriginalWidth(),
         ];
 
+        if (false === is_null($this->getOriginalHeight())) {
+            $arrayCopy[self::KEY_ORIGINAL_HEIGHT] = $this->getOriginalHeight();
+        }
+
+        if (false === is_null($this->getOriginalWidth())) {
+            $arrayCopy[self::KEY_ORIGINAL_WIDTH] = $this->getOriginalWidth();
+        }
+
         if (false === is_null($this->getRemoved())) {
             $arrayCopy[self::KEY_REMOVED] = $this->getRemoved();
         }

src/ProjectData/Screen/Entity/Screen.php

@@ -698,13 +698,13 @@ public function exchangeArray(array $screenArrayData)
         $screenDuration = $screenArrayData[self::KEY_DURATION];
         $this->duration = $screenDuration;
 
-        $screenSelectedDuration = $screenArrayData[self::KEY_SELECTED_DURATION];
-        $this->selectedDuration = $screenSelectedDuration;
+        if (array_key_exists(self::KEY_SELECTED_DURATION, $screenArrayData)) {
+            $this->selectedDuration = $screenArrayData[self::KEY_SELECTED_DURATION];
+        }
 
         $screenExtraVideoSecond = $screenArrayData[self::KEY_EXTRA_VIDEO_SECOND];
         $this->setExtraVideoSecond($screenExtraVideoSecond);
 
-
         if (array_key_exists(self::KEY_GIF_BIG_PATH, $screenArrayData)) {
             $this->setGifBigPath($screenArrayData[self::KEY_GIF_BIG_PATH]);
         }