Proper naming for removal of repository, fixed git data tree creation

Author: stloyd

lib/Github/Api/AbstractApi.php

@@ -66,21 +66,4 @@ 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

@@ -35,8 +35,6 @@ public function create($username, $repository, array $params)
             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);

lib/Github/Api/Repo.php

@@ -90,14 +90,14 @@ public function update($username, $repository, array $values)
      * Delete a repository
      * @link http://developer.github.com/v3/repos/
      *
-     * @param  string  $username         the user who owns the repository
-     * @param  string  $repository       the name of the repository
+     * @param string $username          the user who owns the repository
+     * @param string $repository        the name of the repository
      *
-     * @return mixed                     null on success, arrray on error with 'message'
+     * @return mixed                    null on success, array on error with 'message'
      */
-    public function delete($username, $repository)
+    public function remove($username, $repository)
     {
-        return parent::delete('repos/'.urlencode($username).'/'.urlencode($repository));
+        return $this->delete('repos/'.urlencode($username).'/'.urlencode($repository));
     }
 
     /**

test/Github/Tests/Api/RepoTest.php

@@ -3,7 +3,7 @@
 namespace Github\Tests\Api;
 
 /**
- * Repository api test case 
+ * Repository api test case
  *
  * @author Leszek Prabucki <[email protected]>
  */
@@ -50,16 +50,17 @@ public function shouldSearchRepositories()
     public function shouldPaginateFoundRepositories()
     {
         $expectedArray = array(
-            array('id' => 1, 'name' => 'php'),
-            array('id' => 2, 'name' => 'php-cs')
+            array('id' => 3, 'name' => 'fork of php'),
+            array('id' => 4, 'name' => 'fork of php-cs')
         );
 
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('get')
-            ->with('legacy/repos/search/php', array('start_page' => 2));
+            ->with('legacy/repos/search/php', array('start_page' => 2))
+            ->will($this->returnValue($expectedArray));
 
-        $api->find('php', array('start_page' => 2));
+        $this->assertEquals($expectedArray, $api->find('php', array('start_page' => 2)));
     }
 
     /**
@@ -269,36 +270,37 @@ public function shouldUpdate()
 
         $this->assertEquals($expectedArray, $api->update('l3l0Repo', 'test', array('description' => 'test', 'homepage' => 'http://l3l0.eu')));
     }
-    
-    /** 
+
+    /**
      * @test
      */
     public function shouldDelete()
     {
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('delete')
-            ->with('l3l0Repo', 'test')
+            ->with('repos/l3l0Repo/test')
             ->will($this->returnValue(null));
 
-        $this->assertNull($api->delete('l3l0Repo', 'test'));
+        $this->assertNull($api->remove('l3l0Repo', 'test'));
     }
 
-    /** 
+    /**
      * @test
      */
     public function shouldNotDelete()
     {
-        $expectedArray = array('message'=>'Not Found');
+        $expectedArray = array('message' => 'Not Found');
 
         $api = $this->getApiMock();
         $api->expects($this->once())
             ->method('delete')
-            ->with('l3l0Repo', 'uknown-repo')
-            ->will($this->returnValue(array('message'=>'Not Found')));
+            ->with('repos/l3l0Repo/uknown-repo')
+            ->will($this->returnValue($expectedArray));
 
-        $this->assertEquals($expectedArray, $api->delete('l3l0Repo', 'uknown-repo'));
+        $this->assertEquals($expectedArray, $api->remove('l3l0Repo', 'uknown-repo'));
     }
+
     /**
      * @test
      */