Commit 6f609171 authored by Jess's avatar Jess
Browse files

Resolve merge conflicts, update lockfile, and merge 9.0.9.

parents d2edf3eb 14803c18

composer.lock

+11 −7
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ 
            "dist": {

                "type": "path",

                "url": "core",

                "reference": "806585e0390b77d1a38aa32b3947f93004788c88"

                "reference": "d9034346624e6edc758fe912c3840544a2c6b15a"

            },

            "require": {

                "asm89/stack-cors": "^1.1",
@@ -511,7 +511,7 @@ 
                "laminas/laminas-diactoros": "^2.1",

                "laminas/laminas-feed": "^2.12",

                "masterminds/html5": "^2.1",

                "pear/archive_tar": "^1.4.9",

                "pear/archive_tar": "^1.4.11",

                "php": "^7.3",

                "psr/log": "^1.0",

                "stack/builder": "^1.0",
@@ -1426,16 +1426,16 @@ 
        },

        {

            "name": "pear/archive_tar",

            "version": "1.4.9",

            "version": "1.4.11",

            "source": {

                "type": "git",

                "url": "https://github.com/pear/Archive_Tar.git",

                "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0"

                "reference": "17d355cb7d3c4ff08e5729f29cd7660145208d9d"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/c5b00053770e1d72128252c62c2c1a12c26639f0",

                "reference": "c5b00053770e1d72128252c62c2c1a12c26639f0",

                "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/17d355cb7d3c4ff08e5729f29cd7660145208d9d",

                "reference": "17d355cb7d3c4ff08e5729f29cd7660145208d9d",

                "shasum": ""

            },

            "require": {
@@ -1488,7 +1488,11 @@ 
                "archive",

                "tar"

            ],

            "time": "2019-12-04T10:17:28+00:00"

            "support": {

                "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar",

                "source": "https://github.com/pear/Archive_Tar"

            },

            "time": "2020-11-19T22:10:24+00:00"

        },

        {

            "name": "pear/console_getopt",

composer/Metapackage/CoreRecommended/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
        "laminas/laminas-stdlib": "3.2.1",

        "laminas/laminas-zendframework-bridge": "1.0.4",

        "masterminds/html5": "2.7.0",

        "pear/archive_tar": "1.4.9",

        "pear/archive_tar": "1.4.11",

        "pear/console_getopt": "v1.4.3",

        "pear/pear-core-minimal": "v1.10.10",

        "pear/pear_exception": "v1.0.1",

core/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 
        "laminas/laminas-diactoros": "^2.1",

        "composer/semver": "^1.0",

        "asm89/stack-cors": "^1.1",

        "pear/archive_tar": "^1.4.9",

        "pear/archive_tar": "^1.4.11",

        "psr/log": "^1.0"

    },

    "conflict": {

core/lib/Drupal.php

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ class Drupal { 
  /**

   * The current system version.

   */

  const VERSION = '9.0.9-dev';

  const VERSION = '9.0.10-dev';



  /**

   * Core API compatibility.