diff --git a/preview_site.post_update.php b/preview_site.post_update.php
index a73e754..8cc8d04 100644
--- a/preview_site.post_update.php
+++ b/preview_site.post_update.php
@@ -2,7 +2,6 @@
 
 /**
  * @file
-<<<<<<< ours
  * Post update hooks for preview_site.
  */
 
diff --git a/src/Deploy/DeployPluginBase.php b/src/Deploy/DeployPluginBase.php
index 132afe9..47aa13f 100644
--- a/src/Deploy/DeployPluginBase.php
+++ b/src/Deploy/DeployPluginBase.php
@@ -56,7 +56,11 @@ abstract class DeployPluginBase extends PluginBase implements DeployPluginInterf
     // We provide an implementation here to prevent breaking BC under the 1:1
     // rule. But in reality any plugin that doesn't implement this is probably
     // not going to work.
-    @trigger_error('Deploy plugins are expected to implement \Drupal\preview_site\Deploy\DeployPluginInterface::deployFilePath', E_USER_DEPRECATED);
+    @trigger_error(
+    'The method \Drupal\preview_site\Deploy\DeployPluginInterface::deployFilePath is deprecated in Deploy plugins. It should be implemented.',
+    E_USER_DEPRECATED
+    );
+
   }
 
 }
diff --git a/src/EventSubscribers/AdditionalPathsEvent.php b/src/EventSubscribers/AdditionalPathsEvent.php
index b96e77e..5846e70 100644
--- a/src/EventSubscribers/AdditionalPathsEvent.php
+++ b/src/EventSubscribers/AdditionalPathsEvent.php
@@ -18,7 +18,7 @@ final class AdditionalPathsEvent extends Event {
   public function __construct(
     protected PreviewSiteBuildInterface $build,
     protected array $paths = [],
-  ) { }
+  ) {}
 
   /**
    * Gets additional paths.
diff --git a/src/Generate/FileCollection.php b/src/Generate/FileCollection.php
index f47a602..628e10e 100644
--- a/src/Generate/FileCollection.php
+++ b/src/Generate/FileCollection.php
@@ -10,6 +10,8 @@ use Drupal\file\FileInterface;
 class FileCollection implements \IteratorAggregate {
 
   /**
+   * The private files.
+   *
    * @var \Drupal\file\FileInterface[]
    */
   private $files = [];
diff --git a/src/Plugin/views/field/ItemLinks.php b/src/Plugin/views/field/ItemLinks.php
index d830567..bfde30b 100644
--- a/src/Plugin/views/field/ItemLinks.php
+++ b/src/Plugin/views/field/ItemLinks.php
@@ -20,7 +20,6 @@ final class ItemLinks extends FieldPluginBase {
 
   public const PLUGIN_ID = 'preview_site_item_links';
 
-
   /**
    * {@inheritdoc}
    */
diff --git a/src/PreviewSiteCache.php b/src/PreviewSiteCache.php
index ee63b48..0166f97 100644
--- a/src/PreviewSiteCache.php
+++ b/src/PreviewSiteCache.php
@@ -19,7 +19,18 @@ use Symfony\Component\HttpFoundation\Response;
  */
 final class PreviewSiteCache extends StaticCache {
 
+  /**
+   * Description of what this variable represents.
+   *
+   * @var \Drupal\tome_static\StaticCacheInterface
+   */
   private StaticCacheInterface $inner;
+
+  /**
+   * Description of what this variable represents.
+   *
+   * @var \Symfony\Component\HttpFoundation\RequestStack
+   */
   private RequestStack $requestStack;
 
   /**
diff --git a/tests/src/Kernel/PreviewSiteBuilderTest.php b/tests/src/Kernel/PreviewSiteBuilderTest.php
index 8416a2f..81199cd 100644
--- a/tests/src/Kernel/PreviewSiteBuilderTest.php
+++ b/tests/src/Kernel/PreviewSiteBuilderTest.php
@@ -202,7 +202,11 @@ class PreviewSiteBuilderTest extends PreviewSiteKernelTestBase {
       ],
       [[PreviewSiteBuilder::class, 'operationQueueGenerate'], [$build->id()]],
       [[PreviewSiteBuilder::class, 'operationProcessGenerate'], [$build->id()]],
-      [[PreviewSiteBuilder::class, 'operationQueueAdditionalPaths'], [$build->id()]],
+      [
+      [PreviewSiteBuilder::class, 'operationQueueAdditionalPaths'],
+      [$build->id()],
+      ],
+
       [[PreviewSiteBuilder::class, 'operationProcessAssets'], [$build->id()]],
       [[PreviewSiteBuilder::class, 'operationQueueDeploy'], [$build->id()]],
       [[PreviewSiteBuilder::class, 'operationProcessDeploy'], [$build->id()]],
@@ -285,7 +289,7 @@ class PreviewSiteBuilderTest extends PreviewSiteKernelTestBase {
         EntityTest::create(),
       ],
       'artifacts' => NULL,
-      'additional_paths' => ['internal:/core/misc/favicon.ico']
+      'additional_paths' => ['internal:/core/misc/favicon.ico'],
     ]);
     $assert_queue = \Drupal::queue('preview_site_assets:' . $build->id());
     $this->assertEquals(0, $assert_queue->numberOfItems());
diff --git a/tests/src/Traits/PreviewSiteTestTrait.php b/tests/src/Traits/PreviewSiteTestTrait.php
index 5c8afd7..fd06002 100644
--- a/tests/src/Traits/PreviewSiteTestTrait.php
+++ b/tests/src/Traits/PreviewSiteTestTrait.php
@@ -156,9 +156,9 @@ trait PreviewSiteTestTrait {
     ];
     $clean_batch = function (array $context) {
       return [
-          'finished' => 1,
-          'sandbox' => [],
-        ] + $context;
+        'finished' => 1,
+        'sandbox' => [],
+      ] + $context;
     };
     PreviewSiteBuilder::operationMarkDeploymentStarted($build->id(), $context);
     PreviewSiteBuilder::operationQueueGenerate($build->id());