Group: add additional model properties

Author: glaubinix

lib/Gitlab/Model/Group.php

@@ -9,7 +9,17 @@
  * @property-read string $name
  * @property-read string $path
  * @property-read string $description
+ * @property-read string $visibility
+ * @property-read bool $lfs_enabled
+ * @property-read string $avatar_url
+ * @property-read string $web_url
+ * @property-read bool $request_access_enabled
+ * @property-read string $full_name
+ * @property-read string $full_path
+ * @property-read int $file_template_project_id
+ * @property-read int|null $parent_id
  * @property-read Project[] $projects
+ * @property-read Project[] $shared_projects
  */
 class Group extends AbstractModel
 {
@@ -21,7 +31,17 @@ class Group extends AbstractModel
         'name',
         'path',
         'description',
-        'projects'
+        'visibility',
+        'lfs_enabled',
+        'avatar_url',
+        'web_url',
+        'request_access_enabled',
+        'full_name',
+        'full_path',
+        'file_template_project_id',
+        'parent_id',
+        'projects',
+        'shared_projects',
     );
 
     /**
@@ -41,6 +61,14 @@ public static function fromArray(Client $client, array $data)
             $data['projects'] = $projects;
         }
 
+        if (isset($data['shared_projects'])) {
+            $projects = array();
+            foreach ($data['shared_projects'] as $project) {
+                $projects[] = Project::fromArray($client, $project);
+            }
+            $data['shared_projects'] = $projects;
+        }
+
         return $group->hydrate($data);
     }
 
@@ -132,12 +160,12 @@ public function removeMember($user_id)
     public function projects()
     {
         $data = $this->client->groups()->projects($this->id);
-        
+
         $projects = array();
         foreach ($data as $project) {
             $projects[] = Project::fromArray($this->getClient(), $project);
         }
-        
+
         return $projects;
     }
 

test/Gitlab/Tests/Model/GroupTest.php

@@ -7,17 +7,59 @@
 use Gitlab\Model\Project;
 use PHPUnit\Framework\TestCase;
 use Gitlab\Api\Groups;
-use Gitlab\Api\Projects;
 
 class GroupTest extends TestCase
 {
-    private function getGroupMock(array $data = [])
+    public function testFromArray()
     {
         $client = $this->getMockBuilder(Client::class)
             ->disableOriginalConstructor()
             ->getMock();
 
-        return Group::fromArray($client, $data);
+        $data = [
+            'id' => 1,
+            'name' => 'Foobar Group',
+            'path' => 'foo-bar',
+            'description' => 'An interesting group',
+            'visibility' => 'public',
+            'lfs_enabled' => true,
+            'avatar_url' => 'http://localhost:3000/uploads/group/avatar/1/foo.jpg',
+            'web_url' => 'http://localhost:3000/groups/foo-bar',
+            'request_access_enabled' => false,
+            'full_name' => 'Foobar Group',
+            'full_path' => 'foo-bar',
+            'file_template_project_id' => 1,
+            'parent_id' => null,
+            'projects' => [
+                ['id' => 1],
+            ],
+            'shared_projects' => [
+                ['id' => 2],
+            ],
+        ];
+
+        $group = Group::fromArray($client, $data);
+
+        $this->assertInstanceOf(Group::class, $group);
+        $this->assertSame($data['id'], $group->id);
+        $this->assertSame($data['name'], $group->name);
+        $this->assertSame($data['path'], $group->path);
+        $this->assertSame($data['description'], $group->description);
+        $this->assertSame($data['visibility'], $group->visibility);
+        $this->assertSame($data['lfs_enabled'], $group->lfs_enabled);
+        $this->assertSame($data['avatar_url'], $group->avatar_url);
+        $this->assertSame($data['web_url'], $group->web_url);
+        $this->assertSame($data['request_access_enabled'], $group->request_access_enabled);
+        $this->assertSame($data['full_name'], $group->full_name);
+        $this->assertSame($data['full_path'], $group->full_path);
+        $this->assertSame($data['file_template_project_id'], $group->file_template_project_id);
+        $this->assertSame($data['parent_id'], $group->parent_id);
+
+        $this->assertCount(1, $group->projects);
+        $this->assertInstanceOf(Project::class, $group->projects[0]);
+
+        $this->assertCount(1, $group->shared_projects);
+        $this->assertInstanceOf(Project::class, $group->shared_projects[0]);
     }
 
     public function testProjects()