Commit 66fd8608 authored by Jess's avatar Jess
Browse files

Merge 9.3.5, resolve merge conflicts, and update lockfile and dev versions.

parents d2d6fd61 76ed7a0e

composer.lock

+10 −9
Original line number Diff line number Diff line
@@ -4424,22 +4424,23 @@ 
        },

        {

            "name": "twig/twig",

            "version": "v2.14.7",

            "version": "v2.14.11",

            "source": {

                "type": "git",

                "url": "https://github.com/twigphp/Twig.git",

                "reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f"

                "reference": "66baa66f29ee30e487e05f1679903e36eb01d727"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/twigphp/Twig/zipball/8e202327ee1ed863629de9b18a5ec70ac614d88f",

                "reference": "8e202327ee1ed863629de9b18a5ec70ac614d88f",

                "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727",

                "reference": "66baa66f29ee30e487e05f1679903e36eb01d727",

                "shasum": ""

            },

            "require": {

                "php": ">=7.2.5",

                "php": ">=7.1.3",

                "symfony/polyfill-ctype": "^1.8",

                "symfony/polyfill-mbstring": "^1.3"

                "symfony/polyfill-mbstring": "^1.3",

                "symfony/polyfill-php72": "^1.8"

            },

            "require-dev": {

                "psr/container": "^1.0",
@@ -4487,7 +4488,7 @@ 
            ],

            "support": {

                "issues": "https://github.com/twigphp/Twig/issues",

                "source": "https://github.com/twigphp/Twig/tree/v2.14.7"

                "source": "https://github.com/twigphp/Twig/tree/v2.14.11"

            },

            "funding": [

                {
@@ -4499,7 +4500,7 @@ 
                    "type": "tidelift"

                }

            ],

            "time": "2021-09-17T08:39:54+00:00"

            "time": "2022-02-04T06:57:25+00:00"

        },

        {

            "name": "typo3/phar-stream-wrapper",
@@ -7920,5 +7921,5 @@ 
    "platform-overrides": {

        "php": "7.3.0"

    },

    "plugin-api-version": "2.1.0"

    "plugin-api-version": "2.2.0"

}

composer/Metapackage/CoreRecommended/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
        "symfony/validator": "v4.4.35",

        "symfony/var-dumper": "v5.4.0",

        "symfony/yaml": "v4.4.34",

        "twig/twig": "v2.14.7",

        "twig/twig": "v2.14.11",

        "typo3/phar-stream-wrapper": "v3.1.7"

    }

}

core/lib/Drupal.php

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

   * The current system version.

   */

  const VERSION = '9.3.5-dev';

  const VERSION = '9.3.6-dev';



  /**

   * Core API compatibility.