Merge pull request #139 from renderforest/fix-screen-and-theme

Fix screen and theme

Author: emarukyan

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "renderforest/sdk-php",
   "description": "Renderforest SDK for PHP",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "homepage": "https://github.com/renderforest/renderforest-sdk-php",
   "authors": [
     {

src/ProjectData/ProjectDataStyles.php

@@ -86,10 +86,17 @@ public function exchangeArray(array $projectDataStylesArrayData)
      */
     public function getArrayCopy(): array
     {
-        $arrayCopy = [
-            self::KEY_THEME => $this->getTheme(),
-            self::KEY_TRANSITION => $this->getTransition(),
-        ];
+        $arrayCopy = [];
+        $theme = $this->getTheme();
+        $transition = $this->getTransition();
+        
+        if ($theme !== '') {
+            $arrayCopy[self::KEY_THEME] = $theme;
+        }
+
+        if ($transition) {
+            $arrayCopy[self::KEY_TRANSITION] = $transition;
+        }
 
         return $arrayCopy;
     }

src/ProjectData/Screen/Entity/Screen.php

@@ -186,7 +186,7 @@ private function calculateVideoTrimsDuration(VideoArea $area)
      */
     public function setLowerThirdSettings(int $start, int $duration): Screen
     {
-        if (1 === $this->lowerThirdAdjustable) {
+        if (true === $this->lowerThirdAdjustable) {
             $this->lowerThirdStart = $start;
             $this->lowerThirdDuration = $duration;
         } else {
@@ -196,6 +196,14 @@ public function setLowerThirdSettings(int $start, int $duration): Screen
         return $this;
     }
 
+    /**
+     * @return bool
+     */
+    private function getLowerThirdAdjustable()
+    {
+        return $this->lowerThirdAdjustable;
+    }
+
     /**
      * @return Screen
      * @throws \Exception
@@ -484,10 +492,10 @@ private function setIconAdjustable(int $iconAdjustable): Screen
     }
 
     /**
-     * @param int $lowerThirdAdjustable
+     * @param bool $lowerThirdAdjustable
      * @return Screen
      */
-    private function setLowerThirdAdjustable(int $lowerThirdAdjustable): Screen
+    private function setLowerThirdAdjustable(bool $lowerThirdAdjustable): Screen
     {
         $this->lowerThirdAdjustable = $lowerThirdAdjustable;
 
@@ -774,14 +782,17 @@ public function getArrayCopy(): array
             self::KEY_GIF_PATH => $this->getGifPath(),
             self::KEY_GIF_THUMBNAIL_PATH => $this->getGifThumbnailPath(),
             self::KEY_HIDDEN => $this->getHidden(),
-            self::KEY_MAX_DURATION => $this->getMaxDuration(),
             self::KEY_ORDER => $this->getOrder(),
             self::KEY_PATH => $this->getPath(),
             self::KEY_TAGS => $this->getTags(),
             self::KEY_TYPE => $this->getType(),
             self::KEY_AREAS => $this->areas->getArrayCopy(),
         ];
 
+        if (false === is_null($this->getMaxDuration())) {
+            $arrayCopy[self::KEY_MAX_DURATION] = $this->getMaxDuration();
+        }
+
         if (false === is_null($this->getTitle())) {
             $arrayCopy[self::KEY_TITLE] = $this->getTitle();
         }
@@ -794,6 +805,10 @@ public function getArrayCopy(): array
             $arrayCopy[self::KEY_ICON_ADJUSTABLE] = $this->getIconAdjustable();
         }
 
+        if (false === is_null($this->getLowerThirdAdjustable())) {
+            $arrayCopy[self::KEY_LOWER_THIRD_ADJUSTABLE] = $this->getLowerThirdAdjustable();
+        }
+
         if (
             false === is_null($this->lowerThirdStart)
             &&