Resolve PHPStan issues

Author: bobvandevijver

src/BoltFormsConfig.php

@@ -14,7 +14,7 @@
 class BoltFormsConfig
 {
     private ?Collection $config = null;
-    private ?ExtensionInterface $extension = null;
+    private ?Extension $extension = null;
 
     public function __construct(
         private readonly ExtensionRegistry $registry,
@@ -44,7 +44,9 @@ public function getBoltConfig(): Config
     public function getExtension(): Extension
     {
         if ($this->extension === null) {
-            $this->extension = $this->registry->getExtension(Extension::class);
+          /** @var Extension $retrievedExtension */
+          $retrievedExtension = $this->registry->getExtension(Extension::class);
+          $this->extension = $retrievedExtension;
         }
 
         return $this->extension;

src/EventSubscriber/AbstractPersistSubscriber.php

@@ -23,7 +23,7 @@ public function handleSave(PostSubmitEvent $event): void
         $config = collect($event->getFormConfig()->get('database', false));
 
         // If content type is not configured, bail out.
-        if (! $config) {
+        if ($config->isEmpty()) {
             return;
         }
 

src/EventSubscriber/ContentTypePersister.php

@@ -12,6 +12,7 @@
 use Carbon\Carbon;
 use DateTimeInterface;
 use Doctrine\ORM\EntityManagerInterface;
+use http\Exception\RuntimeException;
 use Illuminate\Support\Collection;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\Form\FormInterface;
@@ -30,7 +31,7 @@ public function save(PostSubmitEvent $event, FormInterface $form, Collection $co
     {
         $config = collect($config->get('contenttype', []));
 
-        if (! $config) {
+      if ($config->isEmpty()) {
             return;
         }
 
@@ -48,7 +49,7 @@ public function save(PostSubmitEvent $event, FormInterface $form, Collection $co
     private function setContentData(Content $content, Collection $config): void
     {
         $content->setStatus($config->get('status', Statuses::PUBLISHED));
-        $contentType = $this->boltConfig->getContentType($config->get('name'));
+        $contentType = $this->boltConfig->getContentType($config->get('name')) ?? throw new RuntimeException('Content type not found');
         $content->setContentType($contentType->get('slug'));
         $content->setDefinition($contentType);
 
@@ -58,7 +59,7 @@ private function setContentData(Content $content, Collection $config): void
         }
     }
 
-    private function setContentFields(Content $content, Form $form, PostSubmitEvent $event, Collection $config): void
+    private function setContentFields(Content $content, FormInterface $form, PostSubmitEvent $event, Collection $config): void
     {
         $mapping = collect($config->get('field_map'));
 

src/EventSubscriber/DbTablePersister.php

@@ -30,7 +30,7 @@ public function save(PostSubmitEvent $event, FormInterface $form, Collection $co
     {
         $config = collect($config->get('table', []));
 
-        if (! $config) {
+        if ($config->isEmpty()) {
             return;
         }
 
@@ -87,7 +87,7 @@ private function saveToTable(string $table, array $fields): void
             ->setParameters($parameters);
 
         try {
-            $this->query->execute();
+            $this->query->executeQuery();
         } catch (Throwable $exception) {
             $this->log->error($exception->getMessage());
         }

src/EventSubscriber/Logger.php

@@ -14,7 +14,7 @@ class Logger implements EventSubscriberInterface
 {
     use LoggerTrait;
 
-    private ?PostSubmitEvent $event = null;
+    private PostSubmitEvent $event;
 
     public function handleEvent(PostSubmitEvent $event): void
     {

src/EventSubscriber/Mailer.php

@@ -17,7 +17,7 @@ class Mailer implements EventSubscriberInterface
 {
     use LoggerTrait;
 
-    private ?PostSubmitEvent $event = null;
+    private PostSubmitEvent $event;
 
     public function __construct(
         private readonly MailerInterface $mailer
@@ -62,7 +62,7 @@ public function buildEmail(): TemplatedEmail
         $email = (new EmailFactory())->create($this->event->getFormConfig(), $this->event->getConfig(), $this->event->getForm(), $meta);
 
         if ($this->event->isSpam()) {
-            $subject = Str::ensureStartsWith($email->getSubject(), '[SPAM] ');
+            $subject = Str::ensureStartsWith($email->getSubject() ?? '', '[SPAM] ');
             $email->subject($subject);
         }
 

src/EventSubscriber/Redirect.php

@@ -10,15 +10,16 @@
 use Illuminate\Support\Collection;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class Redirect implements EventSubscriberInterface
 {
     use LoggerTrait;
 
-    private ?PostSubmitEvent $event = null;
-    private ?Collection $formConfig = null;
-    private ?Collection $feedback = null;
+    private PostSubmitEvent $event;
+    private Collection $formConfig;
+    private Collection $feedback;
 
     public function handleEvent(PostSubmitEvent $event): void
     {
@@ -52,7 +53,7 @@ public function redirect(): void
         throw new HttpException(Response::HTTP_FOUND, '', null, []);
     }
 
-    protected function getRedirectResponse(array $redirect): ?RedirectResponse
+    protected function getRedirectResponse(array $redirect): RedirectResponse
     {
         $url = $this->makeUrl($redirect);
 

src/Extension.php

@@ -30,6 +30,7 @@ public function dump(mixed ...$moreVars): void
 
     public function install(): void
     {
+      /** @var string $projectDir */
         $projectDir = $this->getContainer()->getParameter('kernel.project_dir');
 
         $filesystem = new Filesystem();

src/Factory/EmailFactory.php

@@ -6,19 +6,18 @@
 
 use Bolt\Common\Str;
 use Illuminate\Support\Collection;
-use Sirius\Upload\Result\File;
 use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\Mime\Address;
 
 class EmailFactory
 {
-    private ?FormInterface $form = null;
-    private ?Collection $config = null;
-    private ?Collection $notification = null;
-    private ?Collection $formConfig = null;
+    private FormInterface $form;
+    private Collection $config;
+    private Collection $notification;
+    private Collection $formConfig;
 
-    /**
+  /**
      * @param Collection $formConfig The config specific for the current form
      * @param Collection $config The global config defined config/extensions/bolt-boltforms.yaml
      * @param FormInterface $form The form object
@@ -61,7 +60,6 @@ public function create(Collection $formConfig, Collection $config, FormInterface
         }
 
         foreach ($attachments as $name => $attachment) {
-            /** @var File $attachment */
             foreach ($attachment as $file) {
                 $email->attachFromPath($file, $name . '.' . pathinfo((string) $file, PATHINFO_EXTENSION));
             }

src/Factory/FieldConstraints.php

@@ -23,9 +23,9 @@ public static function get(string $formName, array $field): array
             $inputType = \gettype($item);
 
             if ($inputType === 'string') {
-                $class = static::getClassFromString($formName, $item);
+                $class = self::getClassFromString($formName, $item);
             } elseif ($inputType === 'array') {
-                $class = static::getClassFromArray($formName, $item);
+                $class = self::getClassFromArray($formName, $item);
             } else {
                 throw new RuntimeException(sprintf("Constraint for Field '%s' must be string or array. '%s' given.", $formName, $inputType));
             }
@@ -55,6 +55,6 @@ private static function getClassFromString(string $formName, string $input, arra
 
     private static function getClassFromArray(string $formName, array $input): object
     {
-        return self::getClassFromString($formName, key($input), current($input));
+        return self::getClassFromString($formName, (string)key($input), current($input));
     }
 }