[TASK] Add PHP 8.4 compatibility (#149)

TYPO3 · Aug 13, 2024 · 444a228 · 444a228
1 parent 7135648
commit 444a228
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/src/Plugin/Config.php b/src/Plugin/Config.php
@@ -192,7 +192,7 @@ public function getBaseDir()
      * @param IOInterface|null $io
      * @return Config
      */
-    public static function load(Composer $composer, IOInterface $io = null)
+    public static function load(Composer $composer, ?IOInterface $io = null)
     {
         static $config;
         if ($config === null) {

diff --git a/src/Plugin/Core/IncludeFile.php b/src/Plugin/Core/IncludeFile.php
@@ -51,7 +51,7 @@ class IncludeFile
      * @param TokenInterface[] $tokens
      * @param Filesystem $filesystem
      */
-    public function __construct(IOInterface $io, Composer $composer, array $tokens, Filesystem $filesystem = null)
+    public function __construct(IOInterface $io, Composer $composer, array $tokens, ?Filesystem $filesystem = null)
     {
         $this->io = $io;
         $this->composer = $composer;

diff --git a/src/Plugin/Core/IncludeFile/AppDirToken.php b/src/Plugin/Core/IncludeFile/AppDirToken.php
@@ -48,7 +48,7 @@ class AppDirToken implements TokenInterface
      * @param Typo3PluginConfig $typo3PluginConfig
      * @param Filesystem $filesystem
      */
-    public function __construct(IOInterface $io, Typo3PluginConfig $typo3PluginConfig, Filesystem $filesystem = null)
+    public function __construct(IOInterface $io, Typo3PluginConfig $typo3PluginConfig, ?Filesystem $filesystem = null)
     {
         $this->io = $io;
         $this->typo3PluginConfig = $typo3PluginConfig;

diff --git a/src/Plugin/Core/IncludeFile/BaseDirToken.php b/src/Plugin/Core/IncludeFile/BaseDirToken.php
@@ -48,7 +48,7 @@ class BaseDirToken implements TokenInterface
      * @param Typo3PluginConfig $typo3PluginConfig
      * @param Filesystem $filesystem
      */
-    public function __construct(IOInterface $io, Typo3PluginConfig $typo3PluginConfig, Filesystem $filesystem = null)
+    public function __construct(IOInterface $io, Typo3PluginConfig $typo3PluginConfig, ?Filesystem $filesystem = null)
     {
         $this->io = $io;
         $this->typo3PluginConfig = $typo3PluginConfig;

diff --git a/src/Plugin/Core/IncludeFile/RootDirToken.php b/src/Plugin/Core/IncludeFile/RootDirToken.php
@@ -48,7 +48,7 @@ class RootDirToken implements TokenInterface
      * @param Typo3PluginConfig $typo3PluginConfig
      * @param Filesystem $filesystem
      */
-    public function __construct(IOInterface $io, Typo3PluginConfig $typo3PluginConfig, Filesystem $filesystem = null)
+    public function __construct(IOInterface $io, Typo3PluginConfig $typo3PluginConfig, ?Filesystem $filesystem = null)
     {
         $this->io = $io;
         $this->typo3PluginConfig = $typo3PluginConfig;

diff --git a/src/Plugin/Core/IncludeFile/WebDirToken.php b/src/Plugin/Core/IncludeFile/WebDirToken.php
@@ -48,7 +48,7 @@ class WebDirToken implements TokenInterface
      * @param Typo3PluginConfig $typo3PluginConfig
      * @param Filesystem $filesystem
      */
-    public function __construct(IOInterface $io, Typo3PluginConfig $typo3PluginConfig, Filesystem $filesystem = null)
+    public function __construct(IOInterface $io, Typo3PluginConfig $typo3PluginConfig, ?Filesystem $filesystem = null)
     {
         $this->io = $io;
         $this->typo3PluginConfig = $typo3PluginConfig;

diff --git a/src/Plugin/PluginImplementation.php b/src/Plugin/PluginImplementation.php
@@ -55,8 +55,8 @@ class PluginImplementation
      */
     public function __construct(
         Event $event,
-        ScriptDispatcher $scriptDispatcher = null,
-        IncludeFile $includeFile = null
+        ?ScriptDispatcher $scriptDispatcher = null,
+        ?IncludeFile $includeFile = null
     ) {
         $io = $event->getIO();
         $this->composer = $event->getComposer();