Merge pull request KnpLabs#930 from acrobat/fix-master-build-issues

Fixes for master build issues

Author: acrobat

.github/workflows/ci.yml

@@ -30,11 +30,13 @@ jobs:
     roave_bc_check:
         name: Roave BC Check
         runs-on: ubuntu-latest
+        # BC check disabled until 3.0.0 is tagged
         steps:
-            - uses: actions/checkout@v2
-
-            - name: Roave BC Check
-              uses: docker://nyholm/roave-bc-check-ga
+            - run: echo true
+#            - uses: actions/checkout@v2
+#
+#            - name: Roave BC Check
+#              uses: docker://nyholm/roave-bc-check-ga
 
     phpstan:
         runs-on: ubuntu-latest

composer.json

@@ -20,7 +20,7 @@
         "php": "^7.1",
         "php-http/client-common": "^2.3",
         "php-http/cache-plugin": "^1.7",
-        "php-http/discovery": "^1.9",
+        "php-http/discovery": "^1.11",
         "php-http/httplug": "^2.1",
         "php-http/multipart-stream-builder": "^1.1",
         "psr/cache": "^1.0",

lib/Github/Client.php

@@ -31,18 +31,18 @@
  * @method Api\Gists                             gist()
  * @method Api\Gists                             gists()
  * @method Api\Miscellaneous\Gitignore           gitignore()
- * @method Api\Apps apps()
- * @method Api\Issue issue()
- * @method Api\Issue issues()
- * @method Api\Markdown markdown()
- * @method Api\Notification notification()
- * @method Api\Notification notifications()
- * @method Api\Organization organization()
- * @method Api\Organization organizations()
- * @method Api\Organization\Projects orgProject()
- * @method Api\Organization\Projects orgProjects()
- * @method Api\Organization\Projects organizationProject()
- * @method Api\Organization\Projects organizationProjects()
+ * @method Api\Apps                              apps()
+ * @method Api\Issue                             issue()
+ * @method Api\Issue                             issues()
+ * @method Api\Markdown                          markdown()
+ * @method Api\Notification                      notification()
+ * @method Api\Notification                      notifications()
+ * @method Api\Organization                      organization()
+ * @method Api\Organization                      organizations()
+ * @method Api\Organization\Projects             orgProject()
+ * @method Api\Organization\Projects             orgProjects()
+ * @method Api\Organization\Projects             organizationProject()
+ * @method Api\Organization\Projects             organizationProjects()
  * @method Api\Organization\OutsideCollaborators outsideCollaborators()
  * @method Api\PullRequest                       pr()
  * @method Api\PullRequest                       pullRequest()
@@ -122,7 +122,7 @@ public function __construct(Builder $httpClientBuilder = null, $apiVersion = nul
         $builder->addPlugin(new GithubExceptionThrower());
         $builder->addPlugin(new Plugin\HistoryPlugin($this->responseHistory));
         $builder->addPlugin(new Plugin\RedirectPlugin());
-        $builder->addPlugin(new Plugin\AddHostPlugin(Psr17FactoryDiscovery::findUrlFactory()->createUri('https://api.github.com')));
+        $builder->addPlugin(new Plugin\AddHostPlugin(Psr17FactoryDiscovery::findUriFactory()->createUri('https://api.github.com')));
         $builder->addPlugin(new Plugin\HeaderDefaultsPlugin([
             'User-Agent' => 'php-github-api (http://github.com/KnpLabs/php-github-api)',
         ]));
@@ -339,7 +339,7 @@ private function setEnterpriseUrl($enterpriseUrl)
         $builder->removePlugin(Plugin\AddHostPlugin::class);
         $builder->removePlugin(PathPrepend::class);
 
-        $builder->addPlugin(new Plugin\AddHostPlugin(Psr17FactoryDiscovery::findUrlFactory()->createUri($enterpriseUrl)));
+        $builder->addPlugin(new Plugin\AddHostPlugin(Psr17FactoryDiscovery::findUriFactory()->createUri($enterpriseUrl)));
         $builder->addPlugin(new PathPrepend(sprintf('/api/%s', $this->getApiVersion())));
     }