Make WordPress Core

Ticket #50640: 50640-composer-lock.patch

File 50640-composer-lock.patch, 2.5 KB (added by ayeshrajans, 4 years ago)

Same patch as before, but includes lock file updates too. Lock file is generated from composer update --lock on Composer 1.10.15. It slightly pollutes the diff because a dependency adds a new funding section, but the hashes should match for anyone running same latest Composer 1 version.

  • composer.json

    diff --git a/composer.json b/composer.json
    index 41368ef25e..cb0fbb1740 100644
    a b  
    1616                "dealerdirect/phpcodesniffer-composer-installer": "~0.6.0",
    1717                "wp-coding-standards/wpcs": "~2.3.0",
    1818                "phpcompatibility/phpcompatibility-wp": "^2.1.0",
    19                 "phpunit/phpunit": "^7.5"
     19                "phpunit/phpunit": "^7.5",
     20                "ext-gd": "*"
    2021        },
    2122        "autoload-dev": {
    2223                "files": [
  • composer.lock

    diff --git a/composer.lock b/composer.lock
    index d189396da6..bea756ca50 100644
    a b  
    44        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
    55        "This file is @generated automatically"
    66    ],
    7     "content-hash": "798cd84a945e4caa3d0161ff63ec3743",
     7    "content-hash": "8653a7e68436fb7041821f76d02cceda",
    88    "packages": [],
    99    "packages-dev": [
    1010        {
     
    127127                "constructor",
    128128                "instantiate"
    129129            ],
     130            "funding": [
     131                {
     132                    "url": "https://www.doctrine-project.org/sponsorship.html",
     133                    "type": "custom"
     134                },
     135                {
     136                    "url": "https://www.patreon.com/phpdoctrine",
     137                    "type": "patreon"
     138                },
     139                {
     140                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
     141                    "type": "tidelift"
     142                }
     143            ],
    130144            "time": "2020-05-29T17:27:14+00:00"
    131145        },
    132146        {
     
    18331847    "platform": {
    18341848        "php": ">=5.6"
    18351849    },
    1836     "platform-dev": [],
     1850    "platform-dev": {
     1851        "ext-gd": "*"
     1852    },
    18371853    "plugin-api-version": "1.1.0"
    18381854}
  • tests/phpunit/includes/bootstrap.php

    diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
    index 65c1c370c4..97f1f6e7e3 100644
    a b  
    3434        exit( 1 );
    3535}
    3636
     37$required_extensions = array(
     38        'gd',
     39);
     40$missing_extensions  = array();
     41
     42foreach ( $required_extensions as $required_extension ) {
     43        if ( ! extension_loaded( $required_extension ) ) {
     44                $missing_extensions[] = $required_extension;
     45        }
     46}
     47
     48if ( ! empty( $missing_extensions ) ) {
     49        echo "Error: The following required extension(s) are missing from the testing environment.\n";
     50        echo implode( ', ', $missing_extensions );
     51        exit( 1 );
     52}
     53
    3754require_once $config_file_path;
    3855require_once __DIR__ . '/functions.php';
    3956