Fix creating of Git Trees

Author: stloyd

lib/Github/Api/AbstractApi.php

@@ -66,4 +66,21 @@ protected function delete($path, array $parameters = array(), $requestOptions =
     {
         return $this->client->delete($path, $parameters, $requestOptions);
     }
+
+    /**
+     * Translates array to object, for proper json data (forcing `[]` instead of `{}`)
+     *
+     * @param array $params
+     *
+     * @return object
+     */
+    protected function translateArrayToObject(array $params)
+    {
+        $object = new \stdClass();
+        foreach ($params as $key => $param) {
+            $object->$key = $param;
+        }
+
+        return $object;
+    }
 }

lib/Github/Api/GitData/Trees.php

@@ -18,16 +18,25 @@ public function show($username, $repository, $sha, $recursive = false)
 
     public function create($username, $repository, array $params)
     {
-        if (!isset($params['tree'])) {
+        if (!isset($params['tree']) || !is_array($params['tree'])) {
             throw new MissingArgumentException('tree');
         }
-        if (!isset($params['tree']['path'], $params['tree']['mode'], $params['tree']['type'])) {
-            throw new MissingArgumentException(array('tree.path', 'tree.mode', 'tree.type'));
+
+        if (!isset($params['tree'][0])) {
+            $params['tree'] = array($params['tree']);
         }
 
-        // If `sha` is not set, `content` is required
-        if (!isset($params['tree']['sha']) && !isset($params['tree']['content'])) {
-            throw new MissingArgumentException('tree.content');
+        foreach ($params['tree'] as $key => $tree) {
+            if (!isset($tree['path'], $tree['mode'], $tree['type'])) {
+                throw new MissingArgumentException(array("tree.$key.path", "tree.$key.mode", "tree.$key.type"));
+            }
+
+            // If `sha` is not set, `content` is required
+            if (!isset($tree['sha']) && !isset($tree['content'])) {
+                throw new MissingArgumentException("tree.$key.content");
+            }
+
+            $params['tree'][$key] = $this->translateArrayToObject($tree);
         }
 
         return $this->post('repos/'.urlencode($username).'/'.urlencode($repository).'/git/trees', $params);

test/Github/Tests/Api/AbstractApiTest.php

@@ -5,7 +5,7 @@
 use Github\Api\AbstractApi;
 
 /**
- * AbstractApi test case 
+ * AbstractApi test case
  *
  * @author Leszek Prabucki <[email protected]>
  */

test/Github/Tests/Api/GitData/TreesTest.php

@@ -35,10 +35,18 @@ public function shouldCreateTreeUsingSha()
         $expectedValue = array('sha' => '123', 'comitter');
         $data = array(
             'tree' => array(
-                'path' => 'path',
-                'mode' => 'mode',
-                'type' => 'type',
-                'sha'  => '1234'
+                array(
+                    'path' => 'path',
+                    'mode' => 'mode',
+                    'type' => 'type',
+                    'sha'  => '1234'
+                ),
+                array(
+                    'path' => 'htap',
+                    'mode' => 'edom',
+                    'type' => 'epyt',
+                    'sha'  => '4321'
+                ),
             )
         );
 
@@ -59,10 +67,18 @@ public function shouldCreateTreeUsingContent()
         $expectedValue = array('sha' => '123', 'comitter');
         $data = array(
             'tree' => array(
-                'path' => 'path',
-                'mode' => 'mode',
-                'type' => 'type',
-                'content'  => 'content'
+                array(
+                    'path' => 'path',
+                    'mode' => 'mode',
+                    'type' => 'type',
+                    'content' => 'content'
+                ),
+                array(
+                    'path' => 'htap',
+                    'mode' => 'edom',
+                    'type' => 'epyt',
+                    'content' => 'tnetnoc'
+                ),
             )
         );
 
@@ -174,6 +190,23 @@ public function shouldNotCreateTreeWithoutTreeParam()
         $api->create('KnpLabs', 'php-github-api', $data);
     }
 
+    /**
+     * @test
+     * @expectedException Github\Exception\MissingArgumentException
+     */
+    public function shouldNotCreateTreeWhenTreeParamIsNotArray()
+    {
+        $data = array(
+            'tree' => ''
+        );
+
+        $api = $this->getApiMock();
+        $api->expects($this->never())
+            ->method('post');
+
+        $api->create('KnpLabs', 'php-github-api', $data);
+    }
+
     protected function getApiClass()
     {
         return 'Github\Api\GitData\Trees';