Verified Commit 9b2b3b53 authored by Jess's avatar Jess
Browse files

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

parents 437d5352 89d5167a

composer.lock

+8 −8
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ 
            "dist": {

                "type": "path",

                "url": "core",

                "reference": "d2e4d655142ce477040b1423f9fe1acba9c351c3"

                "reference": "5c09ab3619cc05468ae971be99f7e37aff6377bd"

            },

            "require": {

                "asm89/stack-cors": "^1.3",
@@ -571,7 +571,7 @@ 
                "symfony/translation": "^4.4",

                "symfony/validator": "^4.4",

                "symfony/yaml": "^4.4.19",

                "twig/twig": "^2.15",

                "twig/twig": "^2.15.3",

                "typo3/phar-stream-wrapper": "^3.1.3"

            },

            "conflict": {
@@ -4379,16 +4379,16 @@ 
        },

        {

            "name": "twig/twig",

            "version": "v2.15.1",

            "version": "v2.15.3",

            "source": {

                "type": "git",

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

                "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4"

                "reference": "ab402673db8746cb3a4c46f3869d6253699f614a"

            },

            "dist": {

                "type": "zip",

                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4",

                "reference": "3b7cedb2f736899a7dbd0ba3d6da335a015f5cc4",

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

                "reference": "ab402673db8746cb3a4c46f3869d6253699f614a",

                "shasum": ""

            },

            "require": {
@@ -4443,7 +4443,7 @@ 
            ],

            "support": {

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

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

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

            },

            "funding": [

                {
@@ -4455,7 +4455,7 @@ 
                    "type": "tidelift"

                }

            ],

            "time": "2022-05-17T05:46:24+00:00"

            "time": "2022-09-28T08:40:08+00:00"

        },

        {

            "name": "typo3/phar-stream-wrapper",

composer/Metapackage/CoreRecommended/composer.json

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

        "symfony/var-dumper": "~v5.4.9",

        "symfony/yaml": "~v4.4.37",

        "twig/twig": "~v2.15.1",

        "twig/twig": "~v2.15.3",

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

    }

}

core/assets/scaffold/files/default.services.yml

+15 −0
Original line number Diff line number Diff line
@@ -93,6 +93,21 @@ parameters: 
    # Disabling the Twig cache is not recommended in production environments.

    # @default true

    cache: true

    # File extensions:

    #

    # List of file extensions the Twig system is allowed to load via the

    # twig.loader.filesystem service. Files with other extensions will not be

    # loaded unless they are added here. For example, to allow a file named

    # 'example.partial' to be loaded, add 'partial' to this list. To load files

    # with no extension, add an empty string '' to the list.

    #

    # @default ['css', 'html', 'js', 'svg', 'twig']

    allowed_file_extensions:

      - css

      - html

      - js

      - svg

      - twig

  renderer.config:

    # Renderer required cache contexts:

    #

core/composer.json

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        "symfony/polyfill-php80": "^1.25",

        "symfony/yaml": "^4.4.19",

        "typo3/phar-stream-wrapper": "^3.1.3",

        "twig/twig": "^2.15",

        "twig/twig": "^2.15.3",

        "doctrine/reflection": "^1.2",

        "doctrine/annotations": "^1.13",

        "guzzlehttp/guzzle": "^6.5.8 || ^7.4.5",

core/core.services.yml

+7 −1
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ parameters: 
    debug: false

    auto_reload: null

    cache: true

    allowed_file_extensions:

      - css

      - html

      - js

      - svg

      - twig

  renderer.config:

    required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions']

    auto_placeholder_conditions:
@@ -1688,7 +1694,7 @@ services: 
    # We use '.' instead of '%app.root%' as the path for non-namespaced template

    # files so that they match the relative paths of templates loaded via the

    # theme registry or via Twig namespaces.

    arguments: ['.', '@module_handler', '@theme_handler']

    arguments: ['.', '@module_handler', '@theme_handler', '%twig.config%']

    tags:

      - { name: twig.loader, priority: 100 }

  twig.loader.theme_registry: