Update tools

phpunit.xml.dist

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.0/phpunit.xsd" cacheDirectory=".phpunit.cache">
-  <coverage>
-    <include>
-      <directory suffix=".php">./src/</directory>
-    </include>
-  </coverage>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" colors="true" processIsolation="false" stopOnFailure="false" bootstrap="tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache">
+  <coverage/>
   <php>
     <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0"/>
   </php>
@@ -13,4 +9,9 @@
       <directory>./tests/</directory>
     </testsuite>
   </testsuites>
+  <source>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </source>
 </phpunit>

psalm-baseline.xml

@@ -1,2 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="3.14.2@3538fe1955d47f6ee926c0769d71af6db08aa488"/>
+<files psalm-version="5.16.0@2897ba636551a8cb61601cc26f6ccfbba6c36591">
+  <file src="src/DependencyInjection/Configuration.php">
+    <UndefinedMethod>
+      <code>children</code>
+    </UndefinedMethod>
+  </file>
+</files>

src/Exception/PdfException.php

@@ -13,6 +13,4 @@
 
 use Exception;
 
-final class PdfException extends Exception
-{
-}
+final class PdfException extends Exception {}

src/NucleosDompdfBundle.php

@@ -13,6 +13,4 @@
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-final class NucleosDompdfBundle extends Bundle
-{
-}
+final class NucleosDompdfBundle extends Bundle {}

src/Resources/config/services.php

@@ -42,6 +42,5 @@
             ->args([
                 new Parameter('nucleos_dompdf.options'),
             ])
-
     ;
 };

tests/BundleIntegrationTest.php

@@ -28,6 +28,6 @@ public function testStartup(): void
 
         $client->request('GET', '/test');
 
-        static::assertSame(200, $client->getResponse()->getStatusCode());
+        self::assertSame(200, $client->getResponse()->getStatusCode());
     }
 }

tests/DependencyInjection/ConfigurationTest.php

@@ -30,7 +30,7 @@ public function testDefaultOptions(): void
             ],
         ];
 
-        static::assertSame($expected, $config);
+        self::assertSame($expected, $config);
     }
 
     public function testOptions(): void
@@ -51,6 +51,6 @@ public function testOptions(): void
             ],
         ];
 
-        static::assertSame($expected, $config);
+        self::assertSame($expected, $config);
     }
 }

tests/Event/OutputEventTest.php

@@ -20,13 +20,14 @@ final class OutputEventTest extends TestCase
     public function testEvent(): void
     {
         $dompdf = $this->createMock(Dompdf::class);
+
         /** @noinspection HtmlRequiredAltAttribute */
         /** @noinspection HtmlUnknownTarget */
         $html = "<h1>Foo</h1>Bar <b>baz</b><img src='img/foo'>";
 
         $event = new OutputEvent($dompdf, $html);
 
-        static::assertSame($dompdf, $event->getPdf());
-        static::assertSame($html, $event->getHtml());
+        self::assertSame($dompdf, $event->getPdf());
+        self::assertSame($html, $event->getHtml());
     }
 }

tests/Event/StreamEventTest.php

@@ -21,14 +21,15 @@ public function testEvent(): void
     {
         $dompdf   = $this->createMock(Dompdf::class);
         $filename = 'file.pdf';
+
         /** @noinspection HtmlRequiredAltAttribute */
         /** @noinspection HtmlUnknownTarget */
         $html = "<h1>Foo</h1>Bar <b>baz</b><img src='img/foo'>";
 
         $event = new StreamEvent($dompdf, $filename, $html);
 
-        static::assertSame($dompdf, $event->getPdf());
-        static::assertSame($filename, $event->getFilename());
-        static::assertSame($html, $event->getHtml());
+        self::assertSame($dompdf, $event->getPdf());
+        self::assertSame($filename, $event->getFilename());
+        self::assertSame($html, $event->getHtml());
     }
 }

tests/Factory/DompdfFactoryTest.php

@@ -31,7 +31,7 @@ public function testCreate(): void
 
         $options = $dompdf->getOptions();
 
-        static::assertSame(100, $options->getDpi());
+        self::assertSame(100, $options->getDpi());
     }
 
     public function testCreateWithOptions(): void
@@ -43,7 +43,7 @@ public function testCreateWithOptions(): void
 
         $options = $dompdf->getOptions();
 
-        static::assertSame('foo', $options->getTempDir());
-        static::assertSame(200, $options->getDpi());
+        self::assertSame('foo', $options->getTempDir());
+        self::assertSame(200, $options->getDpi());
     }
 }

tests/Wrapper/DompdfWrapperTest.php

@@ -22,13 +22,13 @@
 
 final class DompdfWrapperTest extends TestCase
 {
-    private MockObject&DompdfFactoryInterface $dompdfFactory;
+    private DompdfFactoryInterface&MockObject $dompdfFactory;
 
-    private MockObject&EventDispatcherInterface $eventDispatcher;
+    private EventDispatcherInterface&MockObject $eventDispatcher;
 
     private DompdfWrapper $dompdfWrapper;
 
-    private MockObject&Dompdf $dompdf;
+    private Dompdf&MockObject $dompdf;
 
     protected function setUp(): void
     {
@@ -49,21 +49,21 @@ public function testStreamHtml(): void
             ->willReturn($this->dompdf)
         ;
 
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('loadHtml')
-            ->with(static::equalTo($input))
+            ->with(self::equalTo($input))
         ;
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('render')
         ;
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('stream')
-            ->with(static::equalTo('file.pdf'))
+            ->with(self::equalTo('file.pdf'))
         ;
 
-        $this->eventDispatcher->expects(static::once())
+        $this->eventDispatcher->expects(self::once())
             ->method('dispatch')
-            ->with(static::anything(), static::equalTo(DompdfEvents::STREAM))
+            ->with(self::anything(), self::equalTo(DompdfEvents::STREAM))
         ;
 
         $this->dompdfWrapper->streamHtml($input, 'file.pdf');
@@ -74,31 +74,32 @@ public function testStreamHtmlWithImg(): void
         /** @noinspection HtmlRequiredAltAttribute */
         /** @noinspection HtmlUnknownTarget */
         $input  = "<h1>Foo</h1>Bar <b>baz</b><img src='img/foo'>";
+
         /** @noinspection HtmlRequiredAltAttribute */
         /** @noinspection HtmlUnknownTarget */
         $output = "<h1>Foo</h1>Bar <b>baz</b><img src='img/foo'>";
 
         $this->dompdfFactory
             ->method('create')
-            ->with(static::equalTo(['tempDir' => 'bar']))
+            ->with(self::equalTo(['tempDir' => 'bar']))
             ->willReturn($this->dompdf)
         ;
 
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('loadHtml')
-            ->with(static::equalTo($output))
+            ->with(self::equalTo($output))
         ;
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('render')
         ;
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('stream')
-            ->with(static::equalTo('file.pdf'))
+            ->with(self::equalTo('file.pdf'))
         ;
 
-        $this->eventDispatcher->expects(static::once())
+        $this->eventDispatcher->expects(self::once())
             ->method('dispatch')
-            ->with(static::anything(), static::equalTo(DompdfEvents::STREAM))
+            ->with(self::anything(), self::equalTo(DompdfEvents::STREAM))
         ;
 
         $this->dompdfWrapper->streamHtml($input, 'file.pdf', ['tempDir' => 'bar']);
@@ -112,9 +113,9 @@ public function testGetPdf(): void
 
         $this->prepareOutput($input, 'BINARY_CONTENT');
 
-        $this->eventDispatcher->expects(static::once())
+        $this->eventDispatcher->expects(self::once())
             ->method('dispatch')
-            ->with(static::anything(), static::equalTo(DompdfEvents::OUTPUT))
+            ->with(self::anything(), self::equalTo(DompdfEvents::OUTPUT))
         ;
 
         $this->dompdfWrapper->getPdf($input, ['tempDir' => 'bar']);
@@ -128,9 +129,9 @@ public function testGetPdfWithError(): void
 
         $this->prepareOutput($input);
 
-        $this->eventDispatcher->expects(static::once())
+        $this->eventDispatcher->expects(self::once())
             ->method('dispatch')
-            ->with(static::anything(), static::equalTo(DompdfEvents::OUTPUT))
+            ->with(self::anything(), self::equalTo(DompdfEvents::OUTPUT))
         ;
 
         $this->dompdfWrapper->getPdf($input);
@@ -143,16 +144,16 @@ public function testGetStreamResponse(): void
             ->willReturn($this->dompdf)
         ;
 
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('loadHtml')
-            ->with(static::equalTo('<h1>Title</h1>'))
+            ->with(self::equalTo('<h1>Title</h1>'))
         ;
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('render')
         ;
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('stream')
-            ->with(static::equalTo('file.pdf'))
+            ->with(self::equalTo('file.pdf'))
         ;
 
         $response = $this->dompdfWrapper->getStreamResponse('<h1>Title</h1>', 'file.pdf');
@@ -166,14 +167,14 @@ private function prepareOutput(string $input, ?string $response = null): void
             ->willReturn($this->dompdf)
         ;
 
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('loadHtml')
-            ->with(static::equalTo($input))
+            ->with(self::equalTo($input))
         ;
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('render')
         ;
-        $this->dompdf->expects(static::once())
+        $this->dompdf->expects(self::once())
             ->method('output')
             ->willReturn($response)
         ;

vendor-bin/tools/composer.json

@@ -24,5 +24,10 @@
             "phpstan/extension-installer": true
         },
         "bin-dir": "../../vendor/bin"
+    },
+    "extra": {
+        "symfony": {
+            "require": "6.4.*"
+        }
     }
 }