Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
with
554 additions
and 200 deletions.
- +4 −0 CHANGELOG.md
- +27 −0 DIObject.php
- +1 −1 composer.json
- +348 −63 composer.lock
- +4 −4 config/environment/dev.php
- +9 −9 config/environment/test.php
- +4 −4 config/environment/ui-test.php
- +10 −12 config/global.php
- +2 −2 core/CliMulti/RequestCommand.php
- +0 −2 core/Container/ContainerFactory.php
- +20 −4 core/Container/IniConfigDefinitionSource.php
- +1 −1 core/Container/StaticContainer.php
- +2 −2 core/ExceptionHandler.php
- +2 −0 core/bootstrap.php
- +1 −1 plugins/CoreAdminHome/tests/Integration/SetConfigTest.php
- +2 −2 plugins/CoreAdminHome/tests/Integration/TasksTest.php
- +1 −1 plugins/CoreConsole/tests/System/ArchiveCronTest.php
- +1 −1 plugins/CoreHome/config/config.php
- +2 −2 plugins/CorePluginsAdmin/config/test.php
- +1 −1 plugins/CoreUpdater/config/config.php
- +1 −1 plugins/CoreUpdater/tests/Fixtures/FailUpdateHttpsFixture.php
- +1 −1 plugins/CustomAlerts
- +2 −2 plugins/CustomJsTracker/tests/Integration/TrackerUpdaterTest.php
- +1 −1 plugins/DBStats/config/test.php
- +1 −1 plugins/DeviceDetectorCache
- +13 −13 plugins/Diagnostics/config/config.php
- +1 −1 plugins/Intl/config/config.php
- +1 −1 plugins/Login/config/config.php
- +2 −2 plugins/Login/config/test.php
- +2 −2 plugins/Login/tests/Integration/PasswordResetterTest.php
- +1 −1 plugins/MarketingCampaignsReporting
- +1 −1 plugins/Marketplace/config/config.php
- +1 −1 plugins/Marketplace/config/test.php
- +1 −1 plugins/Monolog/config/cli.php
- +9 −9 plugins/Monolog/config/config.php
- +1 −1 plugins/Monolog/config/tracker.php
- +3 −3 plugins/ScheduledReports/config/config.php
- +2 −2 .../ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php
- +2 −2 plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/HtmlReportEmailGeneratorTest.php
- +2 −2 plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php
- +1 −1 plugins/TagManager
- +2 −2 plugins/Tour/config/test.php
- +2 −2 plugins/TwoFactorAuth/config/test.php
- +2 −2 plugins/UsersManager/tests/Integration/APITest.php
- +6 −6 tests/PHPUnit/Fixtures/UITestFixture.php
- +1 −1 tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
- +5 −0 tests/PHPUnit/Framework/TestingEnvironmentVariables.php
- +18 −2 tests/PHPUnit/Framework/TestingEnvironmentVariablesDefinitionSource.php
- +2 −2 tests/PHPUnit/Framework/XssTesting.php
- +4 −4 tests/PHPUnit/Integration/ArchiveWebTest.php
- +1 −1 tests/PHPUnit/Integration/AssetManagerTest.php
- +1 −1 tests/PHPUnit/Integration/CronArchiveTest.php
- +1 −1 tests/PHPUnit/Integration/Period/FactoryTest.php
- +3 −3 tests/PHPUnit/Integration/SegmentTest.php
- +1 −1 tests/PHPUnit/Integration/Session/SessionAuthTest.php
- +8 −5 tests/PHPUnit/System/ConsoleTest.php
- +4 −4 tests/PHPUnit/System/ImportLogsTest.php
- +2 −2 tests/PHPUnit/proxy/piwik.php
@@ -0,0 +1,27 @@ | ||
<?php | ||
namespace DI; | ||
/** | ||
* This file aims to circumvent problems when updating to Matomo 4. | ||
* Matomo 4 includes a newer version of PHP-DI, which does not include \DI\object() any longer | ||
* To not run into any problems with plugins still using that we forward this method to \DI\autowire | ||
*/ | ||
if (!function_exists("\DI\object")) { | ||
function object() | ||
{ | ||
return call_user_func_array("\DI\autowire", func_get_args()); | ||
} | ||
} | ||
if (!function_exists("\DI\link")) { | ||
function link() | ||
{ | ||
return call_user_func_array("\DI\get", func_get_args()); | ||
} | ||
} |
Oops, something went wrong.