Skip to content

Adds sources information to the attachment media details of the REST response #224

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 9 commits into from
Mar 16, 2022
Merged

Adds sources information to the attachment media details of the REST response #224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c42adf4
Add a blank hook for the rest_prepare_attachment filter.
eugene-manuilov Mar 9, 2022
ed14544
Add sources information to the attachment response.
eugene-manuilov Mar 9, 2022
f1b8979
Fix formatting issues.
eugene-manuilov Mar 9, 2022
26dc80a
Add phpunit tests.
eugene-manuilov Mar 9, 2022
2b5683e
Apply suggestions from code review
eugene-manuilov Mar 10, 2022
8bc9a86
Update modules/images/webp-uploads/load.php
eugene-manuilov Mar 10, 2022
feb24fe
Merge remote-tracking branch 'origin/trunk' into feature/167-source-url
eugene-manuilov Mar 10, 2022
5e67d15
Fix formatting issues.
eugene-manuilov Mar 10, 2022
14cfdc1
Remove the unnecessary check.
eugene-manuilov Mar 10, 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
Prev Previous commit
Next Next commit
Apply suggestions from code review 
Co-authored-by: Crisoforo Gaspar Hernández <hello@crisoforo.com>
  • Loading branch information
@eugene-manuilov @mitogh
eugene-manuilov and mitogh authored Mar 10, 2022
commit 2b5683eaf241cae1ba23a06416194d5c3d5c227d
3 changes: 2 additions & 1 deletion modules/images/webp-uploads/load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,8 +503,9 @@ function webp_uploads_update_rest_attachment( WP_REST_Response $response, WP_Pos
}

$sources = array();
$directory = dirname( $data['media_details']['sizes'][ $size ]['source_url'] );
foreach ( $metadata['sizes'][ $size ]['sources'] as $mime => $mime_details ) {
$source_url = dirname( $data['media_details']['sizes'][ $size ]['source_url'] ) . '/' . $mime_details['file'];
$source_url = "{$directory}/{$mime_details['file']}";
$sources[ $mime ] = array_merge( $mime_details, array( 'source_url' => $source_url ) );
}

Expand Down
12 changes: 6 additions & 6 deletions tests/modules/images/webp-uploads/webp-uploads-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,14 +564,14 @@ public function it_should_add_sources_to_rest_response() {
$this->assertArrayHasKey( 'sources', $properties );
$this->assertIsArray( $properties['sources'] );

foreach ( $mime_types as $mie_type ) {
$this->assertArrayHasKey( $mie_type, $properties['sources'] );
foreach ( $mime_types as $mime_type ) {
$this->assertArrayHasKey( $mime_type, $properties['sources'] );

$this->assertArrayHasKey( 'filesize', $properties['sources'][ $mie_type ] );
$this->assertArrayHasKey( 'file', $properties['sources'][ $mie_type ] );
$this->assertArrayHasKey( 'source_url', $properties['sources'][ $mie_type ] );
$this->assertArrayHasKey( 'filesize', $properties['sources'][ $mime_type ] );
$this->assertArrayHasKey( 'file', $properties['sources'][ $mime_type ] );
$this->assertArrayHasKey( 'source_url', $properties['sources'][ $mime_type ] );

$this->assertNotFalse( filter_var( $properties['sources'][ $mie_type ]['source_url'], FILTER_VALIDATE_URL ) );
$this->assertNotFalse( filter_var( $properties['sources'][ $mime_type ]['source_url'], FILTER_VALIDATE_URL ) );
}
}
}
Expand Down