Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

- name: Cache Composer packages
id: composer-cache
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: vendor
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
Expand Down
5 changes: 5 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,10 @@
"scripts": {
"lint": "vendor/bin/phpcs --standard=PSR12 src/",
"test": "vendor/bin/phpspec run -f pretty"
},
"config": {
"allow-plugins": {
"php-http/discovery": true
}
}
}
6 changes: 3 additions & 3 deletions spec/Packagist/Api/ClientSpec.php
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ public function it_gets_composer_package_details(HttpClient $client, Factory $fa
$response->getBody()->shouldBeCalled()->willReturn($body);
$body->getContents()->shouldBeCalledTimes(2)->willReturn($data1, $data2);

$client->request('GET', 'https://packagist.org/p2/sylius/sylius.json')
$client->request('GET', 'https://repo.packagist.org/p2/sylius/sylius.json')
->shouldBeCalled()
->willReturn($response);

$client->request('GET', 'https://packagist.org/p2/sylius/sylius~dev.json')
$client->request('GET', 'https://repo.packagist.org/p2/sylius/sylius~dev.json')
->shouldBeCalled()
->willReturn($response);

Expand Down Expand Up @@ -140,7 +140,7 @@ public function it_gets_composer_releases_package_details(HttpClient $client, Fa
$response->getBody()->shouldBeCalled()->willReturn($body);
$body->getContents()->shouldBeCalled()->willReturn($data);

$client->request('GET', 'https://packagist.org/p2/sylius/sylius.json')
$client->request('GET', 'https://repo.packagist.org/p2/sylius/sylius.json')
->shouldBeCalled()
->willReturn($response);

Expand Down
4 changes: 4 additions & 0 deletions src/Packagist/Api/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,10 @@ private function filterAdvisories(array $advisories, array $packages): array
*/
protected function url(string $route): string
{
if (preg_match('{^/p\d?/}', $route) && $this->packagistUrl === 'https://packagist.org') {
return 'https://repo.packagist.org' . $route;
}

return $this->packagistUrl . $route;
}

Expand Down