Fixes

src/Api.php

@@ -19,6 +19,7 @@ class Api
 
     public function __construct()
     {
+        // Instantiate all component classes for this api.
         $this->User = new User($this);
         $this->Group = new Group($this);
     }

src/Group.php

@@ -8,20 +8,20 @@ use GuzzleHttp\Client as Guzzle;
 use Microsoft\Graph\Graph;
 use Microsoft\Graph\Model;
 
-class Group extends Api
+class Group
 {
-    public $Api;
-    public function __construct($parent)
+    // This class can only be booted from the core api class of this package.
+    public function __construct(API $coreApi)
     {
-        $this->Api = $parent;
+        $this->coreApi = $coreApi;
     }
 
     public function all()
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/groups')
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/groups')
             ->setReturnType(Model\Group::class)
             ->execute();
 
-        return $this->Api->toCollection($result);
+        return $this->coreApi->toCollection($result);
     }
 }

src/User.php

@@ -8,83 +8,83 @@ use GuzzleHttp\Client as Guzzle;
 use Microsoft\Graph\Graph;
 use Microsoft\Graph\Model;
 
-class User extends Api
+class User
 {
-    public $Api;
-    public function __construct($parent)
+    // This class can only be booted from the core api class of this package.
+    public function __construct(API $coreApi)
     {
-        $this->Api = $parent;
+        $this->coreApi = $coreApi;
     }
 
     public function all()
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/users')
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/users')
             ->setReturnType(Model\User::class)
             ->execute();
 
-        return $this->Api->toCollection($result);
+        return $this->coreApi->toCollection($result);
     }
 
     public function get($id)
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/users/'.$id)
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/users/'.$id)
             ->setReturnType(Model\User::class)
             ->execute();
 
-        return $this->Api->toObject($result);
+        return $this->coreApi->toObject($result);
     }
 
     public function getProfilePhoto($id)
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/users/'.$id.'/photo/$value')
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/users/'.$id.'/photo/$value')
             ->setReturnType(Model\ProfilePhoto::class)
             ->execute();
 
-        return $this->Api->toObject($result);
+        return $this->coreApi->toObject($result);
     }
 
     public function getManager($id)
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/users/'.$id.'/manager')
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/users/'.$id.'/manager')
             ->setReturnType(Model\User::class)
             ->execute();
 
-        return $this->Api->toObject($result);
+        return $this->coreApi->toObject($result);
     }
 
     public function getMessages($id)
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/users/'.$id.'/messages')
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/users/'.$id.'/messages')
             ->setReturnType(Model\Message::class)
             ->execute();
 
-        return $this->Api->toCollection($result);
+        return $this->coreApi->toCollection($result);
     }
 
     public function getEvents($id)
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/users/'.$id.'/events')
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/users/'.$id.'/events')
             ->setReturnType(Model\Event::class)
             ->execute();
 
-        return $this->Api->toCollection($result);
+        return $this->coreApi->toCollection($result);
     }
 
     public function getDrive($id)
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/users/'.$id.'/drive')
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/users/'.$id.'/drive')
             ->setReturnType(Model\Drive::class)
             ->execute();
 
-        return $this->Api->toObject($result);
+        return $this->coreApi->toObject($result);
     }
 
     public function getMemberOf($id)
     {
-        $result = $this->Api->triggerGraph()->createRequest('GET', '/users/'.$id.'/memberOf')
+        $result = $this->coreApi->triggerGraph()->createRequest('GET', '/users/'.$id.'/memberOf')
             ->setReturnType(Model\Group::class)
             ->execute();
 
-        return $this->Api->toCollection($result);
+        return $this->coreApi->toCollection($result);
     }
 }