Skip to content

Fix the handling of minified metadata responses #75

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 2 commits into from
Jan 24, 2022
Merged

Fix the handling of minified metadata responses #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc3a194
Fix the handling of minified metadata responses
stof Jan 20, 2022
b8eeec1
Run CI on pull requests as well as push
robbieaverill Jan 24, 2022
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: Tests and linting

on: [push]
on: [push, pull_request]

jobs:
build:
Expand Down
3 changes: 2 additions & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"php": "^7.4 || ^8.0",
"guzzlehttp/guzzle": "^6.0 || ^7.0",
"doctrine/inflector": "^1.0 || ^2.0",
"ext-json": "*"
"ext-json": "*",
"composer/metadata-minifier": "^1.0"
},
"require-dev": {
"phpspec/phpspec": "^6.0 || ^7.0",
Expand Down
15 changes: 2 additions & 13 deletions src/Packagist/Api/Result/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

namespace Packagist\Api\Result;

use Composer\MetadataMinifier\MetadataMinifier;
use InvalidArgumentException;
use Packagist\Api\Result\Package\Author;
use Packagist\Api\Result\Package\Dist;
Expand Down Expand Up @@ -131,19 +132,6 @@ public function createPackageResults(array $package): Package
$version['name'] ??= '';
$version['type'] ??= '';

if (isset($version['conflict']) && !is_array($version['conflict'])) {
unset($version['conflict']);
}
if (isset($version['suggest']) && !is_array($version['suggest'])) {
unset($version['suggest']);
}
if (isset($version['replace']) && !is_array($version['replace'])) {
unset($version['replace']);
}
if (isset($version['provide']) && !is_array($version['provide'])) {
unset($version['provide']);
}

if (isset($version['authors']) && $version['authors']) {
foreach ($version['authors'] as $key => $author) {
// Cast some potentially null properties to empty strings
Expand Down Expand Up @@ -198,6 +186,7 @@ public function createComposer2PackagesResults(array $packages): array
$created = [];

foreach ($packages as $name => $package) {
$package = MetadataMinifier::expand($package);
// Create an empty package, only contains versions
$createdPackage = array(
'versions' => [],
Expand Down