prepare release 1.26.0 (#3554)

* bump version * suppress deprecation * composer update to fix twig security issue * make sure to use the same timezone in all test runs
2022-10-01 17:23:15 +02:00
parent 96d0d4943b
commit de39623378
4 changed files with 31 additions and 29 deletions
--- a/composer.lock
+++ b/composer.lock
@@ -423,16 +423,16 @@
        },
        {
            "name": "doctrine/common",
-            "version": "3.4.0",
+            "version": "3.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/common.git",
-                "reference": "e09556bbdf95b8420e649162b19ae9da2d1a80f3"
+                "reference": "616d5fca274ea66b969cdebbbfd1dc33a87d461b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/e09556bbdf95b8420e649162b19ae9da2d1a80f3",
-                "reference": "e09556bbdf95b8420e649162b19ae9da2d1a80f3",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/616d5fca274ea66b969cdebbbfd1dc33a87d461b",
+                "reference": "616d5fca274ea66b969cdebbbfd1dc33a87d461b",
                "shasum": ""
            },
            "require": {
@@ -440,13 +440,13 @@
                "php": "^7.1 || ^8.0"
            },
            "require-dev": {
-                "doctrine/coding-standard": "^9.0",
+                "doctrine/coding-standard": "^9.0 || ^10.0",
                "doctrine/collections": "^1",
                "phpstan/phpstan": "^1.4.1",
                "phpstan/phpstan-phpunit": "^1",
                "phpunit/phpunit": "^7.5.20 || ^8.5 || ^9.0",
                "squizlabs/php_codesniffer": "^3.0",
-                "symfony/phpunit-bridge": "^4.0.5",
+                "symfony/phpunit-bridge": "^6.1",
                "vimeo/psalm": "^4.4"
            },
            "type": "library",
@@ -494,7 +494,7 @@
            ],
            "support": {
                "issues": "https://github.com/doctrine/common/issues",
-                "source": "https://github.com/doctrine/common/tree/3.4.0"
+                "source": "https://github.com/doctrine/common/tree/3.4.1"
            },
            "funding": [
                {
@@ -510,7 +510,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-08-23T19:46:56+00:00"
+            "time": "2022-09-26T17:15:48+00:00"
        },
        {
            "name": "doctrine/dbal",
@@ -1714,16 +1714,16 @@
        },
        {
            "name": "ezyang/htmlpurifier",
-            "version": "v4.15.0",
+            "version": "v4.16.0",
            "source": {
                "type": "git",
                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "8d9f4c9ec154922ff19690ffade9ed915b27a017"
+                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/8d9f4c9ec154922ff19690ffade9ed915b27a017",
-                "reference": "8d9f4c9ec154922ff19690ffade9ed915b27a017",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8",
+                "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8",
                "shasum": ""
            },
            "require": {
@@ -1769,9 +1769,9 @@
            ],
            "support": {
                "issues": "https://github.com/ezyang/htmlpurifier/issues",
-                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.15.0"
+                "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0"
            },
-            "time": "2022-09-18T06:23:57+00:00"
+            "time": "2022-09-18T07:06:19+00:00"
        },
        {
            "name": "friendsofphp/proxy-manager-lts",
@@ -3994,16 +3994,16 @@
        },
        {
            "name": "phpoffice/phpspreadsheet",
-            "version": "1.25.0",
+            "version": "1.25.2",
            "source": {
                "type": "git",
                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "86f3730ded48d0223fda78f3fb630e1e9ca59917"
+                "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/86f3730ded48d0223fda78f3fb630e1e9ca59917",
-                "reference": "86f3730ded48d0223fda78f3fb630e1e9ca59917",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/a317a09e7def49852400a4b3eca4a4b0790ceeb5",
+                "reference": "a317a09e7def49852400a4b3eca4a4b0790ceeb5",
                "shasum": ""
            },
            "require": {
@@ -4020,7 +4020,7 @@
                "ext-xmlwriter": "*",
                "ext-zip": "*",
                "ext-zlib": "*",
-                "ezyang/htmlpurifier": "4.15",
+                "ezyang/htmlpurifier": "^4.15",
                "maennchen/zipstream-php": "^2.1",
                "markbaker/complex": "^3.0",
                "markbaker/matrix": "^3.0",
@@ -4093,9 +4093,9 @@
            ],
            "support": {
                "issues": "https://github.com/PHPOffice/PhpSpreadsheet/issues",
-                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.0"
+                "source": "https://github.com/PHPOffice/PhpSpreadsheet/tree/1.25.2"
            },
-            "time": "2022-09-25T11:06:17+00:00"
+            "time": "2022-09-25T17:21:01+00:00"
        },
        {
            "name": "phpoffice/phpword",
@@ -10674,16 +10674,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.4.2",
+            "version": "v3.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077"
+                "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077",
-                "reference": "e07cdd3d430cd7e453c31b36eb5ad6c0c5e43077",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/c38fd6b0b7f370c198db91ffd02e23b517426b58",
+                "reference": "c38fd6b0b7f370c198db91ffd02e23b517426b58",
                "shasum": ""
            },
            "require": {
@@ -10734,7 +10734,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.4.2"
+                "source": "https://github.com/twigphp/Twig/tree/v3.4.3"
            },
            "funding": [
                {
@@ -10746,7 +10746,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2022-08-12T06:47:24+00:00"
+            "time": "2022-09-28T08:42:51+00:00"
        },
        {
            "name": "webmozart/assert",
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,6 +4,7 @@
    <php>
        <ini name="error_reporting" value="-1"/>
        <ini name="max_execution_time" value="-1"/>
+        <ini name="date.timezone" value="UTC"/>
        <ini name="intl.default_locale" value="en_US"/>
        <env name="KERNEL_CLASS" value="App\Kernel" force="true"/>
        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak"/>
--- a/src/Configuration/ThemeConfiguration.php
+++ b/src/Configuration/ThemeConfiguration.php
@@ -29,6 +29,7 @@ final class ThemeConfiguration implements \ArrayAccess
    /**
     * @return mixed
     */
+    #[\ReturnTypeWillChange]
    public function offsetGet($offset)
    {
        return $this->systemConfiguration->find('theme.' . $offset);
--- a/src/Constants.php
+++ b/src/Constants.php
@@ -17,11 +17,11 @@ class Constants
    /**
     * The current release version
     */
-    public const VERSION = '1.25.0';
+    public const VERSION = '1.26.0';
    /**
     * The current release: major * 10000 + minor * 100 + patch
     */
-    public const VERSION_ID = 12500;
+    public const VERSION_ID = 12600;
    /**
     * The current release status, either "stable" or "dev"
     */