diff options
author | Stefan Giehl <stefan@matomo.org> | 2022-11-09 11:12:57 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-09 11:12:57 +0300 |
commit | dcf67850edaba1408ce4973196643b6506473379 (patch) | |
tree | 7c366b2668798f70a8220771b62522bd86a42f2d | |
parent | 57b33215b7c5b455468da65f370fefd2d13beed2 (diff) |
Fix PHP8.2 deprecation messages (#19918)
* Fix PHP8.2 deprecation messages
* fix another deprecation
* fixes another deprecation
-rw-r--r-- | core/ArchiveProcessor/Loader.php | 4 | ||||
-rw-r--r-- | core/Concurrency/Lock.php | 1 | ||||
-rw-r--r-- | core/Segment/SegmentExpression.php | 12 | ||||
-rw-r--r-- | plugins/PrivacyManager/DoNotTrackHeaderChecker.php | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/core/ArchiveProcessor/Loader.php b/core/ArchiveProcessor/Loader.php index 00d834a8eb..961426b811 100644 --- a/core/ArchiveProcessor/Loader.php +++ b/core/ArchiveProcessor/Loader.php @@ -63,6 +63,10 @@ class Loader */ private $dataAccessModel; + /** + * @var bool + */ + private $invalidateBeforeArchiving; public function __construct(Parameters $params, $invalidateBeforeArchiving = false) { diff --git a/core/Concurrency/Lock.php b/core/Concurrency/Lock.php index 9d3f72e1d1..42300ff784 100644 --- a/core/Concurrency/Lock.php +++ b/core/Concurrency/Lock.php @@ -92,7 +92,6 @@ class Lock $locked = $this->backend->setIfNotExists($this->lockKey, $lockValue, $ttlInSeconds); if ($locked) { $this->lockValue = $lockValue; - $this->ttlUsed = $ttlInSeconds; $this->lastExpireTime = Date::getNowTimestamp(); } diff --git a/core/Segment/SegmentExpression.php b/core/Segment/SegmentExpression.php index 8e9462a708..93bb958a5b 100644 --- a/core/Segment/SegmentExpression.php +++ b/core/Segment/SegmentExpression.php @@ -54,6 +54,12 @@ class SegmentExpression const SQL_WHERE_DO_NOT_MATCH_ANY_ROW = "(1 = 0)"; const SQL_WHERE_MATCHES_ALL_ROWS = "(1 = 1)"; + protected $string; + protected $joins = []; + protected $valuesBind = []; + protected $tree = []; + protected $parsedSubExpressions = []; + public function __construct($string) { $this->string = $string; @@ -70,10 +76,6 @@ class SegmentExpression return count($this->tree) == 0; } - protected $joins = array(); - protected $valuesBind = array(); - protected $tree = array(); - protected $parsedSubExpressions = array(); public function getSubExpressionCount() { @@ -397,7 +399,7 @@ class SegmentExpression if (false !== strpos($str, '_')) { $str = str_replace("_", "\_", $str); } - + return $str; } diff --git a/plugins/PrivacyManager/DoNotTrackHeaderChecker.php b/plugins/PrivacyManager/DoNotTrackHeaderChecker.php index 123654f05d..1591976e8e 100644 --- a/plugins/PrivacyManager/DoNotTrackHeaderChecker.php +++ b/plugins/PrivacyManager/DoNotTrackHeaderChecker.php @@ -21,6 +21,8 @@ use Piwik\Tracker\IgnoreCookie; */ class DoNotTrackHeaderChecker { + protected $config; + /** * @param Config $config */ |