fix some baselined psalm errors

Signed-off-by: Gary Lockett <[email protected]>
laminas · Sep 12, 2022 · 33080b2 · 33080b2
1 parent 81bae82
commit 33080b2
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 38 deletions.
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -386,12 +386,6 @@
       <code>$this-&gt;data['previous']</code>
       <code>$this-&gt;data['trace']</code>
     </MixedReturnStatement>
-    <PropertyNotSetInConstructor occurrences="1">
-      <code>$data</code>
-    </PropertyNotSetInConstructor>
-    <UndefinedDocblockClass occurrences="1">
-      <code>Exception|Throwable</code>
-    </UndefinedDocblockClass>
   </file>
   <file src="src/Listener/EventLoggingListenerAggregate.php">
     <InvalidPropertyAssignmentValue occurrences="1"/>
@@ -558,7 +552,6 @@
       <code>$config['laminas-developer-tools']</code>
       <code>$configuration['laminas-developer-tools']['profiler']</code>
     </MixedArrayAccess>
-    <MixedArrayOffset occurrences="1"/>
     <MixedAssignment occurrences="16">
       <code>$adapter</code>
       <code>$app</code>
@@ -629,13 +622,8 @@
     <PossiblyNullReference occurrences="1">
       <code>getEventManager</code>
     </PossiblyNullReference>
-    <UndefinedClass occurrences="6">
-      <code>EventLoggingListenerAggregate</code>
-      <code>ProfilerListener</code>
+    <UndefinedClass occurrences="1">
       <code>ProfilingAdapter</code>
-      <code>ToolbarListener</code>
-      <code>\ZendDeveloperTools\Profiler</code>
-      <code>\ZendDeveloperTools\Report</code>
     </UndefinedClass>
     <UndefinedInterfaceMethod occurrences="2">
       <code>getApplication</code>

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -4,6 +4,8 @@
 
 namespace Laminas\DeveloperTools\Exception;
 
-interface ExceptionInterface
+use Throwable;
+
+interface ExceptionInterface extends Throwable
 {
 }
diff --git a/src/Exception/SerializableException.php b/src/Exception/SerializableException.php
@@ -31,17 +31,18 @@ class SerializableException implements Serializable
     /**
      * Saves the exception data in an array.
      *
-     * @param Exception|Throwable $exception
+     * @param Throwable $exception
      */
     public function __construct($exception)
     {
+        $previous   = $exception->getPrevious();
         $this->data = [
             'code'     => $exception->getCode(),
             'file'     => $exception->getFile(),
             'line'     => $exception->getLine(),
             'class'    => get_class($exception),
             'message'  => $exception->getMessage(),
-            'previous' => $exception->getPrevious() ? new self($exception->getPrevious()) : null,
+            'previous' => $previous !== null ? new self($previous) : null,
             'trace'    => $this->filterTrace(
                 $exception->getTrace(),
                 $exception->getFile(),

diff --git a/src/Module.php b/src/Module.php
@@ -5,7 +5,6 @@
 namespace Laminas\DeveloperTools;
 
 use BjyProfiler\Db\Adapter\ProfilingAdapter;
-use Laminas\DeveloperTools\ReportInterface;
 use Laminas\EventManager\EventInterface;
 use Laminas\ModuleManager\Feature\BootstrapListenerInterface;
 use Laminas\ModuleManager\Feature\ConfigProviderInterface;
@@ -14,9 +13,6 @@
 use Laminas\ModuleManager\Feature\ViewHelperProviderInterface;
 use Laminas\ModuleManager\ModuleEvent;
 use Laminas\ModuleManager\ModuleManagerInterface;
-use ZendDeveloperTools\Listener\EventLoggingListenerAggregate;
-use ZendDeveloperTools\Listener\ProfilerListener;
-use ZendDeveloperTools\Listener\ToolbarListener;
 
 use function array_map;
 use function define;
@@ -160,24 +156,25 @@ public function getServiceConfig()
                 ReportInterface::class => Report::class,
 
                 // Legacy Zend Framework aliases
-                'ZendDeveloperTools\ReportInterface'    => ReportInterface::class,
-                \ZendDeveloperTools\Report::class       => Report::class,
-                'ZendDeveloperTools\ExceptionCollector' => 'Laminas\DeveloperTools\ExceptionCollector',
-                'ZendDeveloperTools\RequestCollector'   => 'Laminas\DeveloperTools\RequestCollector',
-                'ZendDeveloperTools\ConfigCollector'    => 'Laminas\DeveloperTools\ConfigCollector',
-                'ZendDeveloperTools\MailCollector'      => 'Laminas\DeveloperTools\MailCollector',
-                'ZendDeveloperTools\MemoryCollector'    => 'Laminas\DeveloperTools\MemoryCollector',
-                'ZendDeveloperTools\TimeCollector'      => 'Laminas\DeveloperTools\TimeCollector',
-                'ZendDeveloperTools\FlushListener'      => 'Laminas\DeveloperTools\FlushListener',
-                \ZendDeveloperTools\Profiler::class     => Profiler::class,
-                'ZendDeveloperTools\Config'             => 'Laminas\DeveloperTools\Config',
-                'ZendDeveloperTools\Event'              => 'Laminas\DeveloperTools\Event',
-                'ZendDeveloperTools\StorageListener'    => 'Laminas\DeveloperTools\StorageListener',
-                ToolbarListener::class                  => Listener\ToolbarListener::class,
-                ProfilerListener::class                 => Listener\ProfilerListener::class,
-                EventLoggingListenerAggregate::class
-                    => Listener\EventLoggingListenerAggregate::class,
-                'ZendDeveloperTools\DbCollector' => 'Laminas\DeveloperTools\DbCollector',
+                /** phpcs:disable Generic.Files.LineLength */
+                'ZendDeveloperTools\ReportInterface'                        => ReportInterface::class,
+                'ZendDeveloperTools\Report'                                 => Report::class,
+                'ZendDeveloperTools\ExceptionCollector'                     => 'Laminas\DeveloperTools\ExceptionCollector',
+                'ZendDeveloperTools\RequestCollector'                       => 'Laminas\DeveloperTools\RequestCollector',
+                'ZendDeveloperTools\ConfigCollector'                        => 'Laminas\DeveloperTools\ConfigCollector',
+                'ZendDeveloperTools\MailCollector'                          => 'Laminas\DeveloperTools\MailCollector',
+                'ZendDeveloperTools\MemoryCollector'                        => 'Laminas\DeveloperTools\MemoryCollector',
+                'ZendDeveloperTools\TimeCollector'                          => 'Laminas\DeveloperTools\TimeCollector',
+                'ZendDeveloperTools\FlushListener'                          => 'Laminas\DeveloperTools\FlushListener',
+                'ZendDeveloperTools\Profiler'                               => Profiler::class,
+                'ZendDeveloperTools\Config'                                 => 'Laminas\DeveloperTools\Config',
+                'ZendDeveloperTools\Event'                                  => 'Laminas\DeveloperTools\Event',
+                'ZendDeveloperTools\StorageListener'                        => 'Laminas\DeveloperTools\StorageListener',
+                'ZendDeveloperTools\Listener\ToolbarListener'               => Listener\ToolbarListener::class,
+                'ZendDeveloperTools\Listener\ProfilerListener'              => Listener\ProfilerListener::class,
+                'ZendDeveloperTools\Listener\EventLoggingListenerAggregate' => Listener\EventLoggingListenerAggregate::class,
+                'ZendDeveloperTools\DbCollector'                            => 'Laminas\DeveloperTools\DbCollector',
+                /** phpcs:enable Generic.Files.LineLength */
             ],
             'invokables' => [
                 Report::class                               => Report::class,