Reordered $client parameter

m4tthumphrey · m4tthumphrey · commit 7e118c3bd3af · 2013-04-18T22:20:33.000+01:00
diff --git a/README.md b/README.md
@@ -29,10 +29,10 @@ General API Usage
 -----------------
 
 ```php
-$gitlab = new \Gitlab\Client('http://git.yourdomain.com/api/v3/'); // change here
-$gitlab->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN); // change here
+$client = new \Gitlab\Client('http://git.yourdomain.com/api/v3/'); // change here
+$client->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN); // change here
 
-$project = $gitlab->api('projects')->create('My Project', array(
+$project = $client->api('projects')->create('My Project', array(
   'description' => 'This is a project'
   'issues_enabled' => false
 ));
@@ -45,17 +45,17 @@ Model Usage
 You can also use the library in an object oriented manner. This is an experimental branch used for decided how to manage dependencies within model usage.
 
 ```php
-$gitlab = new \Gitlab\Client('http://git.yourdomain.com/api/v3/'); // change here
-$gitlab->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN); // change here
+$client = new \Gitlab\Client('http://git.yourdomain.com/api/v3/'); // change here
+$client->authenticate('your_gitlab_token_here', \Gitlab\Client::AUTH_URL_TOKEN); // change here
 ```
 
 Creating a new project
 
 ```php
-$project = \Gitlab\Model\Project::create('My Project', array(
+$project = \Gitlab\Model\Project::create($client, 'My Project', array(
   'description' => 'This is my project',
   'issues_enabled' => false
-), $gitlab);
+));
 
 $project->addHook('http://mydomain.com/hook/push/1');
 
@@ -65,7 +65,7 @@ Creating a new issue
 
 ```php
 $project = new \Gitlab\Model\Project(1);
-$project->setClient($gitlab);
+$project->setClient($client);
 $issue = $project->createIssue('This does not work..', array(
   'description' => 'This doesnt work properly. Please fix',
   'assignee_id' => 2
diff --git a/lib/Gitlab/Model/Branch.php b/lib/Gitlab/Model/Branch.php
@@ -13,13 +13,13 @@ class Branch extends AbstractModel
         'protected'
     );
 
-    public static function fromArray(Project $project, array $data, Client $client)
+    public static function fromArray(Client $client, Project $project, array $data)
     {
         $branch = new Branch($project, $data['name']);
         $branch->setClient($client);
 
         if (isset($data['commit'])) {
-            $data['commit'] = Commit::fromArray($project, $data['commit'], $client);
+            $data['commit'] = Commit::fromArray($client, $project, $data['commit']);
         }
 
         return $branch->hydrate($data);
@@ -35,21 +35,20 @@ public function show()
     {
         $data = $this->api('repositories')->branch($this->project->id, $this->name);
 
-        return Branch::fromArray($this->project, $data, $this->getClient());
+        return Branch::fromArray($this->getClient(), $this->project, $data);
     }
 
     public function protect()
     {
         $data = $this->api('repositories')->protectBranch($this->project->id, $this->name);
 
-        return Branch::fromArray($this->project, $data, $this->getClient());
+        return Branch::fromArray($this->getClient(), $this->project, $data);
     }
 
     public function unprotect()
     {
         $data = $this->api('repositories')->unprotectBranch($this->project->id, $this->name);
 
-        return Branch::fromArray($this->project, $data, $this->getClient());
+        return Branch::fromArray($this->getClient(), $this->project, $data);
     }
-
 }
diff --git a/lib/Gitlab/Model/Commit.php b/lib/Gitlab/Model/Commit.php
@@ -23,26 +23,26 @@ class Commit extends AbstractModel
         'project'
     );
 
-    public static function fromArray(Project $project, array $data, Client $client)
+    public static function fromArray(Client $client, Project $project, array $data)
     {
         $commit = new Commit($project, $data['id']);
         $commit->setClient($client);
 
         if (isset($data['parents'])) {
             $parents = array();
             foreach ($data['parents'] as $parent) {
-                $parents[] = Commit::fromArray($project, $parent, $client);
+                $parents[] = Commit::fromArray($client, $project, $parent);
             }
 
             $data['parents'] = $parents;
         }
 
         if (isset($data['author'])) {
-            $data['author'] = User::fromArray($data['author'], $client);
+            $data['author'] = User::fromArray($client, $data['author']);
         }
 
         if (isset($data['committer'])) {
-            $data['committer'] = User::fromArray($data['committer'], $client);
+            $data['committer'] = User::fromArray($client, $data['committer']);
         }
 
         return $commit->hydrate($data);
diff --git a/lib/Gitlab/Model/Group.php b/lib/Gitlab/Model/Group.php
@@ -14,27 +14,27 @@ class Group extends AbstractModel
         'projects'
     );
 
-    public static function fromArray(array $data, Client $client)
+    public static function fromArray(Client $client, array $data)
     {
         $group = new Group($data['id']);
         $group->setClient($client);
 
         if (isset($data['projects'])) {
             $projects = array();
             foreach ($data['projects'] as $project) {
-                $projects[] = Project::fromArray($project, $client);
+                $projects[] = Project::fromArray($client, $project);
             }
             $data['projects'] = $projects;
         }
 
         return $group->hydrate($data);
     }
 
-    public static function create($name, $path, Client $client)
+    public static function create(Client $client, $name, $path)
     {
         $data = $client->api('groups')->create($name, $path);
 
-        return Group::fromArray($data, $client);
+        return Group::fromArray($client, $data);
     }
 
     public function __construct($id)
@@ -46,6 +46,6 @@ public function show()
     {
         $data = $this->api('groups')->show($this->id);
 
-        return Group::fromArray($data, $this->getClient());
+        return Group::fromArray($this->getClient(), $data);
     }
 }
diff --git a/lib/Gitlab/Model/Hook.php b/lib/Gitlab/Model/Hook.php
@@ -12,19 +12,19 @@ class Hook extends AbstractModel
         'created_at'
     );
 
-    public static function fromArray(array $data, Client $client)
+    public static function fromArray(Client $client, array $data)
     {
         $hook = new Hook($data['id']);
         $hook->setClient($client);
 
         return $hook->hydrate($data);
     }
 
-    public static function create($url, Client $client)
+    public static function create(Client $client, $url)
     {
         $data = $client->api('system_hooks')->create($url);
 
-        return Hook::fromArray($data, $client);
+        return Hook::fromArray($client, $data);
     }
 
     public function __construct($id)
diff --git a/lib/Gitlab/Model/Issue.php b/lib/Gitlab/Model/Issue.php
@@ -22,23 +22,23 @@ class Issue extends AbstractModel
         'state'
     );
 
-    public static function fromArray(Project $project, array $data, Client $client)
+    public static function fromArray(Client $client, Project $project, array $data)
     {
         $issue = new Issue($project, $data['id']);
         $issue->setClient($client);
 
         if (isset($data['author'])) {
-            $data['author'] = User::fromArray($data['author'], $client);
+            $data['author'] = User::fromArray($client, $data['author']);
         }
 
         if (isset($data['assignee'])) {
-            $data['assignee'] = User::fromArray($data['assignee'], $client);
+            $data['assignee'] = User::fromArray($client, $data['assignee']);
         }
 
         return $issue->hydrate($data);
     }
 
-    public function __construct(Project $project, $id = null, Client $client)
+    public function __construct(Project $project, $id = null)
     {
         $this->project = $project;
         $this->id = $id;
@@ -48,14 +48,14 @@ public function show()
     {
         $data = $this->api('issues')->show($this->project->id, $this->id);
 
-        return Issue::fromArray($this->project, $data, $this->getClient());
+        return Issue::fromArray($this->getClient(), $this->project, $data);
     }
 
     public function update(array $params)
     {
         $data = $this->api('issues')->update($this->project->id, $this->id, $params);
 
-        return Issue::fromArray($this->project, $data, $this->getClient());
+        return Issue::fromArray($this->getClient(), $this->project, $data);
     }
 
     public function close($comment = null)
@@ -82,7 +82,7 @@ public function addComment($body)
             'body' => $body
         ));
 
-        return Note::fromArray($this, $data);
+        return Note::fromArray($this->getClient(), $this, $data);
     }
 
 }
diff --git a/lib/Gitlab/Model/Key.php b/lib/Gitlab/Model/Key.php
@@ -13,7 +13,7 @@ class Key extends AbstractModel
         'created_at'
     );
 
-    public static function fromArray(array $data, Client $client)
+    public static function fromArray(Client $client, array $data)
     {
         $key = new Key();
         $key->setClient($client);
diff --git a/lib/Gitlab/Model/MergeRequest.php b/lib/Gitlab/Model/MergeRequest.php
@@ -19,17 +19,17 @@ class MergeRequest extends AbstractModel
         'project'
     );
 
-    public static function fromArray(Project $project, array $data, Client $client)
+    public static function fromArray(Client $client, Project $project, array $data)
     {
         $mr = new MergeRequest($project, $data['id']);
         $mr->setClient($client);
 
         if (isset($data['author'])) {
-            $data['author'] = User::fromArray($data['author'], $client);
+            $data['author'] = User::fromArray($client, $data['author']);
         }
 
         if (isset($data['assignee'])) {
-            $data['assignee'] = User::fromArray($data['assignee'], $client);
+            $data['assignee'] = User::fromArray($client, $data['assignee']);
         }
 
         return $mr->hydrate($data);
@@ -45,14 +45,14 @@ public function show()
     {
         $data = $this->api('mr')->show($this->project->id, $this->id);
 
-        return MergeRequest::fromArray($this->project, $data, $this->getClient());
+        return MergeRequest::fromArray($this->getClient(), $this->project, $data);
     }
 
     public function update(array $params)
     {
         $data = $this->api('mr')->update($this->project->id, $this->id, $params);
 
-        return MergeRequest::fromArray($this->project, $data, $this->getClient());
+        return MergeRequest::fromArray($this->getClient(), $this->project, $data);
     }
 
     public function close()
@@ -69,7 +69,7 @@ public function addComment($note)
     {
         $data = $this->api('mr')->addComment($this->project->id, $this->id, $note);
 
-        return Note::fromArray($this, $data, $this->getClient());
+        return Note::fromArray($this->getClient(), $this, $data);
     }
 
 }
diff --git a/lib/Gitlab/Model/Milestone.php b/lib/Gitlab/Model/Milestone.php
@@ -19,7 +19,7 @@ class Milestone extends AbstractModel
         'created_at'
     );
 
-    public static function fromArray(Project $project, array $data, Client $client)
+    public static function fromArray(Client $client, Project $project, array $data)
     {
         $milestone = new Milestone($project, $data['id']);
         $milestone->setClient($client);
@@ -37,14 +37,14 @@ public function show()
     {
         $data = $this->api('milestones')->show($this->project->id, $this->id);
 
-        return Milestone::fromArray($this->project, $data, $this->getClient());
+        return Milestone::fromArray($this->getClient(), $this->project, $data);
     }
 
     public function update(array $params)
     {
         $data = $this->api('milestones')->update($this->project->id, $this->id, $params);
 
-        return Milestone::fromArray($this->project, $data, $this->getClient());
+        return Milestone::fromArray($this->getClient(), $this->project, $data);
     }
 
     public function complete()
diff --git a/lib/Gitlab/Model/Note.php b/lib/Gitlab/Model/Note.php
@@ -17,13 +17,13 @@ class Note extends AbstractModel
         'attachment'
     );
 
-    public static function fromArray($type, array $data, Client $client)
+    public static function fromArray(Client $client, $type, array $data)
     {
         $comment = new Note($type);
         $comment->setClient($client);
 
         if (isset($data['author'])) {
-            $data['author'] = User::fromArray($data['author'], $client);
+            $data['author'] = User::fromArray($client, $data['author']);
         }
 
         return $comment->hydrate($data);
diff --git a/lib/Gitlab/Model/Project.php b/lib/Gitlab/Model/Project.php
diff --git a/lib/Gitlab/Model/Session.php b/lib/Gitlab/Model/Session.php
diff --git a/lib/Gitlab/Model/Tag.php b/lib/Gitlab/Model/Tag.php
diff --git a/lib/Gitlab/Model/User.php b/lib/Gitlab/Model/User.php

Original file line number	Diff line number	Diff line change
`@@ -13,13 +13,13 @@ class Branch extends AbstractModel`
`13`	`13`	`'protected'`
`14`	`14`	`);`
`15`	`15`
`16`		`- public static function fromArray(Project $project, array $data, Client $client)`
	`16`	`+ public static function fromArray(Client $client, Project $project, array $data)`
`17`	`17`	`{`
`18`	`18`	`$branch = new Branch($project, $data['name']);`
`19`	`19`	`$branch->setClient($client);`
`20`	`20`
`21`	`21`	`if (isset($data['commit'])) {`
`22`		`- $data['commit'] = Commit::fromArray($project, $data['commit'], $client);`
	`22`	`+ $data['commit'] = Commit::fromArray($client, $project, $data['commit']);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`return $branch->hydrate($data);`
`@@ -35,21 +35,20 @@ public function show()`
`35`	`35`	`{`
`36`	`36`	`$data = $this->api('repositories')->branch($this->project->id, $this->name);`
`37`	`37`
`38`		`- return Branch::fromArray($this->project, $data, $this->getClient());`
	`38`	`+ return Branch::fromArray($this->getClient(), $this->project, $data);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function protect()`
`42`	`42`	`{`
`43`	`43`	`$data = $this->api('repositories')->protectBranch($this->project->id, $this->name);`
`44`	`44`
`45`		`- return Branch::fromArray($this->project, $data, $this->getClient());`
	`45`	`+ return Branch::fromArray($this->getClient(), $this->project, $data);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public function unprotect()`
`49`	`49`	`{`
`50`	`50`	`$data = $this->api('repositories')->unprotectBranch($this->project->id, $this->name);`
`51`	`51`
`52`		`- return Branch::fromArray($this->project, $data, $this->getClient());`
	`52`	`+ return Branch::fromArray($this->getClient(), $this->project, $data);`
`53`	`53`	`}`
`54`		`-`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,26 +23,26 @@ class Commit extends AbstractModel`
`23`	`23`	`'project'`
`24`	`24`	`);`
`25`	`25`
`26`		`- public static function fromArray(Project $project, array $data, Client $client)`
	`26`	`+ public static function fromArray(Client $client, Project $project, array $data)`
`27`	`27`	`{`
`28`	`28`	`$commit = new Commit($project, $data['id']);`
`29`	`29`	`$commit->setClient($client);`
`30`	`30`
`31`	`31`	`if (isset($data['parents'])) {`
`32`	`32`	`$parents = array();`
`33`	`33`	`foreach ($data['parents'] as $parent) {`
`34`		`- $parents[] = Commit::fromArray($project, $parent, $client);`
	`34`	`+ $parents[] = Commit::fromArray($client, $project, $parent);`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`$data['parents'] = $parents;`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`if (isset($data['author'])) {`
`41`		`- $data['author'] = User::fromArray($data['author'], $client);`
	`41`	`+ $data['author'] = User::fromArray($client, $data['author']);`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if (isset($data['committer'])) {`
`45`		`- $data['committer'] = User::fromArray($data['committer'], $client);`
	`45`	`+ $data['committer'] = User::fromArray($client, $data['committer']);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`return $commit->hydrate($data);`
Original file line number	Diff line number	Diff line change
`@@ -14,27 +14,27 @@ class Group extends AbstractModel`
`14`	`14`	`'projects'`
`15`	`15`	`);`
`16`	`16`
`17`		`- public static function fromArray(array $data, Client $client)`
	`17`	`+ public static function fromArray(Client $client, array $data)`
`18`	`18`	`{`
`19`	`19`	`$group = new Group($data['id']);`
`20`	`20`	`$group->setClient($client);`
`21`	`21`
`22`	`22`	`if (isset($data['projects'])) {`
`23`	`23`	`$projects = array();`
`24`	`24`	`foreach ($data['projects'] as $project) {`
`25`		`- $projects[] = Project::fromArray($project, $client);`
	`25`	`+ $projects[] = Project::fromArray($client, $project);`
`26`	`26`	`}`
`27`	`27`	`$data['projects'] = $projects;`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`return $group->hydrate($data);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public static function create($name, $path, Client $client)`
	`33`	`+ public static function create(Client $client, $name, $path)`
`34`	`34`	`{`
`35`	`35`	`$data = $client->api('groups')->create($name, $path);`
`36`	`36`
`37`		`- return Group::fromArray($data, $client);`
	`37`	`+ return Group::fromArray($client, $data);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public function __construct($id)`
`@@ -46,6 +46,6 @@ public function show()`
`46`	`46`	`{`
`47`	`47`	`$data = $this->api('groups')->show($this->id);`
`48`	`48`
`49`		`- return Group::fromArray($data, $this->getClient());`
	`49`	`+ return Group::fromArray($this->getClient(), $data);`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,19 +12,19 @@ class Hook extends AbstractModel`
`12`	`12`	`'created_at'`
`13`	`13`	`);`
`14`	`14`
`15`		`- public static function fromArray(array $data, Client $client)`
	`15`	`+ public static function fromArray(Client $client, array $data)`
`16`	`16`	`{`
`17`	`17`	`$hook = new Hook($data['id']);`
`18`	`18`	`$hook->setClient($client);`
`19`	`19`
`20`	`20`	`return $hook->hydrate($data);`
`21`	`21`	`}`
`22`	`22`
`23`		`- public static function create($url, Client $client)`
	`23`	`+ public static function create(Client $client, $url)`
`24`	`24`	`{`
`25`	`25`	`$data = $client->api('system_hooks')->create($url);`
`26`	`26`
`27`		`- return Hook::fromArray($data, $client);`
	`27`	`+ return Hook::fromArray($client, $data);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public function __construct($id)`
Original file line number	Diff line number	Diff line change
`@@ -22,23 +22,23 @@ class Issue extends AbstractModel`
`22`	`22`	`'state'`
`23`	`23`	`);`
`24`	`24`
`25`		`- public static function fromArray(Project $project, array $data, Client $client)`
	`25`	`+ public static function fromArray(Client $client, Project $project, array $data)`
`26`	`26`	`{`
`27`	`27`	`$issue = new Issue($project, $data['id']);`
`28`	`28`	`$issue->setClient($client);`
`29`	`29`
`30`	`30`	`if (isset($data['author'])) {`
`31`		`- $data['author'] = User::fromArray($data['author'], $client);`
	`31`	`+ $data['author'] = User::fromArray($client, $data['author']);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`if (isset($data['assignee'])) {`
`35`		`- $data['assignee'] = User::fromArray($data['assignee'], $client);`
	`35`	`+ $data['assignee'] = User::fromArray($client, $data['assignee']);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`return $issue->hydrate($data);`
`39`	`39`	`}`
`40`	`40`
`41`		`- public function __construct(Project $project, $id = null, Client $client)`
	`41`	`+ public function __construct(Project $project, $id = null)`
`42`	`42`	`{`
`43`	`43`	`$this->project = $project;`
`44`	`44`	`$this->id = $id;`
`@@ -48,14 +48,14 @@ public function show()`
`48`	`48`	`{`
`49`	`49`	`$data = $this->api('issues')->show($this->project->id, $this->id);`
`50`	`50`
`51`		`- return Issue::fromArray($this->project, $data, $this->getClient());`
	`51`	`+ return Issue::fromArray($this->getClient(), $this->project, $data);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public function update(array $params)`
`55`	`55`	`{`
`56`	`56`	`$data = $this->api('issues')->update($this->project->id, $this->id, $params);`
`57`	`57`
`58`		`- return Issue::fromArray($this->project, $data, $this->getClient());`
	`58`	`+ return Issue::fromArray($this->getClient(), $this->project, $data);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`public function close($comment = null)`
`@@ -82,7 +82,7 @@ public function addComment($body)`
`82`	`82`	`'body' => $body`
`83`	`83`	`));`
`84`	`84`
`85`		`- return Note::fromArray($this, $data);`
	`85`	`+ return Note::fromArray($this->getClient(), $this, $data);`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class Key extends AbstractModel`
`13`	`13`	`'created_at'`
`14`	`14`	`);`
`15`	`15`
`16`		`- public static function fromArray(array $data, Client $client)`
	`16`	`+ public static function fromArray(Client $client, array $data)`
`17`	`17`	`{`
`18`	`18`	`$key = new Key();`
`19`	`19`	`$key->setClient($client);`
Original file line number	Diff line number	Diff line change
`@@ -19,17 +19,17 @@ class MergeRequest extends AbstractModel`
`19`	`19`	`'project'`
`20`	`20`	`);`
`21`	`21`
`22`		`- public static function fromArray(Project $project, array $data, Client $client)`
	`22`	`+ public static function fromArray(Client $client, Project $project, array $data)`
`23`	`23`	`{`
`24`	`24`	`$mr = new MergeRequest($project, $data['id']);`
`25`	`25`	`$mr->setClient($client);`
`26`	`26`
`27`	`27`	`if (isset($data['author'])) {`
`28`		`- $data['author'] = User::fromArray($data['author'], $client);`
	`28`	`+ $data['author'] = User::fromArray($client, $data['author']);`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`if (isset($data['assignee'])) {`
`32`		`- $data['assignee'] = User::fromArray($data['assignee'], $client);`
	`32`	`+ $data['assignee'] = User::fromArray($client, $data['assignee']);`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`return $mr->hydrate($data);`
`@@ -45,14 +45,14 @@ public function show()`
`45`	`45`	`{`
`46`	`46`	`$data = $this->api('mr')->show($this->project->id, $this->id);`
`47`	`47`
`48`		`- return MergeRequest::fromArray($this->project, $data, $this->getClient());`
	`48`	`+ return MergeRequest::fromArray($this->getClient(), $this->project, $data);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public function update(array $params)`
`52`	`52`	`{`
`53`	`53`	`$data = $this->api('mr')->update($this->project->id, $this->id, $params);`
`54`	`54`
`55`		`- return MergeRequest::fromArray($this->project, $data, $this->getClient());`
	`55`	`+ return MergeRequest::fromArray($this->getClient(), $this->project, $data);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`public function close()`
`@@ -69,7 +69,7 @@ public function addComment($note)`
`69`	`69`	`{`
`70`	`70`	`$data = $this->api('mr')->addComment($this->project->id, $this->id, $note);`
`71`	`71`
`72`		`- return Note::fromArray($this, $data, $this->getClient());`
	`72`	`+ return Note::fromArray($this->getClient(), $this, $data);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class Milestone extends AbstractModel`
`19`	`19`	`'created_at'`
`20`	`20`	`);`
`21`	`21`
`22`		`- public static function fromArray(Project $project, array $data, Client $client)`
	`22`	`+ public static function fromArray(Client $client, Project $project, array $data)`
`23`	`23`	`{`
`24`	`24`	`$milestone = new Milestone($project, $data['id']);`
`25`	`25`	`$milestone->setClient($client);`
`@@ -37,14 +37,14 @@ public function show()`
`37`	`37`	`{`
`38`	`38`	`$data = $this->api('milestones')->show($this->project->id, $this->id);`
`39`	`39`
`40`		`- return Milestone::fromArray($this->project, $data, $this->getClient());`
	`40`	`+ return Milestone::fromArray($this->getClient(), $this->project, $data);`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`public function update(array $params)`
`44`	`44`	`{`
`45`	`45`	`$data = $this->api('milestones')->update($this->project->id, $this->id, $params);`
`46`	`46`
`47`		`- return Milestone::fromArray($this->project, $data, $this->getClient());`
	`47`	`+ return Milestone::fromArray($this->getClient(), $this->project, $data);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public function complete()`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,13 @@ class Note extends AbstractModel`
`17`	`17`	`'attachment'`
`18`	`18`	`);`
`19`	`19`
`20`		`- public static function fromArray($type, array $data, Client $client)`
	`20`	`+ public static function fromArray(Client $client, $type, array $data)`
`21`	`21`	`{`
`22`	`22`	`$comment = new Note($type);`
`23`	`23`	`$comment->setClient($client);`
`24`	`24`
`25`	`25`	`if (isset($data['author'])) {`
`26`		`- $data['author'] = User::fromArray($data['author'], $client);`
	`26`	`+ $data['author'] = User::fromArray($client, $data['author']);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`return $comment->hydrate($data);`