From 17d57be2333140a9949f71928f6c2cbbfd279bc8 Mon Sep 17 00:00:00 2001
From: Niels Keurentjes <niels.keurentjes@omines.com>
Date: Mon, 19 Mar 2018 23:59:22 +0100
Subject: [PATCH] Update dependencies and code style

---
 composer.json                        | 2 +-
 src/Provider/Gitlab.php              | 6 +++---
 src/Provider/GitlabResourceOwner.php | 4 +++-
 test/src/Provider/GitlabTest.php     | 1 +
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 38cc270..ede34e4 100644
--- a/composer.json
+++ b/composer.json
@@ -43,7 +43,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.x-dev"
+            "dev-master": "3.x-dev"
         }
     }
 }
diff --git a/src/Provider/Gitlab.php b/src/Provider/Gitlab.php
index edc0ea0..e0c7769 100644
--- a/src/Provider/Gitlab.php
+++ b/src/Provider/Gitlab.php
@@ -85,7 +85,7 @@ public function getResourceOwnerDetailsUrl(AccessToken $token)
 
     /**
      * Get the default scopes used by GitLab.
-     * Current scopes are 'api', 'read_user', 'openid'
+     * Current scopes are 'api', 'read_user', 'openid'.
      *
      * This returns an array with 'api' scope as default.
      *
@@ -97,7 +97,7 @@ protected function getDefaultScopes()
     }
 
     /**
-     * GitLab uses a space to separate scopes
+     * GitLab uses a space to separate scopes.
      */
     protected function getScopeSeparator()
     {
@@ -108,7 +108,7 @@ protected function getScopeSeparator()
      * Check a provider response for errors.
      *
      * @param  ResponseInterface $response
-     * @param  string            $data     Parsed response data
+     * @param  string|array $data Parsed response data
      * @throws IdentityProviderException
      */
     protected function checkResponse(ResponseInterface $response, $data)
diff --git a/src/Provider/GitlabResourceOwner.php b/src/Provider/GitlabResourceOwner.php
index eba48a9..0e5d7eb 100644
--- a/src/Provider/GitlabResourceOwner.php
+++ b/src/Provider/GitlabResourceOwner.php
@@ -66,6 +66,7 @@ public function getApiClient()
             throw new \LogicException(__METHOD__ . ' requires package m4tthumphrey/php-gitlab-api to be installed and autoloaded'); // @codeCoverageIgnore
         }
         $client = \Gitlab\Client::create(rtrim($this->domain, '/') . self::PATH_API);
+
         return $client->authenticate($this->token->getToken(), Client::AUTH_OAUTH_TOKEN);
     }
 
@@ -84,6 +85,7 @@ public function getDomain()
     public function setDomain($domain)
     {
         $this->domain = $domain;
+
         return $this;
     }
 
@@ -152,7 +154,7 @@ public function getToken()
      */
     public function isActive()
     {
-        return $this->get('state') === 'active';
+        return 'active' === $this->get('state');
     }
 
     /**
diff --git a/test/src/Provider/GitlabTest.php b/test/src/Provider/GitlabTest.php
index 48e2a21..9ba212f 100644
--- a/test/src/Provider/GitlabTest.php
+++ b/test/src/Provider/GitlabTest.php
@@ -173,6 +173,7 @@ public function testUserData()
         $this->assertTrue($user->isActive());
         $this->assertTrue($user->isAdmin());
         $this->assertTrue($user->isExternal());
+
         return $user;
     }