From 5737745e41a0e5827c0d5237fc838c9738fe8b9a Mon Sep 17 00:00:00 2001 From: George Steel Date: Thu, 21 Nov 2024 22:12:24 +0000 Subject: [PATCH] Fix some minor psalm issues Signed-off-by: George Steel --- psalm-baseline.xml | 808 +++++++++++++++--------------- src/Collector/ConfigCollector.php | 8 +- src/Collector/DbCollector.php | 8 +- 3 files changed, 415 insertions(+), 409 deletions(-) diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 9dcab9d..a2ce1d9 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1,24 +1,24 @@ - + - serialize - unserialize + + - $data - $data - $data - $data - $data + + + + + - $data + - collect + @@ -26,130 +26,130 @@ getApplication()]]> - serialize - unserialize + + - collect + get('ApplicationConfig')]]> get('config')]]> - $serializable[$key] - $serializable[$key] - $serializable[$key] + + + - $key - $serializable[$key] - $unserialized[$key] - $value - $value + + + + + - getName - getPriority + + - static::NAME - static::PRIORITY + + - $value + - serialize - unserialize + + - collect + profiler->getQueryProfiles($mode)]]> - $query - $time + + - float|integer - self + + - getElapsedTime + getElapsedTime()]]> - $time + - getQueryProfiles + - getProfiler - getQueryTime - hasProfiler - setProfiler + + + + - $profiler + - Profiler - Profiler + + profiler]]> profiler]]> - null|Profiler - null|Profiler + + - collectEvent + - collect + getParam('exception')]]> - SerializableException - SerializableException - array - array - integer - integer - string - string - string - string + + + + + + + + + + - getCode - getCode - getFile - getFile - getMessage - getMessage - getPrevious - getPrevious - getPrevious - getPrevious - getPrevious - getPrevious - getTrace - getTrace + + + + + + + + + + + + + + data['exception']]]> @@ -164,26 +164,26 @@ data['exception']->getTrace()]]> - getCode - getException - getFile - getMessage - getPreviousCode - getPreviousException - getPreviousFile - getPreviousMessage - getPreviousTrace - getTrace - hasException - hasPreviousException + + + + + + + + + + + + - collect + - getMailsSend + @@ -191,15 +191,15 @@ data['event'])]]> - integer + - collect - collectEvent + + - $app - $app + + @@ -212,19 +212,19 @@ data['event'][$id]]]> - $result[$name] - $result[$name] + + - $app - $context - $name - $previous - $result[$name] + + + + + - integer + @@ -233,38 +233,41 @@ data['memory']]]> - $context + - getApplicationEventMemory - hasEventMemory + + data)]]> + + + - addChildrenToView - collect + + - $controller - $controller + + data['action']]]> - $controller - $var + + - array - string - string - string - string - string - string + + + + + + + data['action']]]> @@ -276,28 +279,28 @@ data['views']]]> - getActionName - getControllerName - getFullControllerName - getMethod - getOtherParameters - getRouteName - getStatusCode - getViews + + + + + + + + - getMethod - getStatusCode + + - collect - collectEvent + + - $app - $app + + @@ -310,25 +313,25 @@ data['event'][$id]]]> - $result[$index] - $result[$index] + + - $app - $context - $index - $previous - $result[$index] + + + + + - float - float - float + + + - get - get + + @@ -340,28 +343,31 @@ getRequest()->getServer()->get('REQUEST_TIME_FLOAT')]]> data['end'] - $this->data['start']]]> data['start']]]> - REQUEST_MICROTIME + - $context + - getApplicationEventTimes - getExecutionTime - getStartTime - hasEventTimes + + + + data)]]> + + + - getServer - getServer + + - IndexController + @@ -378,24 +384,24 @@ - integer + - $event + - ParameterMissingException + - serialize - unserialize + + @@ -412,17 +418,17 @@ - $entry + data]]> - $value + - array - integer - integer|string - self|null - string - string + + + + + + data['code']]]> @@ -433,12 +439,12 @@ data['trace']]]> - getCode - getFile - getLine - getPrevious - getTrace - getTraceAsString + + + + + + @@ -452,170 +458,170 @@ $collector]]> - attachShared - detachShared + + - $events + - (string) $identifier + - onCollected + - $event + - FirePhpListener + - onFinish + - onFinish + - $collector + - $collector - $profiler - $report + + + - addCollector - addError - collect - setErrorMode + + + + - $name + - onCollected + - $event + - $serviceLocator + - $cache[0] + - getModules - injectToolbar - onCollected + + + - $content + get('Content-Type')->getFieldValue()]]> getLoadedModules()]]> - $template - $template + + - $name + - $content - $entries[] - $entries[] - $entries[] - $errors[$name] - $headers - $moduleManager - $script - $style - $template - $template + + + + + + + + + + + - array + - get - getFieldValue - getLoadedModules - has - render - render - render - render - render - render + + + + + + + + + + - $script - $script - $script - $style - $style - $style + + + + + + listeners]]> - attach - getRequest - getResponse + + + - getLatestVersion + - Version + - getBody - getHeaders - isXmlHttpRequest + + + - MatchInterface + - $sm - $sm - $sm - $sm - $sm - $sm - $sm - $sm + + + + + + + + - static function ($sm) { + - onLoadModulesPost + - $config + getEventCollectors()]]> getEventIdentifiers()]]> getErrors()]]> getErrors()]]> - $sm - $sm + + get('Application')]]> get('Laminas\DeveloperTools\Config')]]> get('Laminas\DeveloperTools\Config')]]> @@ -634,109 +640,109 @@ - $adapter - $app - $config - $config - $config - $configuration - $em - $eventLoggingListener - $eventManager - $flushListener - $options - $profilerListener - $report - $sem - $sm - $toolbarListener + + + + + + + + + + + + + + + + - attach - attach - attach - attachShared - canFlushEarly - eventCollectionEnabled - get - get - get - get - get - get - get - get - get - get - get - get - get - get - get - get - get - get - getErrors - getErrors - getEventCollectors - getEventIdentifiers - getEventManager - getEventManager - getMergedConfig - getServiceManager - getSharedManager - has - hasErrors - hasErrors - isStrict - isStrict - isToolbarEnabled - isToolbarEnabled - trigger + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - $event + - getEventManager + - getEventManager + - ProfilingAdapter + - getApplication - getConfigListener + + - is_array($options) - is_array($options) + + - setCollectors - setEventCollectors - setEventIdentifiers - setEvents - setMatcher - setProfiler - setToolbar + + + + + + + - Options + - $value - $value - $value + + + - $options + events['collectors'][$name]]]> @@ -755,26 +761,26 @@ toolbar[$key][$collector]]]> - $collector - $collector - $collector - $identifier - $template - $value + + + + + + - array - array - array - array - array - bool - bool - bool - bool - bool - bool - string + + + + + + + + + + + + events['collectors']]]> @@ -794,31 +800,31 @@ toolbar[$key][$collector]]]> - canFlushEarly - eventCollectionEnabled - getEventCollectors - getEventIdentifiers - setEvents - setProfiler + + + + + + - is_array($options) - is_array($options) + + - ConfigCollector - DbCollector - ExceptionCollector - MemoryCollector - MemoryCollector - RequestCollector - TimeCollector - TimeCollector + + + + + + + + - self + getRequest()->getMethod()]]> @@ -826,21 +832,21 @@ getRequest()->getUriString()]]> - get + - addCollector - collect - setErrorMode + + + - $collectors - $event - $eventManager - $strict + + + + - $event + collectors)]]> @@ -848,16 +854,16 @@ event)]]> - getMethod - getServer - getUriString + + + - ApplicationInterface|null - ReportInterface - string + + + getParam('application')]]> @@ -865,26 +871,26 @@ getParam('report')]]> - getProfiler + - $errors - $ip - $method - $time - $token - $uri + + + + + + - $collector + - $collector + - getCollector + collectors[$name]]]> @@ -895,43 +901,43 @@ - getCollectorNames - getCollectors - getIp - getMethod - getTime - getToken - getUri - hasCollector - setCollectors + + + + + + + + + - self - self - self + + + - StorageInterface + - $entry + - $entry + - iDoNotExist + - testOnlyWhitelistedToolbarEntriesShouldBeEnabled + >]]> diff --git a/src/Collector/ConfigCollector.php b/src/Collector/ConfigCollector.php index c6a50ef..6741aee 100644 --- a/src/Collector/ConfigCollector.php +++ b/src/Collector/ConfigCollector.php @@ -122,11 +122,11 @@ public function __unserialize($data) * * @inheritDoc */ - public function unserialize($serialized) + public function unserialize($data) { - $data = unserialize($serialized); - assert(is_array($data)); - $this->__unserialize($data); + $values = unserialize($data); + assert(is_array($values)); + $this->__unserialize($values); } /** diff --git a/src/Collector/DbCollector.php b/src/Collector/DbCollector.php index 05d676f..d256299 100644 --- a/src/Collector/DbCollector.php +++ b/src/Collector/DbCollector.php @@ -166,10 +166,10 @@ public function __unserialize($data) * * @inheritDoc */ - public function unserialize($serialized) + public function unserialize($data) { - $data = unserialize($serialized); - assert(is_array($data)); - $this->__unserialize($data); + $values = unserialize($data); + assert(is_array($values)); + $this->__unserialize($values); } }