diff options
author | Stefan Giehl <stefan@matomo.org> | 2021-12-21 11:26:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-21 11:26:16 +0300 |
commit | 338f67e5e2c1ea42253a6b54643c50ddb6fc660a (patch) | |
tree | 6e685715ec5ab021a334b9feef1b4d382c573ee6 | |
parent | 354c84d7f7f6f1739c6ddb1ff379ea6711c22db6 (diff) |
Updates matomo/ini composer dependency (#18518)
* Updates matomo/ini composer dependency
* fix tests
-rw-r--r-- | composer.json | 2 | ||||
-rw-r--r-- | composer.lock | 20 | ||||
-rw-r--r-- | plugins/CoreAdminHome/tests/Integration/Commands/SetConfigTest.php | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/composer.json b/composer.json index 8b3a62e64f..c77144c027 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "matomo/cache": "~2.0", "matomo/decompress": "~2.0", "matomo/device-detector": "^5.0", - "matomo/ini": "~2.0", + "matomo/ini": "~3.0", "matomo/matomo-php-tracker": "^3.0", "matomo/network": "~2.0", "matomo/referrer-spam-list": "~4.0.0", diff --git a/composer.lock b/composer.lock index 28a16e8dac..ce5e065c01 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": "be7877d5a2073705473720546406f0f8", + "content-hash": "7594badf335be345564cc3259be6940e", "packages": [ { "name": "composer/ca-bundle", @@ -566,24 +566,24 @@ }, { "name": "matomo/ini", - "version": "2.0.2", + "version": "3.0.0", "source": { "type": "git", "url": "https://github.com/matomo-org/component-ini.git", - "reference": "f7b0d6ce594b34ead16864fbc5062c771328ac31" + "reference": "14c8cf5e78c8046a3e1b3f2fe8dc6cb474bc3f6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/component-ini/zipball/f7b0d6ce594b34ead16864fbc5062c771328ac31", - "reference": "f7b0d6ce594b34ead16864fbc5062c771328ac31", + "url": "https://api.github.com/repos/matomo-org/component-ini/zipball/14c8cf5e78c8046a3e1b3f2fe8dc6cb474bc3f6b", + "reference": "14c8cf5e78c8046a3e1b3f2fe8dc6cb474bc3f6b", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.2" }, "require-dev": { - "athletic/athletic": "0.1.*", - "phpunit/phpunit": "^4.8.36" + "phpbench/phpbench": "^1.0", + "phpunit/phpunit": "^8.5" }, "type": "library", "autoload": { @@ -597,9 +597,9 @@ ], "support": { "issues": "https://github.com/matomo-org/component-ini/issues", - "source": "https://github.com/matomo-org/component-ini/tree/master" + "source": "https://github.com/matomo-org/component-ini/tree/3.0.0" }, - "time": "2020-01-12T18:54:50+00:00" + "time": "2021-06-17T07:06:45+00:00" }, { "name": "matomo/matomo-php-tracker", diff --git a/plugins/CoreAdminHome/tests/Integration/Commands/SetConfigTest.php b/plugins/CoreAdminHome/tests/Integration/Commands/SetConfigTest.php index 9049f1ac09..ef6dc6b37b 100644 --- a/plugins/CoreAdminHome/tests/Integration/Commands/SetConfigTest.php +++ b/plugins/CoreAdminHome/tests/Integration/Commands/SetConfigTest.php @@ -129,7 +129,7 @@ class SetConfigTest extends ConsoleCommandTestCase $this->assertEquals('+', $config->General['action_url_category_delimiter']); $this->assertEquals(array('www.trustedhost.com', 'www.trustedhost2.com'), $config->General['trusted_hosts']); $this->assertEquals(array('abc', 'def'), $config->MySection['array_value']); - $this->assertEquals(array('def'), $config->MySection['object_value']); + $this->assertEquals(array('abc' => 'def'), $config->MySection['object_value']); $this->assertArrayNotHasKey('other_array_value', $config->MySection); self::assertStringContainsString("done.", $this->applicationTester->getDisplay()); |