WordPress.org
Get WordPress

Make WordPress Core


Ignore:
Timestamp:
11/30/2017 11:09:33 PM (8 years ago)
Author:
pento
Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/tests/phpunit/tests/image/meta.php

    r41647 r42343  
    88class Tests_Image_Meta extends WP_UnitTestCase {
    99    function setUp() {
    10         if ( ! extension_loaded( 'gd' ) )
     10        if ( ! extension_loaded( 'gd' ) ) {
    1111            $this->markTestSkipped( 'The gd PHP extension is not loaded.' );
    12         if ( ! extension_loaded( 'exif' ) )
     12        }
     13        if ( ! extension_loaded( 'exif' ) ) {
    1314            $this->markTestSkipped( 'The exif PHP extension is not loaded.' );
     15        }
    1416
    1517        parent::setUp();
    … …  
    1820    function test_exif_d70() {
    1921        // exif from a Nikon D70
    20         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/2004-07-22-DSC_0008.jpg');
     22        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2004-07-22-DSC_0008.jpg' );
    2123
    22         $this->assertEquals(6.3, $out['aperture']);
    23         $this->assertEquals('', $out['credit']);
    24         $this->assertEquals('NIKON D70', $out['camera']);
    25         $this->assertEquals('', $out['caption']);
    26         $this->assertEquals(strtotime('2004-07-22 17:14:59'), $out['created_timestamp']);
    27         $this->assertEquals('', $out['copyright']);
    28         $this->assertEquals(27, $out['focal_length']);
    29         $this->assertEquals(400, $out['iso']);
    30         $this->assertEquals(1/40, $out['shutter_speed']);
    31         $this->assertEquals('', $out['title']);
     24        $this->assertEquals( 6.3, $out['aperture'] );
     25        $this->assertEquals( '', $out['credit'] );
     26        $this->assertEquals( 'NIKON D70', $out['camera'] );
     27        $this->assertEquals( '', $out['caption'] );
     28        $this->assertEquals( strtotime( '2004-07-22 17:14:59' ), $out['created_timestamp'] );
     29        $this->assertEquals( '', $out['copyright'] );
     30        $this->assertEquals( 27, $out['focal_length'] );
     31        $this->assertEquals( 400, $out['iso'] );
     32        $this->assertEquals( 1 / 40, $out['shutter_speed'] );
     33        $this->assertEquals( '', $out['title'] );
    3234    }
    3335
    3436    function test_exif_d70_mf() {
    3537        // exif from a Nikon D70 - manual focus lens, so some data is unavailable
    36         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG');
     38        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2007-06-17DSC_4173.JPG' );
    3739
    38         $this->assertEquals(0, $out['aperture']);
    39         $this->assertEquals('', $out['credit']);
    40         $this->assertEquals('NIKON D70', $out['camera']);
    41         $this->assertEquals('', $out['caption']);
    42         $this->assertEquals(strtotime('2007-06-17 21:18:00'), $out['created_timestamp']);
    43         $this->assertEquals('', $out['copyright']);
    44         $this->assertEquals(0, $out['focal_length']);
    45         $this->assertEquals(0, $out['iso']); // interesting - a Nikon bug?
    46         $this->assertEquals(1/500, $out['shutter_speed']);
    47         $this->assertEquals('', $out['title']);
     40        $this->assertEquals( 0, $out['aperture'] );
     41        $this->assertEquals( '', $out['credit'] );
     42        $this->assertEquals( 'NIKON D70', $out['camera'] );
     43        $this->assertEquals( '', $out['caption'] );
     44        $this->assertEquals( strtotime( '2007-06-17 21:18:00' ), $out['created_timestamp'] );
     45        $this->assertEquals( '', $out['copyright'] );
     46        $this->assertEquals( 0, $out['focal_length'] );
     47        $this->assertEquals( 0, $out['iso'] ); // interesting - a Nikon bug?
     48        $this->assertEquals( 1 / 500, $out['shutter_speed'] );
     49        $this->assertEquals( '', $out['title'] );
    4850        #$this->assertEquals(array('Flowers'), $out['keywords']);
    4951    }
    … …  
    5153    function test_exif_d70_iptc() {
    5254        // exif from a Nikon D70 with IPTC data added later
    53         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/2004-07-22-DSC_0007.jpg');
     55        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/2004-07-22-DSC_0007.jpg' );
    5456
    55         $this->assertEquals(6.3, $out['aperture']);
    56         $this->assertEquals('IPTC Creator', $out['credit']);
    57         $this->assertEquals('NIKON D70', $out['camera']);
    58         $this->assertEquals('IPTC Caption', $out['caption']);
    59         $this->assertEquals(strtotime('2004-07-22 17:14:35'), $out['created_timestamp']);
    60         $this->assertEquals('IPTC Copyright', $out['copyright']);
    61         $this->assertEquals(18, $out['focal_length']);
    62         $this->assertEquals(200, $out['iso']);
    63         $this->assertEquals(1/25, $out['shutter_speed']);
    64         $this->assertEquals('IPTC Headline', $out['title']);
     57        $this->assertEquals( 6.3, $out['aperture'] );
     58        $this->assertEquals( 'IPTC Creator', $out['credit'] );
     59        $this->assertEquals( 'NIKON D70', $out['camera'] );
     60        $this->assertEquals( 'IPTC Caption', $out['caption'] );
     61        $this->assertEquals( strtotime( '2004-07-22 17:14:35' ), $out['created_timestamp'] );
     62        $this->assertEquals( 'IPTC Copyright', $out['copyright'] );
     63        $this->assertEquals( 18, $out['focal_length'] );
     64        $this->assertEquals( 200, $out['iso'] );
     65        $this->assertEquals( 1 / 25, $out['shutter_speed'] );
     66        $this->assertEquals( 'IPTC Headline', $out['title'] );
    6567    }
    6668
    6769    function test_exif_fuji() {
    6870        // exif from a Fuji FinePix S5600 (thanks Mark)
    69         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/a2-small.jpg');
     71        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/a2-small.jpg' );
    7072
    71         $this->assertEquals(4.5, $out['aperture']);
    72         $this->assertEquals('', $out['credit']);
    73         $this->assertEquals('FinePix S5600', $out['camera']);
    74         $this->assertEquals('', $out['caption']);
    75         $this->assertEquals(strtotime('2007-09-03 10:17:03'), $out['created_timestamp']);
    76         $this->assertEquals('', $out['copyright']);
    77         $this->assertEquals(6.3, $out['focal_length']);
    78         $this->assertEquals(64, $out['iso']);
    79         $this->assertEquals(1/320, $out['shutter_speed']);
    80         $this->assertEquals('', $out['title']);
     73        $this->assertEquals( 4.5, $out['aperture'] );
     74        $this->assertEquals( '', $out['credit'] );
     75        $this->assertEquals( 'FinePix S5600', $out['camera'] );
     76        $this->assertEquals( '', $out['caption'] );
     77        $this->assertEquals( strtotime( '2007-09-03 10:17:03' ), $out['created_timestamp'] );
     78        $this->assertEquals( '', $out['copyright'] );
     79        $this->assertEquals( 6.3, $out['focal_length'] );
     80        $this->assertEquals( 64, $out['iso'] );
     81        $this->assertEquals( 1 / 320, $out['shutter_speed'] );
     82        $this->assertEquals( '', $out['title'] );
    8183
    8284    }
    … …  
    8991        // https://core.trac.wordpress.org/ticket/6571
    9092        // this triggers a warning mesage when reading the exif block
    91         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/waffles.jpg');
     93        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/waffles.jpg' );
    9294
    93         $this->assertEquals(0, $out['aperture']);
    94         $this->assertEquals('', $out['credit']);
    95         $this->assertEquals('', $out['camera']);
    96         $this->assertEquals('', $out['caption']);
    97         $this->assertEquals(0, $out['created_timestamp']);
    98         $this->assertEquals('', $out['copyright']);
    99         $this->assertEquals(0, $out['focal_length']);
    100         $this->assertEquals(0, $out['iso']);
    101         $this->assertEquals(0, $out['shutter_speed']);
    102         $this->assertEquals('', $out['title']);
     95        $this->assertEquals( 0, $out['aperture'] );
     96        $this->assertEquals( '', $out['credit'] );
     97        $this->assertEquals( '', $out['camera'] );
     98        $this->assertEquals( '', $out['caption'] );
     99        $this->assertEquals( 0, $out['created_timestamp'] );
     100        $this->assertEquals( '', $out['copyright'] );
     101        $this->assertEquals( 0, $out['focal_length'] );
     102        $this->assertEquals( 0, $out['iso'] );
     103        $this->assertEquals( 0, $out['shutter_speed'] );
     104        $this->assertEquals( '', $out['title'] );
    103105    }
    104106
    105107    function test_exif_no_data() {
    106108        // no exif data in this image (from burningwell.org)
    107         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/canola.jpg');
     109        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/canola.jpg' );
    108110
    109         $this->assertEquals(0, $out['aperture']);
    110         $this->assertEquals('', $out['credit']);
    111         $this->assertEquals('', $out['camera']);
    112         $this->assertEquals('', $out['caption']);
    113         $this->assertEquals(0, $out['created_timestamp']);
    114         $this->assertEquals('', $out['copyright']);
    115         $this->assertEquals(0, $out['focal_length']);
    116         $this->assertEquals(0, $out['iso']);
    117         $this->assertEquals(0, $out['shutter_speed']);
    118         $this->assertEquals('', $out['title']);
     111        $this->assertEquals( 0, $out['aperture'] );
     112        $this->assertEquals( '', $out['credit'] );
     113        $this->assertEquals( '', $out['camera'] );
     114        $this->assertEquals( '', $out['caption'] );
     115        $this->assertEquals( 0, $out['created_timestamp'] );
     116        $this->assertEquals( '', $out['copyright'] );
     117        $this->assertEquals( 0, $out['focal_length'] );
     118        $this->assertEquals( 0, $out['iso'] );
     119        $this->assertEquals( 0, $out['shutter_speed'] );
     120        $this->assertEquals( '', $out['title'] );
    119121    }
    120122
    … …  
    125127
    126128        // trilingual UTF-8 text in the ITPC caption-abstract field
    127         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/test-image-iptc.jpg');
     129        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/test-image-iptc.jpg' );
    128130
    129         $this->assertEquals('This is a comment. / Это комментарий. / Βλέπετε ένα σχόλιο.', $out['caption']);
     131        $this->assertEquals( 'This is a comment. / Это комментарий. / Βλέπετε ένα σχόλιο.', $out['caption'] );
    130132    }
    131133
    132134    /**
    133135     * wp_read_image_metadata() should false if the image file doesn't exist
     136     *
    134137     * @return void
    135138     */
    136139    public function test_missing_image_file() {
    137         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/404_image.png');
    138         $this->assertFalse($out);
     140        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/404_image.png' );
     141        $this->assertFalse( $out );
    139142    }
    140143
    … …  
    144147     */
    145148    public function test_exif_keywords() {
    146         $out = wp_read_image_metadata(DIR_TESTDATA.'/images/33772.jpg');
     149        $out = wp_read_image_metadata( DIR_TESTDATA . '/images/33772.jpg' );
    147150
    148151        $this->assertEquals( '8', $out['aperture'] );
    … …  
    156159        $this->assertEquals( '0.0025', $out['shutter_speed'] );
    157160        $this->assertEquals( 'Photoshop Document Ttitle', $out['title'] );
    158         $this->assertEquals( 1, $out['orientation']);
     161        $this->assertEquals( 1, $out['orientation'] );
    159162        $this->assertEquals( array( 'beach', 'baywatch', 'LA', 'sunset' ), $out['keywords'] );
    160163    }
Note: See TracChangeset for help on using the changeset viewer.