Fix tests

leepeuker · Sep 11, 2024 · 2b3027a · 2b3027a
1 parent 2a4c520
commit 2b3027a
Show file tree

Hide file tree

Showing 48 changed files with 262 additions and 130 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
     "squizlabs/php_codesniffer": "^3.9",
     "phpstan/phpstan": "^1.12.3",
     "phpstan/phpstan-phpunit": "^1.4",
-    "vimeo/psalm": "^5.25",
+    "vimeo/psalm": "^5.4",
     "psalm/plugin-phpunit": "^0.19",
     "webmozarts/strict-phpunit": "^7.11.19"
   },

diff --git a/composer.lock b/composer.lock
diff --git a/settings/phpstan.neon b/settings/phpstan.neon
@@ -6,8 +6,6 @@ parameters:
 	ignoreErrors:
 		-
 			identifier: missingType.iterableValue
-		-
-			identifier: missingType.generics
 		-
 		    message: '#Parameter \#2 \$level of class Monolog\\Handler\\StreamHandler#'
 		    path: ../src/Factory.php

diff --git a/settings/psalm.xml b/settings/psalm.xml
@@ -20,18 +20,27 @@
         <DeprecatedFunction errorLevel="info"/>
         <DeprecatedInterface errorLevel="info"/>
         <DeprecatedTrait errorLevel="info"/>
+        <ParamNameMismatch errorLevel="info"/>
 
         <RedundantConditionGivenDocblockType errorLevel="info"/>
         <PropertyNotSetInConstructor errorLevel="info"/>
         <MixedArrayAccess errorLevel="info"/>
         <MixedAssignment errorLevel="info"/>
         <ImplicitToStringCast errorLevel="suppress"/>
         <PossiblyUndefinedArrayOffset errorLevel="info"/>
+        <RiskyTruthyFalsyComparison errorLevel="info"/>
+        <RiskyCast errorLevel="info"/>
+
         <PossiblyInvalidCast>
             <errorLevel type="suppress">
                 <file name="src/ValueObject/Http/Request.php"/>
             </errorLevel>
         </PossiblyInvalidCast>
+        <ArgumentTypeCoercion>
+            <errorLevel type="suppress">
+                <file name="src/ValueObject/DateTime.php"/>
+            </errorLevel>
+        </ArgumentTypeCoercion>
 
         <InternalMethod>
             <errorLevel type="suppress">

diff --git a/src/Api/Jellyfin/Dto/JellyfinMovieDtoList.php b/src/Api/Jellyfin/Dto/JellyfinMovieDtoList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method JellyfinMovieDto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<JellyfinMovieDto>
  */
 class JellyfinMovieDtoList extends AbstractList
 {

diff --git a/src/Api/Tmdb/Dto/TmdbCast.php b/src/Api/Tmdb/Dto/TmdbCast.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method TmdbCastMember[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<TmdbCastMember>
  */
 class TmdbCast extends AbstractList
 {

diff --git a/src/Api/Tmdb/Dto/TmdbCrew.php b/src/Api/Tmdb/Dto/TmdbCrew.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method TmdbCrewMember[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<TmdbCrewMember>
  */
 class TmdbCrew extends AbstractList
 {

diff --git a/src/Api/Tmdb/Dto/TmdbGenreList.php b/src/Api/Tmdb/Dto/TmdbGenreList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method TmdbGenre[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<TmdbGenre>
  */
 class TmdbGenreList extends AbstractList
 {

diff --git a/src/Api/Tmdb/Dto/TmdbProductionCompanyList.php b/src/Api/Tmdb/Dto/TmdbProductionCompanyList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method TmdbProductionCompany[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<TmdbProductionCompany>
  */
 class TmdbProductionCompanyList extends AbstractList
 {

diff --git a/src/Api/Tmdb/Dto/TmdbWatchProviderList.php b/src/Api/Tmdb/Dto/TmdbWatchProviderList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method TmdbWatchProviderDto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<TmdbWatchProviderDto>
  */
 class TmdbWatchProviderList extends AbstractList
 {

diff --git a/src/Api/Trakt/ValueObject/User/Movie/History/DtoList.php b/src/Api/Trakt/ValueObject/User/Movie/History/DtoList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method Dto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<Dto>
  */
 class DtoList extends AbstractList
 {

diff --git a/src/Api/Trakt/ValueObject/User/Movie/Rating/DtoList.php b/src/Api/Trakt/ValueObject/User/Movie/Rating/DtoList.php
@@ -5,7 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<Dto>
  */
 class DtoList extends AbstractList
 {

diff --git a/src/Api/Trakt/ValueObject/User/Movie/Watched/DtoList.php b/src/Api/Trakt/ValueObject/User/Movie/Watched/DtoList.php
@@ -7,8 +7,7 @@
 use Movary\ValueObject\DateTime;
 
 /**
- * @method Dto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<Dto>
  */
 class DtoList extends AbstractList
 {

diff --git a/src/Domain/Company/CompanyEntityList.php b/src/Domain/Company/CompanyEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method CompanyEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<CompanyEntity>
  */
 class CompanyEntityList extends AbstractList
 {

diff --git a/src/Domain/Genre/GenreEntityList.php b/src/Domain/Genre/GenreEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method GenreEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<GenreEntity>
  */
 class GenreEntityList extends AbstractList
 {

diff --git a/src/Domain/Movie/Cast/CastEntityList.php b/src/Domain/Movie/Cast/CastEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method CastEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<CastEntity>
  */
 class CastEntityList extends AbstractList
 {

diff --git a/src/Domain/Movie/Crew/CrewApi.php b/src/Domain/Movie/Crew/CrewApi.php
@@ -7,7 +7,7 @@
 
 class CrewApi
 {
-    private const RELEVANT_JOBS = [
+    private const array RELEVANT_JOBS = [
         'Screenplay',
         'Director',
         'Producer',

diff --git a/src/Domain/Movie/Crew/CrewEntityList.php b/src/Domain/Movie/Crew/CrewEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method CrewEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<CrewEntity>
  */
 class CrewEntityList extends AbstractList
 {

diff --git a/src/Domain/Movie/Genre/MovieGenreEntityList.php b/src/Domain/Movie/Genre/MovieGenreEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method MovieGenreEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<MovieGenreEntity>
  */
 class MovieGenreEntityList extends AbstractList
 {

diff --git a/src/Domain/Movie/History/Location/MovieHistoryLocationEntityList.php b/src/Domain/Movie/History/Location/MovieHistoryLocationEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method MovieHistoryLocationEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<MovieHistoryLocationEntity>
  */
 class MovieHistoryLocationEntityList extends AbstractList
 {

diff --git a/src/Domain/Movie/History/MovieHistoryEntityList.php b/src/Domain/Movie/History/MovieHistoryEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method MovieHistoryEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<MovieHistoryEntity>
  */
 class MovieHistoryEntityList extends AbstractList
 {

diff --git a/src/Domain/Movie/MovieApi.php b/src/Domain/Movie/MovieApi.php
@@ -560,7 +560,7 @@ public function updateCrew(int $movieId, TmdbCrew $tmdbCrew) : void
                 $crewMember->getPerson()->getPosterPath(),
             );
 
-            $this->crewApi->create($movieId, $person->getId(), $crewMember->getJob(), $crewMember->getDepartment(), $position);
+            $this->crewApi->create($movieId, $person->getId(), $crewMember->getJob(), $crewMember->getDepartment(), (int)$position);
         }
     }
 

diff --git a/src/Domain/Movie/MovieEntityList.php b/src/Domain/Movie/MovieEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method MovieEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<MovieEntity>
  */
 class MovieEntityList extends AbstractList
 {

diff --git a/src/Domain/Movie/ProductionCompany/ProductionCompanyEntityList.php b/src/Domain/Movie/ProductionCompany/ProductionCompanyEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method ProductionCompanyEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<ProductionCompanyEntity>
  */
 class ProductionCompanyEntityList extends AbstractList
 {

diff --git a/src/Domain/Person/PersonEntityList.php b/src/Domain/Person/PersonEntityList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method PersonEntity[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<PersonEntity>
  */
 class PersonEntityList extends AbstractList
 {

diff --git a/src/Domain/User/Service/Authentication.php b/src/Domain/User/Service/Authentication.php
@@ -84,10 +84,10 @@ public function getCurrentUser() : UserEntity
     public function getCurrentUserId() : int
     {
         $userId = $this->sessionWrapper->find('userId');
-        $token = filter_input(INPUT_COOKIE, self::AUTHENTICATION_COOKIE_NAME);
+        $token = (string)filter_input(INPUT_COOKIE, self::AUTHENTICATION_COOKIE_NAME);
 
-        if ($userId === null && $token !== null) {
-            $userId = $this->repository->findUserIdByAuthToken((string)$token);
+        if ($userId === null && $token !== '') {
+            $userId = $this->repository->findUserIdByAuthToken($token);
             $this->sessionWrapper->set('userId', $userId);
         }
 
@@ -100,8 +100,8 @@ public function getCurrentUserId() : int
 
     public function getToken(Request $request) : ?string
     {
-        $tokenInCookie = filter_input(INPUT_COOKIE, self::AUTHENTICATION_COOKIE_NAME);
-        if ($tokenInCookie !== false && $tokenInCookie !== null) {
+        $tokenInCookie = (string)filter_input(INPUT_COOKIE, self::AUTHENTICATION_COOKIE_NAME);
+        if ($tokenInCookie !== '') {
             return $tokenInCookie;
         }
 
@@ -124,9 +124,9 @@ public function getUserIdByApiToken(Request $request) : ?int
 
     public function isUserAuthenticatedWithCookie() : bool
     {
-        $token = filter_input(INPUT_COOKIE, self::AUTHENTICATION_COOKIE_NAME);
+        $token = (string)filter_input(INPUT_COOKIE, self::AUTHENTICATION_COOKIE_NAME);
 
-        if (empty($token) === false && $this->isValidAuthToken((string)$token) === true) {
+        if ($token !== '' && $this->isValidAuthToken($token) === true) {
             return true;
         }
 
@@ -203,10 +203,10 @@ public function login(
 
     public function logout() : void
     {
-        $token = filter_input(INPUT_COOKIE, 'id');
+        $token = (string)filter_input(INPUT_COOKIE, 'id');
 
-        if ($token !== null) {
-            $this->deleteToken((string)$token);
+        if ($token !== '') {
+            $this->deleteToken($token);
             unset($_COOKIE[self::AUTHENTICATION_COOKIE_NAME]);
             setcookie(self::AUTHENTICATION_COOKIE_NAME, '', -1);
         }

diff --git a/src/HttpController/Api/Dto/HistoryEntryDtoList.php b/src/HttpController/Api/Dto/HistoryEntryDtoList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method MovieDto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<HistoryEntryDto>
  */
 class HistoryEntryDtoList extends AbstractList
 {

diff --git a/src/HttpController/Api/Dto/MovieSearchResultDtoList.php b/src/HttpController/Api/Dto/MovieSearchResultDtoList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method MovieSearchResultDto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<MovieSearchResultDto>
  */
 class MovieSearchResultDtoList extends AbstractList
 {

diff --git a/src/HttpController/Api/Dto/PlayedEntryDtoList.php b/src/HttpController/Api/Dto/PlayedEntryDtoList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method MovieDto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<PlayedEntryDto>
  */
 class PlayedEntryDtoList extends AbstractList
 {

diff --git a/src/HttpController/Api/Dto/WatchDateDtoList.php b/src/HttpController/Api/Dto/WatchDateDtoList.php
@@ -6,8 +6,7 @@
 use RuntimeException;
 
 /**
- * @method WatchDateDto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<WatchDateDto>
  */
 class WatchDateDtoList extends AbstractList
 {

diff --git a/src/HttpController/Api/Dto/WatchlistEntryDtoList.php b/src/HttpController/Api/Dto/WatchlistEntryDtoList.php
@@ -5,8 +5,7 @@
 use Movary\ValueObject\AbstractList;
 
 /**
- * @method MovieDto[] getIterator()
- * @psalm-suppress ImplementedReturnTypeMismatch
+ * @extends AbstractList<WatchlistEntryDto>
  */
 class WatchlistEntryDtoList extends AbstractList
 {
-Original file line number
+Diff line change
@@ Expand Up @@
                     $crewMember->getPerson()->getPosterPath(),
                 );
-                $this->crewApi->create($movieId, $person->getId(), $crewMember->getJob(), $crewMember->getDepartment(), $position);
+                $this->crewApi->create($movieId, $person->getId(), $crewMember->getJob(), $crewMember->getDepartment(), (int)$position);
             }
         }
@@ Expand Down @@