Merge pull request #108 from renderforest/voiceover-project-data

voiceover-project-data

Author: narekhovhannisyan

README.md

@@ -587,6 +587,8 @@ $projectDataInstance->setStyles($styles);
 
 ##### Set voice-over
 
+In case if you want to unset `voiceover`, send empty array.
+
 ```php
 $voiceOver = [
   'path' => 'https://example.com/voice-ower.mp3' // optional

composer.json

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

src/ProjectData/ProjectData.php

@@ -24,35 +24,39 @@ class ProjectData
      */
     public function __construct($projectDataJson)
     {
-        /**
-         * Get SDK version from composer.json file and set it in generator`.
-         */
-        $ComposerJson = json_decode(file_get_contents(dirname(__FILE__) . '/../../composer.json'), true);
-        $sdkVersion = $ComposerJson['version'];
-        $this->generator = "renderforest/sdk-node/$sdkVersion";
-
-        function objectToArray($objectToConvert)
-        {
-            if (is_object($objectToConvert)) {
-                $objectToConvert = get_object_vars($objectToConvert);
-            }
+        $composer = file_get_contents(dirname(__FILE__) . '/../../composer.json');
+        $composerJson = json_decode($composer, true);
+        $sdkVersion = $composerJson['version'];
 
-            if (is_array($objectToConvert)) {
-                return array_map(__FUNCTION__, $objectToConvert);
-            } else {
-                return $objectToConvert;
-            }
-        }
-        $this->projectDataJson = objectToArray($projectDataJson);
-        $this->projectDataUtil = new ProjectDataUtil();
+        $this->generator = "renderforest/sdk-php/$sdkVersion";
         $this->patchProperties = [];
+        $this->projectDataJson = $this->objectToArray($projectDataJson);
+        $this->projectDataUtil = new ProjectDataUtil();
         $this->setGenerator();
     }
 
     /**
-     * @param $array
+     * Converts `stdClass` object to array recursively.
+     * @param \stdClass $objectToConvert
      * @return array
+     */
+    private function objectToArray($objectToConvert)
+    {
+        if (is_object($objectToConvert)) {
+            $objectToConvert = get_object_vars($objectToConvert);
+        }
+
+        if (is_array($objectToConvert)) {
+            return array_map([__CLASS__, __METHOD__], $objectToConvert);
+        } else {
+            return $objectToConvert;
+        }
+    }
+
+    /**
      * Checks if given array have `NULL` property then unset it, otherwise does noting.
+     * @param $array - The data to unset `NULL` props.
+     * @return array
      */
     private function unsetNullProperties($array)
     {
@@ -75,8 +79,8 @@ private function setGenerator()
     }
 
     /**
-     * @return array
      * Get patch object.
+     * @return array
      */
     public function getPatchObject()
     {
@@ -258,6 +262,7 @@ public function getVoiceOver()
      */
     public function setVoiceOver($voiceOver)
     {
+        $voiceOver = (empty($voiceOver)) ? new \stdClass() : $voiceOver;
         $this->projectDataJson['data']['voiceOver'] = $voiceOver;
         array_push($this->patchProperties, 'voiceOver');
     }

src/ProjectData/ProjectDataUtil.php

@@ -81,7 +81,7 @@ public function insertAndNormalizeOrder($screens, $newScreen)
         usort($screensWithNewScreen, $this->sortFactory('order'));
 
         return array_map(
-            array(new ProjectDataUtil(), 'normalizeOrders'),
+            array(__CLASS__, 'normalizeOrders'),
             $screensWithNewScreen,
             array_keys($screensWithNewScreen)
         );