Merge pull request #10 from larruda/master

larruda · web-flow · commit 1ffade4e4929 · 2017-03-06T00:33:47.000-03:00
Fix PHP 7 issue and mismatch with ProjectIssue API response.
diff --git a/src/DrupalClient.php b/src/DrupalClient.php
@@ -56,11 +56,19 @@ public function getNode($id) {
     return $this->getResource('node', $id);
   }
 
+  /**
+   * @param $id
+   * @return \EclipseGc\DrupalOrg\Api\Resources\Node\ProjectIssue;
+   */
+  public function getProjectIssue($id) {
+    return $this->getResource('project_issue', $id);
+  }
+
   /**
    * @param $id
    * @return \EclipseGc\DrupalOrg\Api\Resources\TaxonomyTerm
    */
   public function getTaxonomyTerm($id) {
     return $this->getResource('taxonomy_term', $id);
   }
-} 
+} 
diff --git a/src/Factory.php b/src/Factory.php
@@ -14,6 +14,7 @@ class Factory implements FactoryInterface {
     'user' => '\EclipseGc\DrupalOrg\Api\Resources\User',
     'node' => '\EclipseGc\DrupalOrg\Api\Resources\Node',
     'taxonomy_term' => '\EclipseGc\DrupalOrg\Api\Resources\TaxonomyTerm',
+    'project_issue' => '\EclipseGc\DrupalOrg\Api\Resources\Node\ProjectIssue',
   );
 
   function __construct(Client $client) {
@@ -29,6 +30,7 @@ public function getObjectTypeClass($type, array $data) {
   }
 
   public function createObjectType($type, array $data = array()) {
+    $data = (isset($data['list'])) ? $data['list'][0] : $data;
     $objectClass = $this->getObjectTypeClass($type, $data);
     $reflector = new \ReflectionClass($objectClass);
     if (!isset($data['factory'])) {
@@ -51,7 +53,14 @@ public function createObjectType($type, array $data = array()) {
    * @throws \Exception
    */
   public function request($entity_type, $id) {
-    $request = $this->client()->get(['{entity_type}/{id}', ['entity_type' => $entity_type, 'id' => $id]]);
+    switch ($entity_type) {
+        case 'project_issue':
+            $request = $this->client()->get(['node.json?type={entity_type}&nid={id}', ['entity_type' => $entity_type, 'id' => $id]]);
+            break;
+        default:
+            $request = $this->client()->get(['{entity_type}/{id}', ['entity_type' => $entity_type, 'id' => $id]]);
+            break;
+    }
     if ($request->getStatusCode() != 200) {
       throw new \Exception(sprintf('Status code was not OK. %d returned instead.', $request->getStatusCode()));
     }
@@ -76,4 +85,4 @@ protected function client(Client $new_client = NULL) {
     return $client;
   }
 
-} 
+} 
diff --git a/src/Resources/GetResource.php b/src/Resources/GetResource.php
@@ -13,7 +13,7 @@ trait GetResource {
    */
   protected $factory;
 
-  protected function getResource($resource_type, $id) {
+  public function getResource($resource_type, $id) {
     $response = $this->factory->request($resource_type, $id);
     return $this->factory->createObjectType($resource_type, $response->json());
   }
diff --git a/src/Resources/Node/ProjectIssue.php b/src/Resources/Node/ProjectIssue.php
@@ -36,16 +36,14 @@ class ProjectIssue extends Node {
 
   protected $issueVersion;
 
-  public function __construct(FactoryInterface $factory, $body, $taxonomy_vocabulary_9, $field_issue_status, $field_issue_priority, $field_issue_category, $field_issue_component, $field_issue_assigned, $field_project, $field_issue_files, $field_issue_parent, $field_issue_related, $field_issue_version, $nid, $vid, $is_new, $type, $title, $language, $url, $edit_url, $status, $promote, $sticky, $created, $changed, $author, $book_ancestors, $comment, $comments, $comment_count, $comment_count_new, $has_new_content, $last_comment_timestamp) {
+  public function __construct($taxonomy_vocabulary_9, $body, $field_issue_status, $field_issue_priority, $field_issue_category, $field_issue_component, $field_project, $field_issue_files, $field_issue_related, $field_issue_version, $field_issue_credit, $flag_drupalorg_node_spam_user, $flag_project_issue_follow_user, $nid, $vid, $is_new, $type, $title, $language, $url, $edit_url, $status, $promote, $sticky, $created, $changed, $author, $book_ancestors, $comment, $comments, $comment_count, $comment_count_new, $feed_nid, $flag_flag_tracker_follow_user, $has_new_content, $last_comment_timestamp, FactoryInterface $factory) {
     $this->taxonomy = $taxonomy_vocabulary_9;
     $this->issueStatus = $field_issue_status;
     $this->issuePriority = $field_issue_priority;
     $this->issueCategory = $field_issue_category;
     $this->issueComponent = $field_issue_component;
-    $this->issueAssigned = $field_issue_assigned;
     $this->project = $field_project;
     $this->issueFiles = $field_issue_files;
-    $this->issueParent = $field_issue_parent;
     $this->issueRelated = $field_issue_related;
     $this->issueVersion = $field_issue_version;
     $this->bookAncestors = $book_ancestors;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ trait GetResource {`
`13`	`13`	`*/`
`14`	`14`	`protected $factory;`
`15`	`15`
`16`		`- protected function getResource($resource_type, $id) {`
	`16`	`+ public function getResource($resource_type, $id) {`
`17`	`17`	`$response = $this->factory->request($resource_type, $id);`
`18`	`18`	`return $this->factory->createObjectType($resource_type, $response->json());`
`19`	`19`	`}`