Add php-gitlab-api v10 support

curry684 · curry684 · commit bd958b5d3433 · 2020-08-28T02:55:21.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,7 @@
 /build
 /log
 /vendor
-.php_cs.cache
+.*.cache
 composer.phar
 composer.lock
 infection.json
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to `oauth2-gitlab` will be documented in this file
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+Nothing yet.
+
+## [3.3.0] - 2020-02-10
+### Added
+ - Compatibility with php-gitlab-api v10
 
 ## [3.2.0] - 2020-02-10
 ### Changed
@@ -55,7 +60,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
  - Original fork, feature complete
 
-[Unreleased]: https://github.com/omines/oauth2-gitlab/compare/3.2.0...master
+[Unreleased]: https://github.com/omines/oauth2-gitlab/compare/3.3.0...master
+[3.3.0]: https://github.com/omines/oauth2-gitlab/compare/3.2.0...3.3.0
 [3.2.0]: https://github.com/omines/oauth2-gitlab/compare/3.1.2...3.2.0
 [3.1.2]: https://github.com/omines/oauth2-gitlab/compare/3.1.1...3.1.2
 [3.1.1]: https://github.com/omines/oauth2-gitlab/compare/3.1.0...3.1.1
diff --git a/README.md b/README.md
@@ -95,7 +95,8 @@ Install [`m4tthumphrey/php-gitlab-api`](https://packagist.org/packages/m4tthumph
 Gitlab API after authentication. Either connect manually:
 
 ```php
-$client = new \Gitlab\Client('https://my.gitlab.url/api/v4/');
+$client = new \Gitlab\Client();
+$client->setUrl('https://my.gitlab.url/api/v4/');
 $client->authenticate($token->getToken(), \Gitlab\Client::AUTH_OAUTH_TOKEN);
 ```
 Or call the `getApiClient` method on `GitlabResourceOwner` which does the same implicitly.
diff --git a/composer.json b/composer.json
@@ -23,9 +23,11 @@
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.0",
+        "guzzlehttp/psr7": "^1.6",
+        "http-interop/http-factory-guzzle": "^1.0",
         "mockery/mockery": "^1.0",
-        "m4tthumphrey/php-gitlab-api": "^9.0.0",
-        "php-http/guzzle6-adapter": "^2.0.1",
+        "m4tthumphrey/php-gitlab-api": "^9.0|^10.0",
+        "php-http/guzzle6-adapter": "^2.0",
         "phpunit/phpunit": "^8.0|^9.0"
     },
     "suggest": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,34 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
->
-    <logging>
-        <log type="coverage-html"
-                target="./build/coverage/html"
-                lowUpperBound="35"
-                highLowerBound="70"/>
-          <log type="coverage-clover"
-                target="./build/coverage/log/coverage.xml"/>
-    </logging>
-    <testsuites>
-        <testsuite name="Package Test Suite">
-            <directory suffix=".php">./test/</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./</directory>
-            <exclude>
-                <directory suffix=".php">./vendor</directory>
-                <directory suffix=".php">./test</directory>
-            </exclude>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./</directory>
+    </include>
+    <exclude>
+      <directory suffix=".php">./vendor</directory>
+      <directory suffix=".php">./test</directory>
+    </exclude>
+    <report>
+      <clover outputFile="./build/coverage/log/coverage.xml"/>
+      <html outputDirectory="./build/coverage/html" lowUpperBound="35" highLowerBound="70"/>
+    </report>
+  </coverage>
+  <logging/>
+  <testsuites>
+    <testsuite name="Package Test Suite">
+      <directory suffix=".php">./test/</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/src/Provider/GitlabResourceOwner.php b/src/Provider/GitlabResourceOwner.php
@@ -63,7 +63,8 @@ public function getApiClient()
         if (!class_exists('\\Gitlab\\Client')) {
             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);
+        $client = new \Gitlab\Client();
+        $client->setUrl(rtrim($this->domain, '/') . self::PATH_API);
 
         return $client->authenticate($this->token->getToken(), Client::AUTH_OAUTH_TOKEN);
     }

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ public function getApiClient()`
`63`	`63`	`if (!class_exists('\\Gitlab\\Client')) {`
`64`	`64`	`throw new \LogicException(__METHOD__ . ' requires package m4tthumphrey/php-gitlab-api to be installed and autoloaded'); // @codeCoverageIgnore`
`65`	`65`	`}`
`66`		`- $client = \Gitlab\Client::create(rtrim($this->domain, '/') . self::PATH_API);`
	`66`	`+ $client = new \Gitlab\Client();`
	`67`	`+ $client->setUrl(rtrim($this->domain, '/') . self::PATH_API);`
`67`	`68`
`68`	`69`	`return $client->authenticate($this->token->getToken(), Client::AUTH_OAUTH_TOKEN);`
`69`	`70`	`}`