Unverified Commit c7cae3d7 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3087531 by jibran, xjm: Use Diactoros LTS version 1.7, not 1.8 which is...

Issue #3087531 by jibran, xjm: Use Diactoros LTS version 1.7, not 1.8 which is out of security coverage

(cherry picked from commit f123666e)
parent b617d5f7
Loading
Loading
Loading
Loading
+2 −2
Changes for composer.json: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@
    "license": "GPL-2.0-or-later",
    "require": {
        "composer/installers": "^1.0.24",
        "wikimedia/composer-merge-plugin": "^1.4",
        "drupal/core": "self.version"
        "drupal/core": "self.version",
        "wikimedia/composer-merge-plugin": "^1.4"
    },
    "require-dev": {
        "behat/mink": "1.7.x-dev",
+18 −27
Changes for composer.lock: 18 added lines, 27 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
    "content-hash": "89281ade179e78a45c5e6ed656c710de",
    "content-hash": "bc036f74a7ef48097e813b50a2d5aea8",
    "packages": [
        {
            "name": "asm89/stack-cors",
@@ -3175,16 +3175,16 @@
        },
        {
            "name": "zendframework/zend-diactoros",
            "version": "1.8.7",
            "version": "1.7.2",
            "source": {
                "type": "git",
                "url": "https://github.com/zendframework/zend-diactoros.git",
                "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b"
                "reference": "741e7a571836f038de731105f4742ca8a164e43a"
            },
            "dist": {
                "type": "zip",
                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
                "reference": "a85e67b86e9b8520d07e6415fcbcb8391b44a75b",
                "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/741e7a571836f038de731105f4742ca8a164e43a",
                "reference": "741e7a571836f038de731105f4742ca8a164e43a",
                "shasum": ""
            },
            "require": {
@@ -3197,27 +3197,18 @@
            "require-dev": {
                "ext-dom": "*",
                "ext-libxml": "*",
                "php-http/psr7-integration-tests": "dev-master",
                "phpunit/phpunit": "^5.7.16 || ^6.0.8 || ^7.2.7",
                "phpunit/phpunit": "^5.7.16 || ^6.0.8",
                "zendframework/zend-coding-standard": "~1.0"
            },
            "type": "library",
            "extra": {
                "branch-alias": {
                    "dev-release-1.8": "1.8.x-dev"
                    "dev-master": "1.7.x-dev",
                    "dev-develop": "1.8.x-dev",
                    "dev-release-2.0": "2.0.x-dev"
                }
            },
            "autoload": {
                "files": [
                    "src/functions/create_uploaded_file.php",
                    "src/functions/marshal_headers_from_sapi.php",
                    "src/functions/marshal_method_from_sapi.php",
                    "src/functions/marshal_protocol_version_from_sapi.php",
                    "src/functions/marshal_uri_from_sapi.php",
                    "src/functions/normalize_server.php",
                    "src/functions/normalize_uploaded_files.php",
                    "src/functions/parse_cookie_header.php"
                ],
                "psr-4": {
                    "Zend\\Diactoros\\": "src/"
                }
@@ -3233,7 +3224,7 @@
                "psr",
                "psr-7"
            ],
            "time": "2019-08-06T17:53:53+00:00"
            "time": "2018-05-29T16:53:08+00:00"
        },
        {
            "name": "zendframework/zend-escaper",
@@ -4704,8 +4695,8 @@
            "authors": [
                {
                    "name": "Sebastian Bergmann",
                    "email": "sebastian@phpunit.de",
                    "role": "lead"
                    "role": "lead",
                    "email": "sebastian@phpunit.de"
                }
            ],
            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
@@ -4752,8 +4743,8 @@
            "authors": [
                {
                    "name": "Sebastian Bergmann",
                    "email": "sb@sebastian-bergmann.de",
                    "role": "lead"
                    "role": "lead",
                    "email": "sb@sebastian-bergmann.de"
                }
            ],
            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
@@ -4843,8 +4834,8 @@
            "authors": [
                {
                    "name": "Sebastian Bergmann",
                    "email": "sb@sebastian-bergmann.de",
                    "role": "lead"
                    "role": "lead",
                    "email": "sb@sebastian-bergmann.de"
                }
            ],
            "description": "Utility class for timing",
@@ -4974,8 +4965,8 @@
            "authors": [
                {
                    "name": "Sebastian Bergmann",
                    "email": "sebastian@phpunit.de",
                    "role": "lead"
                    "role": "lead",
                    "email": "sebastian@phpunit.de"
                }
            ],
            "description": "The PHP Unit Testing framework.",
+1 −1
Changes for core/composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@
        "egulias/email-validator": "^2.0",
        "masterminds/html5": "^2.1",
        "symfony/psr-http-message-bridge": "^1.1.2",
        "zendframework/zend-diactoros": "^1.1",
        "zendframework/zend-diactoros": ">=1.7 <1.8",
        "composer/semver": "^1.0",
        "asm89/stack-cors": "^1.1",
        "pear/archive_tar": "^1.4"