Merge pull request #18938 from kamil-tekiela/ini_parse_quantity

Use ini_parse_quantity()
2024-02-05 13:57:51 -03:00 · 2024-02-05 13:57:51 -03:00 · 5140bedff1
commit 5140bedff1
parent f73ec94bb6 d8a9637536
6 changed files with 205 additions and 167 deletions
--- a/composer.json
+++ b/composer.json
@ -76,6 +76,7 @@
        "symfony/expression-language": "^6.2",
        "symfony/polyfill-ctype": "^1.24",
        "symfony/polyfill-mbstring": "^1.24",
+        "symfony/polyfill-php82": "^1.29",
        "twig/twig": "^3.5",
        "webmozart/assert": "^1.10",
        "williamdes/mariadb-mysql-kbs": "^1.2"
--- a/composer.lock
+++ b/composer.lock
@ -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": "aefe28bbea442c1dc86fae2004bd3ff0",
+    "content-hash": "1ba3be31be2a4906c540fb638f00d89c",
    "packages": [
        {
            "name": "composer/ca-bundle",
@ -454,12 +454,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/phpmyadmin/sql-parser.git",
-                "reference": "1f0c925194130fe6a81dd51092bc9545f7ff7c63"
+                "reference": "0e24506244a1f4dde047af1eb71a32c8cb5a6e75"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/1f0c925194130fe6a81dd51092bc9545f7ff7c63",
-                "reference": "1f0c925194130fe6a81dd51092bc9545f7ff7c63",
+                "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/0e24506244a1f4dde047af1eb71a32c8cb5a6e75",
+                "reference": "0e24506244a1f4dde047af1eb71a32c8cb5a6e75",
                "shasum": ""
            },
            "require": {
@ -538,7 +538,7 @@
                    "type": "other"
                }
            ],
-            "time": "2024-01-26T15:42:27+00:00"
+            "time": "2024-02-01T15:02:04+00:00"
        },
        {
            "name": "phpmyadmin/twig-i18n-extension",
@ -1106,16 +1106,16 @@
        },
        {
            "name": "symfony/cache",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/cache.git",
-                "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978"
+                "reference": "49f8cdee544a621a621cd21b6cda32a38926d310"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/14a75869bbb41cb35bc5d9d322473928c6f3f978",
-                "reference": "14a75869bbb41cb35bc5d9d322473928c6f3f978",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/49f8cdee544a621a621cd21b6cda32a38926d310",
+                "reference": "49f8cdee544a621a621cd21b6cda32a38926d310",
                "shasum": ""
            },
            "require": {
@ -1182,7 +1182,7 @@
                "psr6"
            ],
            "support": {
-                "source": "https://github.com/symfony/cache/tree/v6.4.2"
+                "source": "https://github.com/symfony/cache/tree/v6.4.3"
            },
            "funding": [
                {
@ -1198,7 +1198,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-29T15:34:34+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "symfony/cache-contracts",
@ -1278,16 +1278,16 @@
        },
        {
            "name": "symfony/config",
-            "version": "v6.4.0",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/config.git",
-                "reference": "5d33e0fb707d603330e0edfd4691803a1253572e"
+                "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/config/zipball/5d33e0fb707d603330e0edfd4691803a1253572e",
-                "reference": "5d33e0fb707d603330e0edfd4691803a1253572e",
+                "url": "https://api.github.com/repos/symfony/config/zipball/206482ff3ed450495b1d5b7bad1bc3a852def96f",
+                "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f",
                "shasum": ""
            },
            "require": {
@ -1333,7 +1333,7 @@
            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/config/tree/v6.4.0"
+                "source": "https://github.com/symfony/config/tree/v6.4.3"
            },
            "funding": [
                {
@ -1349,20 +1349,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-11-09T08:28:32+00:00"
+            "time": "2024-01-29T13:26:27+00:00"
        },
        {
            "name": "symfony/dependency-injection",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195"
+                "reference": "6871811c5a5c5e180244ddb689746446db02c05b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/226ea431b1eda6f0d9f5a4b278757171960bb195",
-                "reference": "226ea431b1eda6f0d9f5a4b278757171960bb195",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6871811c5a5c5e180244ddb689746446db02c05b",
+                "reference": "6871811c5a5c5e180244ddb689746446db02c05b",
                "shasum": ""
            },
            "require": {
@ -1414,7 +1414,7 @@
            "description": "Allows you to standardize and centralize the way objects are constructed in your application",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.2"
+                "source": "https://github.com/symfony/dependency-injection/tree/v6.4.3"
            },
            "funding": [
                {
@ -1430,7 +1430,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-28T19:16:56+00:00"
+            "time": "2024-01-30T08:32:12+00:00"
        },
        {
            "name": "symfony/deprecation-contracts",
@ -1501,16 +1501,16 @@
        },
        {
            "name": "symfony/expression-language",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/expression-language.git",
-                "reference": "7d63ccd5331d4164961776eced5524e891e30ad3"
+                "reference": "b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/expression-language/zipball/7d63ccd5331d4164961776eced5524e891e30ad3",
-                "reference": "7d63ccd5331d4164961776eced5524e891e30ad3",
+                "url": "https://api.github.com/repos/symfony/expression-language/zipball/b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4",
+                "reference": "b4a4ae33fbb33a99d23c5698faaecadb76ad0fe4",
                "shasum": ""
            },
            "require": {
@ -1545,7 +1545,7 @@
            "description": "Provides an engine that can compile and evaluate expressions",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/expression-language/tree/v6.4.2"
+                "source": "https://github.com/symfony/expression-language/tree/v6.4.3"
            },
            "funding": [
                {
@ -1561,20 +1561,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-10T16:15:48+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "symfony/filesystem",
-            "version": "v6.4.0",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/filesystem.git",
-                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59"
+                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/952a8cb588c3bc6ce76f6023000fb932f16a6e59",
-                "reference": "952a8cb588c3bc6ce76f6023000fb932f16a6e59",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
+                "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb",
                "shasum": ""
            },
            "require": {
@ -1608,7 +1608,7 @@
            "description": "Provides basic utilities for the filesystem",
            "homepage": "https://symfony.com",
            "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v6.4.0"
+                "source": "https://github.com/symfony/filesystem/tree/v6.4.3"
            },
            "funding": [
                {
@ -1624,20 +1624,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-26T17:27:13+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb"
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
-                "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4",
+                "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4",
                "shasum": ""
            },
            "require": {
@ -1651,9 +1651,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@ -1690,7 +1687,7 @@
                "portable"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0"
            },
            "funding": [
                {
@ -1706,20 +1703,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                "shasum": ""
            },
            "require": {
@ -1733,9 +1730,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@ -1773,7 +1767,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
            },
            "funding": [
                {
@ -1789,20 +1783,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-07-28T09:04:16+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-php80",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                "shasum": ""
            },
            "require": {
@ -1810,9 +1804,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@ -1856,7 +1847,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
            },
            "funding": [
                {
@ -1872,7 +1863,83 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php82",
+            "version": "v1.29.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php82.git",
+                "reference": "559d488c38784112c78b9bf17c5ce8366a265643"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/559d488c38784112c78b9bf17c5ce8366a265643",
+                "reference": "559d488c38784112c78b9bf17c5ce8366a265643",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php82\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php82/tree/v1.29.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/service-contracts",
@ -1958,16 +2025,16 @@
        },
        {
            "name": "symfony/var-exporter",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e"
+                "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/5fe9a0021b8d35e67d914716ec8de50716a68e7e",
-                "reference": "5fe9a0021b8d35e67d914716ec8de50716a68e7e",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a8c12b5448a5ac685347f5eeb2abf6a571ec16b8",
+                "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8",
                "shasum": ""
            },
            "require": {
@ -2013,7 +2080,7 @@
                "serialize"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v6.4.2"
+                "source": "https://github.com/symfony/var-exporter/tree/v6.4.3"
            },
            "funding": [
                {
@ -2029,7 +2096,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-27T08:18:35+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "twig/twig",
@ -3926,16 +3993,16 @@
        },
        {
            "name": "netresearch/jsonmapper",
-            "version": "v4.4.0",
+            "version": "v4.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/cweiske/jsonmapper.git",
-                "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f"
+                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/18133a2d8c24e10e58e02b700308ed3a4a60c97f",
-                "reference": "18133a2d8c24e10e58e02b700308ed3a4a60c97f",
+                "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0",
+                "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0",
                "shasum": ""
            },
            "require": {
@ -3971,9 +4038,9 @@
            "support": {
                "email": "cweiske@cweiske.de",
                "issues": "https://github.com/cweiske/jsonmapper/issues",
-                "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.0"
+                "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1"
            },
-            "time": "2024-01-28T07:31:37+00:00"
+            "time": "2024-01-31T06:18:54+00:00"
        },
        {
            "name": "nikic/php-parser",
@ -5192,16 +5259,16 @@
        },
        {
            "name": "phpunit/phpunit",
-            "version": "10.5.9",
+            "version": "10.5.10",
            "source": {
                "type": "git",
                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe"
+                "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
-                "reference": "0bd663704f0165c9e76fe4f06ffa6a1ca727fdbe",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/50b8e314b6d0dd06521dc31d1abffa73f25f850c",
+                "reference": "50b8e314b6d0dd06521dc31d1abffa73f25f850c",
                "shasum": ""
            },
            "require": {
@ -5273,7 +5340,7 @@
            "support": {
                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.9"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.10"
            },
            "funding": [
                {
@ -5289,7 +5356,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-22T14:35:40+00:00"
+            "time": "2024-02-04T09:07:51+00:00"
        },
        {
            "name": "pragmarx/google2fa",
@ -5709,12 +5776,12 @@
            "source": {
                "type": "git",
                "url": "https://github.com/Roave/SecurityAdvisories.git",
-                "reference": "f2272bd24e2ac981383d1de0d374f14cc3f62f67"
+                "reference": "794e58ed32820bf07fa2df520b6cf2cf24031192"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f2272bd24e2ac981383d1de0d374f14cc3f62f67",
-                "reference": "f2272bd24e2ac981383d1de0d374f14cc3f62f67",
+                "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/794e58ed32820bf07fa2df520b6cf2cf24031192",
+                "reference": "794e58ed32820bf07fa2df520b6cf2cf24031192",
                "shasum": ""
            },
            "conflict": {
@ -5768,12 +5835,13 @@
                "bolt/bolt": "<3.7.2",
                "bolt/core": "<=4.2",
                "bottelet/flarepoint": "<2.2.1",
+                "bref/bref": "<2.1.13",
                "brightlocal/phpwhois": "<=4.2.5",
                "brotkrueml/codehighlight": "<2.7",
                "brotkrueml/schema": "<1.13.1|>=2,<2.5.1",
                "brotkrueml/typo3-matomo-integration": "<1.3.2",
                "buddypress/buddypress": "<7.2.1",
-                "bugsnag/bugsnag-laravel": "<2.0.2",
+                "bugsnag/bugsnag-laravel": ">=2,<2.0.2",
                "bytefury/crater": "<6.0.2",
                "cachethq/cachet": "<2.5.1",
                "cakephp/cakephp": "<3.10.3|>=4,<4.0.10|>=4.1,<4.1.4|>=4.2,<4.2.12|>=4.3,<4.3.11|>=4.4,<4.4.10",
@ -5821,7 +5889,7 @@
                "desperado/xml-bundle": "<=0.1.7",
                "directmailteam/direct-mail": "<6.0.3|>=7,<7.0.3|>=8,<9.5.2",
                "doctrine/annotations": "<1.2.7",
-                "doctrine/cache": "<1.3.2|>=1.4,<1.4.2",
+                "doctrine/cache": ">=1,<1.3.2|>=1.4,<1.4.2",
                "doctrine/common": "<2.4.3|>=2.5,<2.5.1",
                "doctrine/dbal": ">=2,<2.0.8|>=2.1,<2.1.2|>=3,<3.1.4",
                "doctrine/doctrine-bundle": "<1.5.2",
@ -5864,7 +5932,7 @@
                "ezsystems/ezplatform-solr-search-engine": ">=1.7,<1.7.12|>=2,<2.0.2|>=3.3,<3.3.15",
                "ezsystems/ezplatform-user": ">=1,<1.0.1",
                "ezsystems/ezpublish-kernel": "<6.13.8.2-dev|>=7,<7.5.31",
-                "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.06,<=2019.03.5.1",
+                "ezsystems/ezpublish-legacy": "<=2017.12.7.3|>=2018.6,<=2019.03.5.1",
                "ezsystems/platform-ui-assets-bundle": ">=4.2,<4.2.3",
                "ezsystems/repository-forms": ">=2.3,<2.3.2.1-dev|>=2.5,<2.5.15",
                "ezyang/htmlpurifier": "<4.1.1",
@ -5916,7 +5984,7 @@
                "gos/web-socket-bundle": "<1.10.4|>=2,<2.6.1|>=3,<3.3",
                "gree/jose": "<2.2.1",
                "gregwar/rst": "<1.0.3",
-                "grumpydictator/firefly-iii": "<6.1.1",
+                "grumpydictator/firefly-iii": "<6.1.7",
                "gugoan/economizzer": "<=0.9.0.0-beta1",
                "guzzlehttp/guzzle": "<6.5.8|>=7,<7.4.5",
                "guzzlehttp/psr7": "<1.9.1|>=2,<2.4.5",
@ -5938,7 +6006,7 @@
                "ibexa/user": ">=4,<4.4.3",
                "icecoder/icecoder": "<=8.1",
                "idno/known": "<=1.3.1",
-                "illuminate/auth": ">=4,<4.0.99|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.10",
+                "illuminate/auth": "<5.5.10",
                "illuminate/cookie": ">=4,<=4.0.11|>=4.1,<=4.1.99999|>=4.2,<=4.2.99999|>=5,<=5.0.99999|>=5.1,<=5.1.99999|>=5.2,<=5.2.99999|>=5.3,<=5.3.99999|>=5.4,<=5.4.99999|>=5.5,<=5.5.49|>=5.6,<=5.6.99999|>=5.7,<=5.7.99999|>=5.8,<=5.8.99999|>=6,<6.18.31|>=7,<7.22.4",
                "illuminate/database": "<6.20.26|>=7,<7.30.5|>=8,<8.40",
                "illuminate/encryption": ">=4,<=4.0.11|>=4.1,<=4.1.31|>=4.2,<=4.2.22|>=5,<=5.0.35|>=5.1,<=5.1.46|>=5.2,<=5.2.45|>=5.3,<=5.3.31|>=5.4,<=5.4.36|>=5.5,<5.5.40|>=5.6,<5.6.15",
@ -5998,7 +6066,7 @@
                "liftkit/database": "<2.13.2",
                "limesurvey/limesurvey": "<3.27.19",
                "livehelperchat/livehelperchat": "<=3.91",
-                "livewire/livewire": ">2.2.4,<2.2.6",
+                "livewire/livewire": ">2.2.4,<2.2.6|>=3,<3.0.4",
                "lms/routes": "<2.1.1",
                "localizationteam/l10nmgr": "<7.4|>=8,<8.7|>=9,<9.2",
                "luyadev/yii-helpers": "<1.2.1",
@ -6014,7 +6082,7 @@
                "marcwillmann/turn": "<0.3.3",
                "matyhtf/framework": "<3.0.6",
                "mautic/core": "<4.3",
-                "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35",
+                "mediawiki/core": "<1.36.2",
                "mediawiki/matomo": "<2.4.3",
                "mediawiki/semantic-media-wiki": "<4.0.2",
                "melisplatform/melis-asset-manager": "<5.0.1",
@ -6217,7 +6285,7 @@
                "spoonity/tcpdf": "<6.2.22",
                "squizlabs/php_codesniffer": ">=1,<2.8.1|>=3,<3.0.1",
                "ssddanbrown/bookstack": "<22.02.3",
-                "statamic/cms": "<4.36",
+                "statamic/cms": "<4.46",
                "stormpath/sdk": "<9.9.99",
                "studio-42/elfinder": "<2.1.62",
                "subhh/libconnect": "<7.0.8|>=8,<8.1",
@ -6361,7 +6429,7 @@
                "yourls/yourls": "<=1.8.2",
                "zencart/zencart": "<=1.5.7.0-beta",
                "zendesk/zendesk_api_client_php": "<2.2.11",
-                "zendframework/zend-cache": "<2.4.8|>=2.5,<2.5.3",
+                "zendframework/zend-cache": ">=2.4,<2.4.8|>=2.5,<2.5.3",
                "zendframework/zend-captcha": ">=2,<2.4.9|>=2.5,<2.5.2",
                "zendframework/zend-crypt": ">=2,<2.4.9|>=2.5,<2.5.2",
                "zendframework/zend-db": ">=2,<2.0.99|>=2.1,<2.1.99|>=2.2,<2.2.10|>=2.3,<2.3.5",
@ -6393,7 +6461,7 @@
                "zenstruck/collection": "<0.2.1",
                "zetacomponents/mail": "<1.8.2",
                "zf-commons/zfc-user": "<1.2.2",
-                "zfcampus/zf-apigility-doctrine": "<1.0.3",
+                "zfcampus/zf-apigility-doctrine": ">=1,<1.0.3",
                "zfr/zfr-oauth2-server-module": "<0.1.2",
                "zoujingli/thinkadmin": "<=6.1.53"
            },
@ -6433,7 +6501,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2024-01-30T22:04:19+00:00"
+            "time": "2024-02-05T11:04:31+00:00"
        },
        {
            "name": "sebastian/cli-parser",
@ -7705,16 +7773,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625"
+                "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/0254811a143e6bc6c8deea08b589a7e68a37f625",
-                "reference": "0254811a143e6bc6c8deea08b589a7e68a37f625",
+                "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e",
+                "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e",
                "shasum": ""
            },
            "require": {
@ -7779,7 +7847,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.2"
+                "source": "https://github.com/symfony/console/tree/v6.4.3"
            },
            "funding": [
                {
@ -7795,20 +7863,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-10T16:15:48+00:00"
+            "time": "2024-01-23T14:51:35+00:00"
        },
        {
            "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "875e90aeea2777b6f135677f618529449334a612"
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
-                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
                "shasum": ""
            },
            "require": {
@ -7819,9 +7887,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@ -7860,7 +7925,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
            },
            "funding": [
                {
@ -7876,20 +7941,20 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                "shasum": ""
            },
            "require": {
@ -7900,9 +7965,6 @@
            },
            "type": "library",
            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                "thanks": {
                    "name": "symfony/polyfill",
                    "url": "https://github.com/symfony/polyfill"
@ -7944,7 +8006,7 @@
                "shim"
            ],
            "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
            },
            "funding": [
                {
@ -7960,7 +8022,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
        },
        {
            "name": "symfony/process",
@ -8026,16 +8088,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v6.4.2",
+            "version": "v6.4.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc"
+                "reference": "7a14736fb179876575464e4658fce0c304e8c15b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
-                "reference": "7cb80bc10bfcdf6b5492741c0b9357dac66940bc",
+                "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b",
+                "reference": "7a14736fb179876575464e4658fce0c304e8c15b",
                "shasum": ""
            },
            "require": {
@ -8092,7 +8154,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v6.4.2"
+                "source": "https://github.com/symfony/string/tree/v6.4.3"
            },
            "funding": [
                {
@ -8108,7 +8170,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2023-12-10T16:15:48+00:00"
+            "time": "2024-01-25T09:26:29+00:00"
        },
        {
            "name": "tecnickcom/tcpdf",
@ -8373,16 +8435,16 @@
        },
        {
            "name": "vimeo/psalm",
-            "version": "5.21.0",
+            "version": "5.21.1",
            "source": {
                "type": "git",
                "url": "https://github.com/vimeo/psalm.git",
-                "reference": "04ba9358e3f7d14a9dc3edd4e814a9d51d8c637f"
+                "reference": "8c473e2437be8b6a8fd8f630f0f11a16b114c494"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/vimeo/psalm/zipball/04ba9358e3f7d14a9dc3edd4e814a9d51d8c637f",
-                "reference": "04ba9358e3f7d14a9dc3edd4e814a9d51d8c637f",
+                "url": "https://api.github.com/repos/vimeo/psalm/zipball/8c473e2437be8b6a8fd8f630f0f11a16b114c494",
+                "reference": "8c473e2437be8b6a8fd8f630f0f11a16b114c494",
                "shasum": ""
            },
            "require": {
@ -8479,7 +8541,7 @@
                "issues": "https://github.com/vimeo/psalm/issues",
                "source": "https://github.com/vimeo/psalm"
            },
-            "time": "2024-01-30T22:52:27+00:00"
+            "time": "2024-02-01T01:04:32+00:00"
        },
        {
            "name": "web-auth/cose-lib",
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@ -2747,7 +2747,7 @@ parameters:

 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 14
+			count: 13
 			path: src/Controllers/Import/ImportController.php

 		-
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.21.0@04ba9358e3f7d14a9dc3edd4e814a9d51d8c637f">
+<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494">
  <file src="app/services_loader.php">
    <MixedArgument>
      <code>$argumentName</code>
--- a/src/Controllers/Import/ImportController.php
+++ b/src/Controllers/Import/ImportController.php
@ -33,6 +33,7 @@ use function __;
 use function _ngettext;
 use function in_array;
 use function ini_get;
+use function ini_parse_quantity;
 use function ini_set;
 use function intval;
 use function is_array;
@ -41,14 +42,11 @@ use function is_numeric;
 use function is_string;
 use function is_uploaded_file;
 use function mb_strlen;
-use function mb_strtolower;
 use function min;
 use function preg_match;
 use function preg_quote;
 use function preg_replace;
-use function substr;
 use function time;
-use function trim;

 final class ImportController extends AbstractController
 {
@ -72,7 +70,6 @@ final class ImportController extends AbstractController
        $GLOBALS['message'] ??= null;
        $GLOBALS['errorUrl'] ??= null;
        $GLOBALS['urlParams'] ??= null;
-        $GLOBALS['memory_limit'] ??= null;
        $GLOBALS['read_limit'] ??= null;
        $GLOBALS['finished'] ??= null;
        $GLOBALS['offset'] ??= null;
@ -387,28 +384,21 @@ final class ImportController extends AbstractController
        }

        // We can not read all at once, otherwise we can run out of memory
-        $GLOBALS['memory_limit'] = trim((string) ini_get('memory_limit'));
+        // Calculate value of the limit
+        $memoryLimit = (string) ini_get('memory_limit');
+        $memoryLimit = ini_parse_quantity($memoryLimit);
        // 2 MB as default
-        if (empty($GLOBALS['memory_limit'])) {
-            $GLOBALS['memory_limit'] = 2 * 1024 * 1024;
+        if ($memoryLimit === 0) {
+            $memoryLimit = 2 * 1024 * 1024;
        }

        // In case no memory limit we work on 10MB chunks
-        if ($GLOBALS['memory_limit'] === '-1') {
-            $GLOBALS['memory_limit'] = 10 * 1024 * 1024;
+        if ($memoryLimit === -1) {
+            $memoryLimit = 10 * 1024 * 1024;
        }

-        // Calculate value of the limit
-        $memoryUnit = mb_strtolower(substr((string) $GLOBALS['memory_limit'], -1));
-        $GLOBALS['memory_limit'] = match ($memoryUnit) {
-            'm' => (int) substr((string) $GLOBALS['memory_limit'], 0, -1) * 1024 * 1024,
-            'k' => (int) substr((string) $GLOBALS['memory_limit'], 0, -1) * 1024,
-            'g' => (int) substr((string) $GLOBALS['memory_limit'], 0, -1) * 1024 * 1024 * 1024,
-            default => (int) $GLOBALS['memory_limit'],
-        };
-
        // Just to be sure, there might be lot of memory needed for uncompression
-        $GLOBALS['read_limit'] = $GLOBALS['memory_limit'] / 8;
+        $GLOBALS['read_limit'] = $memoryLimit / 8;

        // handle filenames
        if (
--- a/src/Export/Export.php
+++ b/src/Export/Export.php
@ -41,6 +41,7 @@ use function http_build_query;
 use function implode;
 use function in_array;
 use function ini_get;
+use function ini_parse_quantity;
 use function is_array;
 use function is_file;
 use function is_numeric;
@ -54,10 +55,8 @@ use function preg_match;
 use function preg_replace;
 use function str_contains;
 use function strlen;
-use function strtolower;
 use function substr;
 use function time;
-use function trim;

 use const ENT_COMPAT;

@ -262,21 +261,7 @@ class Export
     */
    public function getMemoryLimit(): int
    {
-        $memoryLimit = trim((string) ini_get('memory_limit'));
-        $memoryLimitNumber = (int) substr($memoryLimit, 0, -1);
-        $lowerLastChar = strtolower(substr($memoryLimit, -1));
-        // 2 MB as default
-        if ($memoryLimit === '' || $memoryLimit === '0' || $memoryLimit === '-1') {
-            $memoryLimit = 2 * 1024 * 1024;
-        } elseif ($lowerLastChar === 'm') {
-            $memoryLimit = $memoryLimitNumber * 1024 * 1024;
-        } elseif ($lowerLastChar === 'k') {
-            $memoryLimit = $memoryLimitNumber * 1024;
-        } elseif ($lowerLastChar === 'g') {
-            $memoryLimit = $memoryLimitNumber * 1024 * 1024 * 1024;
-        } else {
-            $memoryLimit = (int) $memoryLimit;
-        }
+        $memoryLimit = ini_parse_quantity((string) ini_get('memory_limit'));

        // Some of memory is needed for other things and as threshold.
        // During export I had allocated (see memory_get_usage function)