https://github.com/matomo-org/matomo/commit/3565da78bff718f201247fc2f692c0be29220fde - Mouve

Site d'origine

Permalink
Browse files

Updates php-di to 6.2.1 (#16311)

  • Loading branch information
sgiehl committed Sep 3, 2020
1 parent 21cafb0 commit 3565da78bff718f201247fc2f692c0be29220fde
Showing with 554 additions and 200 deletions.
  1. +4 −0 CHANGELOG.md
  2. +27 −0 DIObject.php
  3. +1 −1 composer.json
  4. +348 −63 composer.lock
  5. +4 −4 config/environment/dev.php
  6. +9 −9 config/environment/test.php
  7. +4 −4 config/environment/ui-test.php
  8. +10 −12 config/global.php
  9. +2 −2 core/CliMulti/RequestCommand.php
  10. +0 −2 core/Container/ContainerFactory.php
  11. +20 −4 core/Container/IniConfigDefinitionSource.php
  12. +1 −1 core/Container/StaticContainer.php
  13. +2 −2 core/ExceptionHandler.php
  14. +2 −0 core/bootstrap.php
  15. +1 −1 plugins/CoreAdminHome/tests/Integration/SetConfigTest.php
  16. +2 −2 plugins/CoreAdminHome/tests/Integration/TasksTest.php
  17. +1 −1 plugins/CoreConsole/tests/System/ArchiveCronTest.php
  18. +1 −1 plugins/CoreHome/config/config.php
  19. +2 −2 plugins/CorePluginsAdmin/config/test.php
  20. +1 −1 plugins/CoreUpdater/config/config.php
  21. +1 −1 plugins/CoreUpdater/tests/Fixtures/FailUpdateHttpsFixture.php
  22. +1 −1 plugins/CustomAlerts
  23. +2 −2 plugins/CustomJsTracker/tests/Integration/TrackerUpdaterTest.php
  24. +1 −1 plugins/DBStats/config/test.php
  25. +1 −1 plugins/DeviceDetectorCache
  26. +13 −13 plugins/Diagnostics/config/config.php
  27. +1 −1 plugins/Intl/config/config.php
  28. +1 −1 plugins/Login/config/config.php
  29. +2 −2 plugins/Login/config/test.php
  30. +2 −2 plugins/Login/tests/Integration/PasswordResetterTest.php
  31. +1 −1 plugins/MarketingCampaignsReporting
  32. +1 −1 plugins/Marketplace/config/config.php
  33. +1 −1 plugins/Marketplace/config/test.php
  34. +1 −1 plugins/Monolog/config/cli.php
  35. +9 −9 plugins/Monolog/config/config.php
  36. +1 −1 plugins/Monolog/config/tracker.php
  37. +3 −3 plugins/ScheduledReports/config/config.php
  38. +2 −2 .../ScheduledReports/tests/Integration/ReportEmailGenerator/AttachedFileReportEmailGeneratorTest.php
  39. +2 −2 plugins/ScheduledReports/tests/Integration/ReportEmailGenerator/HtmlReportEmailGeneratorTest.php
  40. +2 −2 plugins/ScheduledReports/tests/Integration/ReportEmailGeneratorTest.php
  41. +1 −1 plugins/TagManager
  42. +2 −2 plugins/Tour/config/test.php
  43. +2 −2 plugins/TwoFactorAuth/config/test.php
  44. +2 −2 plugins/UsersManager/tests/Integration/APITest.php
  45. +6 −6 tests/PHPUnit/Fixtures/UITestFixture.php
  46. +1 −1 tests/PHPUnit/Framework/TestingEnvironmentManipulator.php
  47. +5 −0 tests/PHPUnit/Framework/TestingEnvironmentVariables.php
  48. +18 −2 tests/PHPUnit/Framework/TestingEnvironmentVariablesDefinitionSource.php
  49. +2 −2 tests/PHPUnit/Framework/XssTesting.php
  50. +4 −4 tests/PHPUnit/Integration/ArchiveWebTest.php
  51. +1 −1 tests/PHPUnit/Integration/AssetManagerTest.php
  52. +1 −1 tests/PHPUnit/Integration/CronArchiveTest.php
  53. +1 −1 tests/PHPUnit/Integration/Period/FactoryTest.php
  54. +3 −3 tests/PHPUnit/Integration/SegmentTest.php
  55. +1 −1 tests/PHPUnit/Integration/Session/SessionAuthTest.php
  56. +8 −5 tests/PHPUnit/System/ConsoleTest.php
  57. +4 −4 tests/PHPUnit/System/ImportLogsTest.php
  58. +2 −2 tests/PHPUnit/proxy/piwik.php
@@ -143,6 +143,10 @@ These are only recommendations (because we will keep backward compatibility for
* The following dimensions have been removed and replaced with versions that measure seconds: visitor_days_since_first, visitor_days_since_last, visitor_days_since_order
* The _idvc, _idts, _viewts and _ects tracker parameters are no longer used, the values are calculated server side.
Note: tracking these values server side means replaying log data in the past will result in inaccurate values for these dimensions.
* The Dependency Injection library PHP-DI was updated. [Some definitions need to be updated]((https://php-di.org/doc/migration/6.0.html)):
* The Method `\DI\object()` has been removed. You can use `\DI\autowire()` or `\DI\create()` instead.
* The Method `\DI\link()` has been removed. Use `\DI\get()` instead.
* Defining global observer functions in config now requires the functions to be wrapped in `\DI\value()`, unless they are a factory.

## Matomo 3.14.0

@@ -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());
}

}
@@ -42,7 +42,7 @@
"monolog/monolog": "~1.11",
"mustangostang/spyc": "~0.6.0",
"pear/pear_exception": "~1.0.0",
"php-di/php-di": "^5.0.0",
"php-di/php-di": "^6.0.0",
"phpmailer/phpmailer": "^6.1",
"piwik/device-detector": "~3.0",
"psr/log": "~1.0",

0 comments on commit 3565da7

Please sign in to comment.

Raccourcis

Commandes

Fermer