Enforce some more rector rules

rector.php

@@ -10,7 +10,16 @@
 return RectorConfig::configure()
  ->withImportNames()
  ->withPhpSets(php82: true)
- ->withPreparedSets(deadCode: true, codeQuality: true, codingStyle: true)
+ ->withPreparedSets(
+ deadCode: true,
+ codeQuality: true,
+ codingStyle: true,
+ typeDeclarations: true,
+ privatization: true,
+ instanceOf: true,
+ earlyReturn: true,
+ strictBooleans: true
+ )
  ->withPaths([
  __DIR__ . '/src',
  __DIR__ . '/tests',

src/Api/Search/SearchApplication.php

@@ -4,6 +4,7 @@
 
 namespace Uxmp\Core\Api\Search;
 
+use JsonSerializable;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Uxmp\Core\Api\AbstractApiApplication;
@@ -53,19 +54,19 @@ protected function run(
  'items' => [
  'albums' => array_values(
  array_map(
- fn (AlbumInterface $album) => $this->resultItemFactory->createAlbumListItem($album),
+ fn (AlbumInterface $album): JsonSerializable => $this->resultItemFactory->createAlbumListItem($album),
  $this->albumRepository->search($searchTerm)
  )
  ),
  'artists' => array_values(
  array_map(
- fn (ArtistInterface $artist) => $this->resultItemFactory->createArtistListItem($artist),
+ fn (ArtistInterface $artist): JsonSerializable => $this->resultItemFactory->createArtistListItem($artist),
  $this->artistRepository->search($searchTerm)
  )
  ),
  'songs' => array_values(
  array_map(
- fn (SongInterface $song) => $this->resultItemFactory->createSongListItem($song, $song->getAlbum()),
+ fn (SongInterface $song): JsonSerializable => $this->resultItemFactory->createSongListItem($song, $song->getAlbum()),
  $this->songRepository->search($searchTerm)
  )
  ),

src/Component/Io/Lib/PopenWrapper.php

@@ -28,7 +28,7 @@ public function run(string $command): mixed
  return null;
  }
 
- register_shutdown_function(static fn () => fclose($handle));
+ register_shutdown_function(static fn (): bool => fclose($handle));
 
  return $handle;
  }

src/Component/Io/Transcoder/TranscodingHandler.php

@@ -38,10 +38,10 @@ public function __invoke(int $length): string
  }
 
  return $chunk;
- } else {
- // return only null (if the content length is greater than the actual size)
- return str_repeat("\0", $length);
  }
+
+ // return only null (if the content length is greater than the actual size)
+ return str_repeat("\0", $length);
  }
 
  private function read(int $length): string

src/Component/Tag/Container/AudioFile.php

@@ -83,7 +83,7 @@ public function setTitle(string $title): AudioFileInterface
 
  public function getTitleClean(): string
  {
- return $this->stringHelper->filterForSearch($this->getTitle());
+ return $this->stringHelper->filterForSearch($this->title);
  }
 
  public function getMbid(): string
@@ -110,7 +110,7 @@ public function setArtistTitle(string $artistTitle): AudioFileInterface
 
  public function getArtistTitleClean(): string
  {
- return $this->stringHelper->filterForSearch($this->getArtistTitle());
+ return $this->stringHelper->filterForSearch($this->artistTitle);
  }
 
  public function getArtistMbid(): string
@@ -138,7 +138,7 @@ public function setAlbumTitle(string $albumTitle): AudioFileInterface
  public function getAlbumTitleClean(): string
  {
  return $this->stringHelper->filterForSearch(
- $this->getAlbumTitle()
+ $this->albumTitle
  );
  }
 
@@ -268,15 +268,15 @@ public function setLength(int $length): AudioFileInterface
  public function apply(SongInterface $song): void
  {
  $song
- ->setTitle($this->getTitle())
+ ->setTitle($this->title)
  ->setSearchTitle($this->getTitleClean())
- ->setTrackNumber($this->getTrackNumber())
- ->setFilename($this->getFilename())
- ->setMbid($this->getMbid())
- ->setLength($this->getLength())
- ->setYear($this->getYear())
- ->setMimeType($this->getMimeType())
- ->setFileSize($this->getFileSize())
+ ->setTrackNumber($this->trackNumber)
+ ->setFilename($this->filename)
+ ->setMbid($this->mbid)
+ ->setLength($this->length)
+ ->setYear($this->year)
+ ->setMimeType($this->mimeType)
+ ->setFileSize($this->fileSize)
  ;
  }
 }

tests/Api/Common/LogoutApplicationTest.php

@@ -65,7 +65,7 @@ public function testRunPerformsLogout(): void
  $response->shouldReceive('withHeader')
  ->with(
  'Set-Cookie',
- Mockery::on(static fn ($value) => str_starts_with(
+ Mockery::on(static fn ($value): bool => str_starts_with(
  (string) $value,
  sprintf(
  '%s=; path=%s/play; Expires=',

tests/Bootstrap/InitTest.php

@@ -14,7 +14,7 @@ public function testRunRuns(): void
 
  $this->assertSame(
  $foo,
- Init::run(static fn () => $foo),
+ Init::run(static fn (): string => $foo),
  );
  }
 }