From 08f11b5c043eadcf08e4c2eb6b509229e74503db Mon Sep 17 00:00:00 2001 From: Charles Severance Date: Tue, 7 Sep 2021 15:48:04 -0400 Subject: [PATCH] Avoid deprecation warning. --- composer.json | 2 +- composer.lock | 10 +++++----- vendor/composer/InstalledVersions.php | 6 +++--- vendor/composer/installed.json | 8 ++++---- vendor/composer/installed.php | 6 +++--- vendor/tsugi/lib/include/setup.php | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/composer.json b/composer.json index 00b9573bc3..aef63d68c2 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,7 @@ "symfony/http-kernel" : "v5.3.3", - "tsugi/lib": "dev-master#115f89939157a5e62f2f968623dea3f466679983", + "tsugi/lib": "dev-master#e8ba77c0ac78c7e32749bcea4682d7cdac204a56", "koseu/lib": "dev-master#5c5bcb32469977bea262b1900461c3f205adb899" }, "config": { diff --git a/composer.lock b/composer.lock index edfa872ba8..c0e8dabbfc 100644 --- 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": "7a5dd22c0a27ded9fb816912fe5260e3", + "content-hash": "8673701daee6d56db48da3d329986295", "packages": [ { "name": "aws/aws-sdk-php", @@ -6223,12 +6223,12 @@ "source": { "type": "git", "url": "https://github.com/tsugiproject/tsugi-php.git", - "reference": "115f89939157a5e62f2f968623dea3f466679983" + "reference": "e8ba77c0ac78c7e32749bcea4682d7cdac204a56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/115f89939157a5e62f2f968623dea3f466679983", - "reference": "115f89939157a5e62f2f968623dea3f466679983", + "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/e8ba77c0ac78c7e32749bcea4682d7cdac204a56", + "reference": "e8ba77c0ac78c7e32749bcea4682d7cdac204a56", "shasum": "" }, "require": { @@ -6271,7 +6271,7 @@ "issues": "https://github.com/tsugiproject/tsugi-php/issues", "source": "https://github.com/tsugiproject/tsugi-php/tree/master" }, - "time": "2021-09-01T19:15:01+00:00" + "time": "2021-09-07T19:47:12+00:00" }, { "name": "vlucas/phpdotenv", diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php index ecf09bb7a1..3dc627ff69 100644 --- a/vendor/composer/InstalledVersions.php +++ b/vendor/composer/InstalledVersions.php @@ -29,7 +29,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => '9e9375910a09c99965a560fd9075585db5988ff8', + 'reference' => '3f2a8b70d8d314799ae0d38558780bc4b00ff811', 'name' => '__root__', ), 'versions' => @@ -41,7 +41,7 @@ class InstalledVersions 'aliases' => array ( ), - 'reference' => '9e9375910a09c99965a560fd9075585db5988ff8', + 'reference' => '3f2a8b70d8d314799ae0d38558780bc4b00ff811', ), 'aws/aws-sdk-php' => array ( @@ -946,7 +946,7 @@ class InstalledVersions array ( 0 => '9999999-dev', ), - 'reference' => '115f89939157a5e62f2f968623dea3f466679983', + 'reference' => 'e8ba77c0ac78c7e32749bcea4682d7cdac204a56', ), 'vlucas/phpdotenv' => array ( diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 8b435c8c43..871fd0e8b8 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -6236,12 +6236,12 @@ "source": { "type": "git", "url": "https://github.com/tsugiproject/tsugi-php.git", - "reference": "115f89939157a5e62f2f968623dea3f466679983" + "reference": "e8ba77c0ac78c7e32749bcea4682d7cdac204a56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/115f89939157a5e62f2f968623dea3f466679983", - "reference": "115f89939157a5e62f2f968623dea3f466679983", + "url": "https://api.github.com/repos/tsugiproject/tsugi-php/zipball/e8ba77c0ac78c7e32749bcea4682d7cdac204a56", + "reference": "e8ba77c0ac78c7e32749bcea4682d7cdac204a56", "shasum": "" }, "require": { @@ -6254,7 +6254,7 @@ "phpunit/php-timer": ">=1.0.6", "phpunit/phpunit": "8.*" }, - "time": "2021-09-01T19:15:01+00:00", + "time": "2021-09-07T19:47:12+00:00", "default-branch": true, "type": "library", "installation-source": "dist", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 7cedd7ba71..5ba21c9fd3 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -6,7 +6,7 @@ 'aliases' => array ( ), - 'reference' => '9e9375910a09c99965a560fd9075585db5988ff8', + 'reference' => '3f2a8b70d8d314799ae0d38558780bc4b00ff811', 'name' => '__root__', ), 'versions' => @@ -18,7 +18,7 @@ 'aliases' => array ( ), - 'reference' => '9e9375910a09c99965a560fd9075585db5988ff8', + 'reference' => '3f2a8b70d8d314799ae0d38558780bc4b00ff811', ), 'aws/aws-sdk-php' => array ( @@ -923,7 +923,7 @@ array ( 0 => '9999999-dev', ), - 'reference' => '115f89939157a5e62f2f968623dea3f466679983', + 'reference' => 'e8ba77c0ac78c7e32749bcea4682d7cdac204a56', ), 'vlucas/phpdotenv' => array ( diff --git a/vendor/tsugi/lib/include/setup.php b/vendor/tsugi/lib/include/setup.php index 06cccc038b..8ce0368ac6 100644 --- a/vendor/tsugi/lib/include/setup.php +++ b/vendor/tsugi/lib/include/setup.php @@ -10,7 +10,7 @@ $CFG->dbversion = 202108250427; // Just turn this off to avoid security holes due to XML parsing -if ( function_exists ( 'libxml_disable_entity_loader' ) ) libxml_disable_entity_loader(); +if ( function_exists ( 'libxml_disable_entity_loader' ) && version_compare(PHP_VERSION, '8.0.0') < 0 ) libxml_disable_entity_loader(); // Only exists in PHP 5 >= 5.5.0 if ( ! function_exists ( 'json_last_error_msg' ) ) {