Skip to content

Commit 587cae5

Browse files
committed
Cleaning up a little while making sure changes are still correct after merge
1 parent 2eebfe9 commit 587cae5

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

config/config.php

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
'GoogleAnalyticsImporter.logToSingleFile' => \false,
1616
'GoogleAnalyticsImporter.isClientConfigurable' => \true,
1717
'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');
1919
if (!empty($idSite)) {
2020
$previous[] = new \Piwik\Plugins\GoogleAnalyticsImporter\Logger\LogToSingleFileProcessor($idSite);
2121
}
2222
return $previous;
2323
}),
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) {
2526
$proxyHost = Config::getInstance()->proxy['host'];
2627
if ($proxyHost) {
2728
$proxyPort = Config::getInstance()->proxy['port'];
@@ -40,7 +41,8 @@
4041
]);
4142
}
4243
return null;
43-
},'GoogleAnalyticsImporter.googleClient' => function (Container $c) {
44+
},
45+
'GoogleAnalyticsImporter.googleClient' => function (Container $c) {
4446
$klass = $c->get('GoogleAnalyticsImporter.googleClientClass');
4547
/** @var \Matomo\Dependencies\GoogleAnalyticsImporter\Google\Client $googleClient */
4648
$googleClient = new $klass();
@@ -76,7 +78,8 @@
7678
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\UserLanguage\RecordImporter::class,
7779
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitorInterest\RecordImporter::class,
7880
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitTime\RecordImporter::class,
79-
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitFrequency\RecordImporter::class,],
81+
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitFrequency\RecordImporter::class,
82+
],
8083
'GoogleAnalyticsGA4Importer.clientConfiguration' => function (Container $c) {
8184
$config = @\json_decode(Option::get(AuthorizationGA4::CLIENT_CONFIG_OPTION_NAME), \true);
8285
$accessToken = @\json_decode(Option::get(AuthorizationGA4::ACCESS_TOKEN_OPTION_NAME), \true);
@@ -88,7 +91,8 @@
8891
];
8992
},
9093
'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
9296
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\MarketingCampaignsReporting\RecordImporterGA4::class,
9397
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\Referrers\RecordImporterGA4::class,
9498
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\Actions\RecordImporterGA4::class,
@@ -103,9 +107,10 @@
103107
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitorInterest\RecordImporterGA4::class,
104108
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitTime\RecordImporterGA4::class,
105109
\Piwik\Plugins\GoogleAnalyticsImporter\Importers\VisitFrequency\RecordImporterGA4::class,
106-
],
110+
],
107111
'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

Comments
 (0)