Update and fix CS (#5892)

.tools/psalm/baseline.xml

@@ -4570,7 +4570,7 @@
     </MixedAssignment>
     <MixedInferredReturnType>
       <code>Symfony\Component\HttpFoundation\Request</code>
-      <code>null|rex_user</code>
+      <code>rex_user|null</code>
     </MixedInferredReturnType>
     <MixedMethodCall>
       <code>getImpersonator</code>
@@ -4959,7 +4959,7 @@
       <code>(string) $out[0]</code>
     </LessSpecificReturnStatement>
     <MoreSpecificReturnType>
-      <code>null|non-empty-string</code>
+      <code>non-empty-string|null</code>
     </MoreSpecificReturnType>
   </file>
   <file src="redaxo/src/core/lib/util/path_default_provider.php">

composer.json

@@ -11,7 +11,7 @@
         "ext-mbstring": "*"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "v3.48.0",
+        "friendsofphp/php-cs-fixer": "v3.49.0",
         "friendsofredaxo/linter": "1.4.0",
         "jetbrains/phpstorm-attributes": "^1.0",
         "phpstan/extension-installer": "1.3.1",
@@ -22,8 +22,8 @@
         "phpunit/phpunit": "^10.0.7",
         "psalm/plugin-phpunit": "0.18.4",
         "psalm/plugin-symfony": "v5.1.0",
-        "rector/rector": "0.19.5",
-        "redaxo/php-cs-fixer-config": "2.4.0",
+        "rector/rector": "0.19.6",
+        "redaxo/php-cs-fixer-config": "2.5.0",
         "redaxo/psalm-plugin": "2.0.0",
         "vimeo/psalm": "5.21.1"
     },

redaxo/src/addons/cronjob/lib/manager_sql.php

@@ -150,7 +150,7 @@ public function delete($id)
     }
 
     /**
-     * @param null|callable(string,bool,string):void $callback Callback is called after every job execution (params: job name, success status, message)
+     * @param callable(string,bool,string):void|null $callback Callback is called after every job execution (params: job name, success status, message)
      * @return void
      */
     public function check(?callable $callback = null)

redaxo/src/addons/install/pages/packages.add.php

@@ -151,7 +151,6 @@
                 return $addon2['counter'] <=> $addon1['counter'];
             });
         }
-
     } else {
         $sortClass = '';
         $sortNext = 'up';

redaxo/src/addons/media_manager/lib/managed_media.php

@@ -61,7 +61,7 @@ public function __construct($mediaPath)
      *
      * To get the current source path (can be changed by effects) use `getSourcePath` instead.
      *
-     * @return null|string
+     * @return string|null
      */
     public function getMediaPath()
     {
@@ -415,7 +415,7 @@ public function setImageProperty($name, $value)
     /**
      * @param string $name
      * @param mixed $default
-     * @return null|mixed
+     * @return mixed|null
      */
     public function getImageProperty($name, $default = null)
     {

redaxo/src/addons/media_manager/lib/media_manager.php

@@ -200,7 +200,7 @@ public function setCachePath($path = '')
     }
 
     /**
-     * @return null|string
+     * @return string|null
      */
     public function getCachePath()
     {
@@ -541,7 +541,7 @@ public static function getMediaType()
     /**
      * @param string $type Media type
      * @param string|rex_media $file Media file
-     * @param null|int $timestamp Last change timestamp of given file, for cache buster parameter
+     * @param int|null $timestamp Last change timestamp of given file, for cache buster parameter
      *                            (not nessary when the file is given by a `rex_media` object)
      * @param bool $escape
      *

redaxo/src/addons/media_manager/tests/managed_media_test.php

@@ -14,18 +14,18 @@ public function testConstructor(): void
 
         $media = new rex_managed_media($path);
 
-        static::assertSame($path, $media->getMediaPath());
-        static::assertSame($filename, $media->getMediaFilename());
-        static::assertSame($path, $media->getSourcePath());
+        self::assertSame($path, $media->getMediaPath());
+        self::assertSame($filename, $media->getMediaFilename());
+        self::assertSame($path, $media->getSourcePath());
 
         $filename = 'non_existing.jpg';
         $path = rex_path::addon($filename);
 
         $media = new rex_managed_media($path);
 
-        static::assertSame($path, $media->getMediaPath());
-        static::assertSame($filename, $media->getMediaFilename());
-        static::assertSame($path, $media->getSourcePath());
-        static::assertFalse($media->exists());
+        self::assertSame($path, $media->getMediaPath());
+        self::assertSame($filename, $media->getMediaFilename());
+        self::assertSame($path, $media->getSourcePath());
+        self::assertFalse($media->exists());
     }
 }

redaxo/src/addons/media_manager/tests/media_manager_test.php

@@ -21,16 +21,16 @@ public function testGetCacheFilename(): void
         $property = new ReflectionProperty(rex_media_manager::class, 'type');
         $property->setValue($manager, 'test');
 
-        static::assertSame($cachePath . 'test/foo.jpg', $manager->getCacheFilename());
+        self::assertSame($cachePath . 'test/foo.jpg', $manager->getCacheFilename());
     }
 
     public function testGetMediaFile(): void
     {
         $_GET['rex_media_file'] = '../foo/bar/baz.jpg';
-        static::assertSame('baz.jpg', rex_media_manager::getMediaFile());
+        self::assertSame('baz.jpg', rex_media_manager::getMediaFile());
 
         $_GET['rex_media_file'] = '..\\foo\\bar\\baz.jpg';
-        static::assertSame('baz.jpg', rex_media_manager::getMediaFile());
+        self::assertSame('baz.jpg', rex_media_manager::getMediaFile());
     }
 
     public function testCreate(): void
@@ -43,13 +43,13 @@ public function testCreate(): void
         try {
             $manager = rex_media_manager::create('rex_media_small', $filename);
 
-            static::assertFileExists($manager->getCacheFilename());
-            static::assertFileExists($manager->getHeaderCacheFilename());
+            self::assertFileExists($manager->getCacheFilename());
+            self::assertFileExists($manager->getHeaderCacheFilename());
 
             $manager = rex_media_manager::create('non_existing_type', $filename);
 
-            static::assertFileDoesNotExist($manager->getCacheFilename());
-            static::assertFileDoesNotExist($manager->getHeaderCacheFilename());
+            self::assertFileDoesNotExist($manager->getCacheFilename());
+            self::assertFileDoesNotExist($manager->getHeaderCacheFilename());
         } finally {
             @unlink($path);
         }
@@ -61,9 +61,9 @@ public function testGetUrl(int|false $expectedBuster, string $type, string|rex_m
         $url = rex_media_manager::getUrl($type, $file, $timestamp);
 
         if (false === $expectedBuster) {
-            static::assertStringNotContainsString('buster=', $url);
+            self::assertStringNotContainsString('buster=', $url);
         } else {
-            static::assertStringContainsString('buster=' . $expectedBuster, $url);
+            self::assertStringContainsString('buster=' . $expectedBuster, $url);
         }
     }
 

redaxo/src/addons/mediapool/functions/function_rex_mediapool.php

@@ -109,9 +109,9 @@ function rex_mediapool_updateMedia($FILE, &$FILEINFOS, $userlogin = null)
  * @param string $physicalFilename
  * @param int $categoryId
  * @param string $title
- * @param null|int $filesize
- * @param null|string $filetype
- * @param null|string $userlogin
+ * @param int|null $filesize
+ * @param string|null $filetype
+ * @param string|null $userlogin
  *
  * @return array
  * @deprecated since 2.11, use `rex_media_service::addMedia` instead
@@ -339,7 +339,7 @@ function rex_mediapool_isAllowedMediaType($filename, array $args = [])
  * Checks file against optional property `allowed_mime_types`.
  *
  * @param string $path Path to the physical file
- * @param null|string $filename Optional filename, will be used for extracting the file extension.
+ * @param string|null $filename Optional filename, will be used for extracting the file extension.
  *                              If not given, the extension is extracted from `$path`.
  *
  * @return bool

redaxo/src/addons/mediapool/lib/media.php

@@ -46,7 +46,7 @@ class rex_media
     /**
      * @param string $name
      *
-     * @return null|static
+     * @return static|null
      */
     public static function get($name)
     {
@@ -94,7 +94,7 @@ public static function get($name)
 
     /**
      * @throws rex_sql_exception
-     * @return null|static
+     * @return static|null
      */
     public static function forId(int $mediaId): ?self
     {

redaxo/src/addons/mediapool/lib/mediapool.php

@@ -135,7 +135,7 @@ public static function isAllowedExtension(string $filename, array $args = []): b
      * Checks file against optional property `allowed_mime_types`.
      *
      * @param string $path Path to the physical file
-     * @param null|string $filename Optional filename, will be used for extracting the file extension.
+     * @param string|null $filename Optional filename, will be used for extracting the file extension.
      *                              If not given, the extension is extracted from `$path`.
      */
     public static function isAllowedMimeType(string $path, ?string $filename = null): bool

redaxo/src/addons/mediapool/tests/media_test.php

@@ -14,11 +14,11 @@ public function testHasValue(): void
         /** @psalm-suppress UndefinedPropertyAssignment */
         $media->med_foo = 'teststring';
 
-        static::assertTrue($media->hasValue('med_foo'));
-        static::assertTrue($media->hasValue('foo'));
+        self::assertTrue($media->hasValue('med_foo'));
+        self::assertTrue($media->hasValue('foo'));
 
-        static::assertFalse($media->hasValue('bar'));
-        static::assertFalse($media->hasValue('med_bar'));
+        self::assertFalse($media->hasValue('bar'));
+        self::assertFalse($media->hasValue('med_bar'));
     }
 
     public function testGetValue(): void
@@ -28,11 +28,11 @@ public function testGetValue(): void
         /** @psalm-suppress UndefinedPropertyAssignment */
         $media->med_foo = 'teststring';
 
-        static::assertEquals('teststring', $media->getValue('med_foo'));
-        static::assertEquals('teststring', $media->getValue('foo'));
+        self::assertEquals('teststring', $media->getValue('med_foo'));
+        self::assertEquals('teststring', $media->getValue('foo'));
 
-        static::assertNull($media->getValue('bar'));
-        static::assertNull($media->getValue('med_bar'));
+        self::assertNull($media->getValue('bar'));
+        self::assertNull($media->getValue('med_bar'));
     }
 
     private function createMediaWithoutConstructor(): rex_media

redaxo/src/addons/mediapool/tests/mediapool_test.php

@@ -11,7 +11,7 @@ class rex_mediapool_test extends TestCase
     #[DataProvider('provideIsAllowedExtension')]
     public function testIsAllowedExtension(bool $expected, string $filename, array $args = []): void
     {
-        static::assertSame($expected, rex_mediapool::isAllowedExtension($filename, $args));
+        self::assertSame($expected, rex_mediapool::isAllowedExtension($filename, $args));
     }
 
     /** @return list<array{0: bool, 1: string, 2?: array{types: string}}> */
@@ -43,7 +43,7 @@ public function testIsAllowedMimeType(bool $expected, string $path, ?string $fil
             'md' => ['text/plain'],
         ]);
 
-        static::assertSame($expected, rex_mediapool::isAllowedMimeType($path, $filename));
+        self::assertSame($expected, rex_mediapool::isAllowedMimeType($path, $filename));
 
         $addon->setProperty('allowed_mime_types', $allowedMimeTypes);
     }

redaxo/src/addons/structure/functions/function_rex_url.php

@@ -57,8 +57,8 @@ function rex_getUrl($id = null, $clang = null, array $params = [], $separator =
 /**
  * Leitet auf einen anderen Artikel weiter.
  *
- * @param null|int|string $articleId
- * @param null|int|string $clang SprachId des Artikels
+ * @param int|string|null $articleId
+ * @param int|string|null $clang SprachId des Artikels
  *
  * @throws InvalidArgumentException
  * @return never

redaxo/src/addons/structure/lib/article.php

@@ -22,7 +22,7 @@ public static function getCurrentId()
      *
      * @param int $clang
      *
-     * @return null|self
+     * @return self|null
      */
     public static function getCurrent($clang = null)
     {

redaxo/src/addons/structure/lib/category.php

@@ -12,7 +12,7 @@ class rex_category extends rex_structure_element
      *
      * @param int $clang
      *
-     * @return null|self
+     * @return self|null
      */
     public static function getCurrent($clang = null)
     {

redaxo/src/addons/structure/lib/select_category.php

@@ -7,7 +7,7 @@ class rex_category_select extends rex_select
 {
     /** @var bool */
     private $ignoreOfflines;
-    /** @var null|int */
+    /** @var int|null */
     private $clang;
     /** @var bool */
     private $checkPerms;

redaxo/src/addons/structure/plugins/content/lib/api_template.php

@@ -102,7 +102,7 @@ public static function getTemplatesDir()
     }
 
     /**
-     * @return false|null|string
+     * @return false|string|null
      */
     public function getTemplate()
     {

redaxo/src/addons/structure/plugins/content/lib/article_slice.php

@@ -414,7 +414,7 @@ public function getId()
     /**
      * @template T of int|string
      * @param T $index
-     * @return null|int|string
+     * @return int|string|null
      * @psalm-return (T is int ? string|null : int|string|null)
      */
     public function getValue($index)
@@ -472,7 +472,7 @@ public function getLinkList($index)
     }
 
     /**
-     * @return null|list<int>
+     * @return list<int>|null
      */
     public function getLinkListArray(int $index): ?array
     {
@@ -515,7 +515,7 @@ public function getMediaList($index)
     }
 
     /**
-     * @return null|list<string>
+     * @return list<string>|null
      */
     public function getMediaListArray(int $index): ?array
     {

redaxo/src/addons/structure/plugins/content/lib/content_service.php

@@ -229,7 +229,7 @@ public static function sliceStatus(int $sliceId, int $status)
      * @param int $toId ArtikelId des Artikel, in den kopiert werden sollen (Ziel ArtikelId)
      * @param int $fromClang ClangId des Artikels, aus dem kopiert werden soll (Quell ClangId)
      * @param int $toClang ClangId des Artikels, in den kopiert werden soll (Ziel ClangId)
-     * @param null|int $revision If null, slices of all revisions are copied
+     * @param int|null $revision If null, slices of all revisions are copied
      *
      * @return bool TRUE bei Erfolg, sonst FALSE
      */

redaxo/src/addons/structure/plugins/content/lib/select_template.php

@@ -6,16 +6,16 @@ class rex_template_select extends rex_select
 {
     /** @var bool */
     private $loaded = false;
-    /** @var null|int */
+    /** @var int|null */
     private $categoryId;
-    /** @var null|string[] */
+    /** @var string[]|null */
     private $templates;
     /** @var int */
     private $clangId;
 
     /**
-     * @param null|int $categoryId
-     * @param null|int $clangId
+     * @param int|null $categoryId
+     * @param int|null $clangId
      */
     public function __construct($categoryId = null, $clangId = null)
     {

redaxo/src/addons/structure/plugins/content/tests/article_content_base_test.php

@@ -16,11 +16,11 @@ public function testHasValue(): void
         $propArticle = new ReflectionProperty(rex_article_content_base::class, 'ARTICLE');
         $propArticle->setValue($instance, rex_sql::factory()->setValue('art_foo', 'teststring'));
 
-        static::assertTrue($instance->hasValue('foo'));
-        static::assertTrue($instance->hasValue('art_foo'));
+        self::assertTrue($instance->hasValue('foo'));
+        self::assertTrue($instance->hasValue('art_foo'));
 
-        static::assertFalse($instance->hasValue('bar'));
-        static::assertFalse($instance->hasValue('art_bar'));
+        self::assertFalse($instance->hasValue('bar'));
+        self::assertFalse($instance->hasValue('art_bar'));
     }
 
     public function testGetValue(): void
@@ -31,8 +31,8 @@ public function testGetValue(): void
         $propArticle = new ReflectionProperty(rex_article_content_base::class, 'ARTICLE');
         $propArticle->setValue($instance, rex_sql::factory()->setValue('art_foo', 'teststring'));
 
-        static::assertEquals('teststring', $instance->getValue('foo'));
-        static::assertEquals('teststring', $instance->getValue('art_foo'));
+        self::assertEquals('teststring', $instance->getValue('foo'));
+        self::assertEquals('teststring', $instance->getValue('art_foo'));
     }
 
     #[DataProvider('dataGetValueNonExisting')]