Use RequiredParameterTrait

richardhj · Oct 12, 2016 · 7aa4ce8 · 7aa4ce8
1 parent cfb5423
commit 7aa4ce8
Showing 1 changed file with 5 additions and 21 deletions.
diff --git a/src/Provider/EPost.php b/src/Provider/EPost.php
@@ -13,6 +13,7 @@
 use League\OAuth2\Client\Provider\AbstractProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use League\OAuth2\Client\Token\AccessToken;
+use League\OAuth2\Client\Tool\RequiredParameterTrait;
 use Psr\Http\Message\ResponseInterface;
 
 
@@ -23,6 +24,9 @@
 class EPost extends AbstractProvider
 {
 
+    use RequiredParameterTrait;
+
+
     /**
      * The login endpoint for production
      *
@@ -68,7 +72,7 @@ class EPost extends AbstractProvider
      */
     public function __construct(array $options = [], array $collaborators = [])
     {
-        $this->assertRequiredOptions($options);
+        $this->checkRequiredParameters($this->getRequiredOptions(), $options);
 
         $possible = $this->getConfigurableOptions();
         $configured = array_intersect_key($options, array_flip($possible));
@@ -210,24 +214,4 @@ protected function getRequiredOptions()
             'scopes',
         ];
     }
-
-
-    /**
-     * Verifies that all required options have been passed
-     *
-     * @param  array $options
-     *
-     * @return void
-     * @throws \InvalidArgumentException
-     */
-    protected function assertRequiredOptions(array $options)
-    {
-        $missing = array_diff_key(array_flip($this->getRequiredOptions()), $options);
-
-        if (!empty($missing)) {
-            throw new \InvalidArgumentException(
-                'Required options not defined: '.implode(', ', array_keys($missing))
-            );
-        }
-    }
 }