|
15 | 15 | 'GoogleAnalyticsImporter.logToSingleFile' => \false, |
16 | 16 | 'GoogleAnalyticsImporter.isClientConfigurable' => \true, |
17 | 17 | 'log.processors' => \Piwik\DI::decorate(function ($previous, Container $container) { |
18 | | - $idSite = (int)\getenv('MATOMO_GA_IMPORTER_LOG_TO_SINGLE_FILE'); |
| 18 | + $idSite = (int) \getenv('MATOMO_GA_IMPORTER_LOG_TO_SINGLE_FILE'); |
19 | 19 | if (!empty($idSite)) { |
20 | 20 | $previous[] = new \Piwik\Plugins\GoogleAnalyticsImporter\Logger\LogToSingleFileProcessor($idSite); |
21 | 21 | } |
22 | 22 | return $previous; |
23 | 23 | }), |
24 | | - 'GoogleAnalyticsImporter.googleClientClass' => 'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\Client', 'GoogleAnalyticsImporter.proxyHttpClient' => function (Container $c) { |
| 24 | + 'GoogleAnalyticsImporter.googleClientClass' => 'Matomo\\Dependencies\\GoogleAnalyticsImporter\\Google\\Client', |
| 25 | + 'GoogleAnalyticsImporter.proxyHttpClient' => function (Container $c) { |
25 | 26 | $proxyHost = Config::getInstance()->proxy['host']; |
26 | 27 | if ($proxyHost) { |
27 | 28 | $proxyPort = Config::getInstance()->proxy['port']; |
|
40 | 41 | ]); |
41 | 42 | } |
42 | 43 | return null; |
43 | | - },'GoogleAnalyticsImporter.googleClient' => function (Container $c) { |
| 44 | + }, |
| 45 | + 'GoogleAnalyticsImporter.googleClient' => function (Container $c) { |
44 | 46 | $klass = $c->get('GoogleAnalyticsImporter.googleClientClass'); |
45 | 47 | /** @var \Matomo\Dependencies\GoogleAnalyticsImporter\Google\Client $googleClient */ |
46 | 48 | $googleClient = new $klass(); |
|
76 | 78 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\UserLanguage\RecordImporter::class, |
77 | 79 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitorInterest\RecordImporter::class, |
78 | 80 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitTime\RecordImporter::class, |
79 | | - \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitFrequency\RecordImporter::class,], |
| 81 | + \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitFrequency\RecordImporter::class, |
| 82 | + ], |
80 | 83 | 'GoogleAnalyticsGA4Importer.clientConfiguration' => function (Container $c) { |
81 | 84 | $config = @\json_decode(Option::get(AuthorizationGA4::CLIENT_CONFIG_OPTION_NAME), \true); |
82 | 85 | $accessToken = @\json_decode(Option::get(AuthorizationGA4::ACCESS_TOKEN_OPTION_NAME), \true); |
|
88 | 91 | ]; |
89 | 92 | }, |
90 | 93 | 'GoogleAnalyticsGA4Importer.recordImporters' => [ |
91 | | - \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitsSummary\RecordImporterGA4::class, // must be first |
| 94 | + \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitsSummary\RecordImporterGA4::class, |
| 95 | + // must be first |
92 | 96 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\MarketingCampaignsReporting\RecordImporterGA4::class, |
93 | 97 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\Referrers\RecordImporterGA4::class, |
94 | 98 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\Actions\RecordImporterGA4::class, |
|
103 | 107 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitorInterest\RecordImporterGA4::class, |
104 | 108 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitTime\RecordImporterGA4::class, |
105 | 109 | \Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitFrequency\RecordImporterGA4::class, |
106 | | - ], |
| 110 | + ], |
107 | 111 | 'diagnostics.optional' => \Piwik\DI::add([ |
108 | | - \Piwik\DI::get(\Piwik\Plugins\GoogleAnalyticsImporter\Diagnostic\RequiredFunctionsCheck::class), |
109 | | - \Piwik\DI::get(\Piwik\Plugins\GoogleAnalyticsImporter\Diagnostic\RequiredExecutablesCheck::class) |
110 | | - ]), |
111 | | - '\\Piwik\\Plugins\\GoogleAnalyticsImporter\\ApiQuotaHelper' => \Piwik\DI::create('\\Piwik\\Plugins\\GoogleAnalyticsImporter\\ApiQuotaHelper')]; |
| 112 | + \Piwik\DI::get(\Piwik\Plugins\GoogleAnalyticsImporter\Diagnostic\RequiredFunctionsCheck::class), |
| 113 | + \Piwik\DI::get(\Piwik\Plugins\GoogleAnalyticsImporter\Diagnostic\RequiredExecutablesCheck::class) |
| 114 | + ]), |
| 115 | + '\\Piwik\\Plugins\\GoogleAnalyticsImporter\\ApiQuotaHelper' => \Piwik\DI::create('\\Piwik\\Plugins\\GoogleAnalyticsImporter\\ApiQuotaHelper') |
| 116 | +]; |
0 commit comments