diff options
| author | Stefan Giehl <stefan@matomo.org> | 2022-09-07 12:23:11 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-07 12:23:11 +0300 |
| commit | b4eacdd27dfd94e75cefc138127d9aab97b5add3 (patch) | |
| tree | bd93e3456823378cf05222d27356fbac42973911 | |
| parent | 507bdff0051582ace53eddbbfdab0ff86df4992e (diff) | |
Fix couple of PHP8.2 deprecation warnings (#19690)
| -rw-r--r-- | core/AssetManager/UIAssetMerger.php | 5 | ||||
| -rw-r--r-- | core/Cookie.php | 5 | ||||
| -rw-r--r-- | plugins/CustomDimensions/Dimension/CustomActionDimension.php | 3 | ||||
| -rw-r--r-- | plugins/CustomDimensions/GetCustomDimension.php | 2 |
4 files changed, 13 insertions, 2 deletions
diff --git a/core/AssetManager/UIAssetMerger.php b/core/AssetManager/UIAssetMerger.php index fdd9a4ed12..aece1b3716 100644 --- a/core/AssetManager/UIAssetMerger.php +++ b/core/AssetManager/UIAssetMerger.php @@ -32,6 +32,11 @@ abstract class UIAssetMerger protected $cacheBuster; /** + * @var string + */ + protected $cacheBusterValue; + + /** * @param UIAsset $mergedAsset * @param UIAssetFetcher $assetFetcher * @param UIAssetCacheBuster $cacheBuster diff --git a/core/Cookie.php b/core/Cookie.php index e5ec99916f..10dadde803 100644 --- a/core/Cookie.php +++ b/core/Cookie.php @@ -44,6 +44,11 @@ class Cookie protected $path = ''; /** + * @var string + */ + protected $keyStore = false; + + /** * Restrict cookie to a domain (or subdomains) * @var string */ diff --git a/plugins/CustomDimensions/Dimension/CustomActionDimension.php b/plugins/CustomDimensions/Dimension/CustomActionDimension.php index 02ea214842..4f9263efac 100644 --- a/plugins/CustomDimensions/Dimension/CustomActionDimension.php +++ b/plugins/CustomDimensions/Dimension/CustomActionDimension.php @@ -17,6 +17,9 @@ use Piwik\Plugins\CustomDimensions\Tracker\CustomDimensionsRequestProcessor; */ class CustomActionDimension extends ActionDimension { + protected $idDimension = null; + protected $actualName = null; + public function __construct($column, $name, $idDimension) { $this->columnName = $column; diff --git a/plugins/CustomDimensions/GetCustomDimension.php b/plugins/CustomDimensions/GetCustomDimension.php index 709cb3848d..7c230e612a 100644 --- a/plugins/CustomDimensions/GetCustomDimension.php +++ b/plugins/CustomDimensions/GetCustomDimension.php @@ -198,8 +198,6 @@ class GetCustomDimension extends Report public function initThisReportFromDimension($dimension) { $this->name = $dimension['name']; - $this->menuTitle = $this->name; - $this->widgetTitle = $this->name; $this->scopeOfDimension = $dimension['scope']; $this->subcategoryId = 'customdimension' . $dimension['idcustomdimension']; $dimensionField = CustomDimensionsRequestProcessor::buildCustomDimensionTrackingApiName($dimension); |