Skip to content

Fixes for master build issues #930

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 9, 2020
Merged

Fixes for master build issues #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5eaca39
Replace deprecated method call on Psr17FactoryDiscovery
acrobat Nov 7, 2020
b9c2873
Apply styleci fixes on master
acrobat Nov 7, 2020
119d58b
Disable roave bc check until 3.0.0 is released
acrobat Nov 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
28 changes: 14 additions & 14 deletions lib/Github/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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)',
]));
Expand Down Expand Up @@ -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())));
}

Expand Down