Composer update (#2460)

app/Actions/Albums/Top.php

@@ -20,7 +20,6 @@
 use Illuminate\Support\Collection as BaseCollection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
-use Kalnoy\Nestedset\QueryBuilder as NsQueryBuilder;
 
 class Top
 {
@@ -82,14 +81,14 @@ public function get(): TopAlbumsResource
 			->orderBy($this->sorting->column, $this->sorting->order)
 			->get();
 
-		/** @var NsQueryBuilder $query */
+		/** @return AlbumBuilder $query */
 		$query = $this->albumQueryPolicy
 			->applyVisibilityFilter(Album::query()->with(['access_permissions', 'owner'])->whereIsRoot());
 
 		$userID = Auth::id();
 		if ($userID !== null) {
 			// For authenticated users we group albums by ownership.
-			/** @var BaseCollection<int,Album> $albums */
+			/** @phpstan-ignore-next-line */
 			$albums = (new SortingDecorator($query))
 				->orderBy(ColumnSortingType::OWNER_ID, OrderSortingType::ASC)
 				->orderBy($this->sorting->column, $this->sorting->order)
@@ -106,6 +105,7 @@ public function get(): TopAlbumsResource
 			// For anonymous users we don't want to implicitly expose
 			// ownership via sorting.
 			/** @var BaseCollection<int,Album> */
+			/** @phpstan-ignore-next-line */
 			$albums = (new SortingDecorator($query))
 				->orderBy($this->sorting->column, $this->sorting->order)
 				->get();

app/Actions/Albums/Tree.php

@@ -62,9 +62,9 @@ public function get(): AlbumForestResource
 		}
 		$query->orderBy($this->sorting->column, $this->sorting->order);
 
-		/** @var NsCollection<int,Album> $albums */
+		/** @var NsCollection<int,string,Album> $albums */
 		$albums = $query->get();
-		/** @var ?NsCollection<int,Album> $sharedAlbums */
+		/** @var ?NsCollection<int,string,Album> $sharedAlbums */
 		$sharedAlbums = null;
 		$userID = Auth::id();
 		if ($userID !== null) {
@@ -75,8 +75,8 @@ public function get(): AlbumForestResource
 			// (sub)-tree and then `toTree` will return garbage as it does
 			// not find connected paths within `$albums` or `$sharedAlbums`,
 			// resp.
-			/** @var NsCollection<int,Album> $albums */
-			/** @var ?NsCollection<int,Album> $sharedAlbums */
+			/** @var NsCollection<int,string,Album> $albums */
+			/** @var ?NsCollection<int,string,Album> $sharedAlbums */
 			list($albums, $sharedAlbums) = $albums->partition(fn (Album $album) => $album->owner_id === $userID);
 		}
 

app/Actions/Search/AlbumSearch.php

@@ -64,7 +64,6 @@ public function queryAlbums(array $terms): Collection
 
 		$sorting = AlbumSortingCriterion::createDefault();
 
-		/** @phpstan-ignore-next-line */
 		return (new SortingDecorator($albumQuery))
 			->orderBy($sorting->column, $sorting->order)
 			->get();

app/Factories/AlbumFactory.php

@@ -78,8 +78,6 @@ public function findBaseAlbumOrFail(string $albumID, bool $withRelations = true)
 		}
 
 		try {
-			// PHPStan does not understand that `findOrFail` returns `BaseAlbum`, but assumes that it returns `Model`
-			// @phpstan-ignore-next-line
 			return $albumQuery->findOrFail($albumID);
 		} catch (ModelNotFoundException) {
 			try {

app/Http/Requests/Album/AddAlbumRequest.php

@@ -40,12 +40,11 @@ public function rules(): array
 	 */
 	protected function processValidatedValues(array $values, array $files): void
 	{
+		/** @var string|null */
 		$parentAlbumID = $values[RequestAttribute::PARENT_ID_ATTRIBUTE];
 		$this->parentAlbum = $parentAlbumID === null ?
 			null :
-			Album::query()->findOrFail(
-				$values[RequestAttribute::PARENT_ID_ATTRIBUTE]
-			);
+			Album::query()->findOrFail($parentAlbumID);
 		$this->title = $values[RequestAttribute::TITLE_ATTRIBUTE];
 	}
 }

app/Http/Requests/Album/DeleteTrackRequest.php

@@ -28,6 +28,8 @@ public function rules(): array
 	 */
 	protected function processValidatedValues(array $values, array $files): void
 	{
-		$this->album = Album::query()->findOrFail($values[RequestAttribute::ALBUM_ID_ATTRIBUTE]);
+		/** @var string|null */
+		$albumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
+		$this->album = Album::query()->findOrFail($albumID);
 	}
 }

app/Http/Requests/Album/MoveAlbumsRequest.php

@@ -42,6 +42,7 @@ protected function processValidatedValues(array $values, array $files): void
 		$this->album = $id === null ?
 			null :
 			Album::findOrFail($id);
+		/** @phpstan-ignore-next-line */
 		$this->albums = Album::findOrFail($ids);
 	}
 }

app/Http/Requests/Album/SetAlbumCoverRequest.php

@@ -43,7 +43,10 @@ public function rules(): array
 	 */
 	protected function processValidatedValues(array $values, array $files): void
 	{
-		$this->album = Album::query()->findOrFail($values[RequestAttribute::ALBUM_ID_ATTRIBUTE]);
+		/** @var string|null */
+		$albumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
+
+		$this->album = Album::query()->findOrFail($albumID);
 		/** @var ?string $photoID */
 		$photoID = $values[RequestAttribute::PHOTO_ID_ATTRIBUTE];
 		$this->photo = $photoID === null ? null : Photo::query()->findOrFail($photoID);

app/Http/Requests/Album/SetAlbumHeaderRequest.php

@@ -43,7 +43,10 @@ public function rules(): array
 	 */
 	protected function processValidatedValues(array $values, array $files): void
 	{
-		$this->album = Album::query()->findOrFail($values[RequestAttribute::ALBUM_ID_ATTRIBUTE]);
+		/** @var string|null */
+		$albumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
+
+		$this->album = Album::query()->findOrFail($albumID);
 		/** @var ?string $photoID */
 		$photoID = $values[RequestAttribute::PHOTO_ID_ATTRIBUTE];
 		$this->photo = $photoID === null ? null : Photo::query()->findOrFail($photoID);

app/Http/Requests/Album/SetAlbumLicenseRequest.php

@@ -32,7 +32,10 @@ public function rules(): array
 	 */
 	protected function processValidatedValues(array $values, array $files): void
 	{
-		$this->album = Album::query()->findOrFail($values[RequestAttribute::ALBUM_ID_ATTRIBUTE]);
+		/** @var string|null */
+		$albumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
+
+		$this->album = Album::query()->findOrFail($albumID);
 		$this->license = LicenseType::tryFrom($values[RequestAttribute::LICENSE_ATTRIBUTE]);
 	}
 }

app/Http/Requests/Album/SetAlbumTrackRequest.php

@@ -35,7 +35,9 @@ public function rules(): array
 	 */
 	protected function processValidatedValues(array $values, array $files): void
 	{
-		$this->album = Album::query()->findOrFail($values[RequestAttribute::ALBUM_ID_ATTRIBUTE]);
+		/** @var string|null */
+		$albumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
+		$this->album = Album::query()->findOrFail($albumID);
 		$this->file = $files[self::FILE_ATTRIBUTE];
 	}
 

app/Http/Requests/Import/ImportFromUrlRequest.php

@@ -33,6 +33,7 @@ public function rules(): array
 	 */
 	protected function processValidatedValues(array $values, array $files): void
 	{
+		/** @var string|null */
 		$albumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
 		$this->album = $albumID === null ?
 			null :

app/Http/Requests/Import/ImportServerRequest.php

@@ -44,6 +44,7 @@ public function rules(): array
 	 */
 	protected function processValidatedValues(array $values, array $files): void
 	{
+		/** @var string|null */
 		$albumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
 		$this->album = $albumID === null ?
 			null :

app/Http/Requests/Photo/DuplicatePhotosRequest.php

@@ -37,6 +37,7 @@ protected function processValidatedValues(array $values, array $files): void
 		$this->photos = Photo::query()
 			->with(['size_variants'])
 			->findOrFail($photosIDs);
+		/** @var string|null */
 		$targetAlbumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
 		$this->album = $targetAlbumID === null ?
 			null :

app/Http/Requests/Photo/MovePhotosRequest.php

@@ -36,6 +36,7 @@ protected function processValidatedValues(array $values, array $files): void
 		$photosIDs = $values[RequestAttribute::PHOTO_IDS_ATTRIBUTE];
 		$this->photos = Photo::query()
 			->findOrFail($photosIDs);
+		/** @var string|null */
 		$targetAlbumID = $values[RequestAttribute::ALBUM_ID_ATTRIBUTE];
 		$this->album = $targetAlbumID === null ? null : Album::query()->findOrFail($targetAlbumID);
 	}

app/Livewire/Components/Forms/Album/SearchAlbum.php

@@ -88,9 +88,9 @@ private function getAlbumsListWithPath(?int $lft, ?int $rgt, ?string $parent_id)
 		$query = (new SortingDecorator($unfiltered))
 			->orderBy($sorting->column, $sorting->order);
 
-		/** @var NsCollection<int,Album> $albums */
+		/** @var NsCollection<int,string,Album> $albums */
 		$albums = $query->get();
-		/** @var NsCollection<int,Album> $tree */
+		/** @var NsCollection<int,string,Album> $tree */
 		$tree = $albums->toTree(null);
 
 		$flat_tree = $this->flatten($tree);
@@ -115,8 +115,8 @@ private function getAlbumsListWithPath(?int $lft, ?int $rgt, ?string $parent_id)
 	/**
 	 * Flatten the tree and create bread crumb paths.
 	 *
-	 * @param NsCollection<int,Album>|Collection<int,Album> $collection
-	 * @param string                                        $prefix
+	 * @param NsCollection<int,string,Album>|Collection<int,Album> $collection
+	 * @param string                                               $prefix
 	 *
 	 * @return TAlbumSaved[]
 	 */

app/Models/Album.php

@@ -123,9 +123,12 @@
  * @method static AlbumBuilder|Album         withoutRoot()
  *
  * // * @mixin \Eloquent
+ *
+ * @implements Node<string,Album>
  */
 class Album extends BaseAlbum implements Node
 {
+	/** @phpstan-use NodeTrait<string,Album> */
 	use NodeTrait;
 	use ToArrayThrowsNotImplemented;
 	use HasFactory;
@@ -220,13 +223,14 @@ public function children(): HasManyChildAlbums
 	/**
 	 * Get query for descendants of the node.
 	 *
-	 * @return DescendantsRelation
+	 * @return DescendantsRelation<string,Album>
 	 *
 	 * @throws QueryBuilderException
 	 */
 	public function descendants(): DescendantsRelation
 	{
 		try {
+			/** @var DescendantsRelation<string,Album> */
 			return new DescendantsRelation($this->newQuery(), $this);
 		} catch (\Throwable $e) {
 			throw new QueryBuilderException($e);

app/Models/Builders/AlbumBuilder.php

@@ -47,6 +47,8 @@
  * @method        $this              whereNotIn(string $column, mixed $values, string $boolean = 'and')
  * @method        $this              whereNull(string|array $columns, string $boolean = 'and', bool $not = false)
  * @method        $this              orderByDesc($column)
+ *
+ * @extends NSQueryBuilder<string,Album>
  */
 class AlbumBuilder extends NSQueryBuilder
 {
@@ -94,14 +96,13 @@ public function getModels($columns = ['*']): array
 		// The parent method returns a `Model[]`, but we must return
 		// `Album[]` and we know that this is indeed the case as we have
 		// queried for albums
-		// @phpstan-ignore-next-line
 		return parent::getModels($columns);
 	}
 
 	/**
 	 * Get statistics of errors of the tree.
 	 *
-	 * @return array<string,int>
+	 * @return array{oddness:int,duplicates:int,wrong_parent:int,missing_parent:int}
 	 *
 	 * @throws QueryBuilderException
 	 */
@@ -266,4 +267,16 @@ private function applyVisibilityConditioOnPhotos(Builder $countQuery, AlbumQuery
 
 		return $countQuery->where($visibilitySubQuery);
 	}
+
+	/**
+	 * Scope limits query to select just root node.
+	 *
+	 * @return AlbumBuilder
+	 */
+	public function whereIsRoot(): AlbumBuilder
+	{
+		$this->query->whereNull($this->model->getParentIdName());
+
+		return $this;
+	}
 }

app/Relations/HasManyChildAlbums.php

@@ -30,7 +30,6 @@ public function __construct(Album $owningAlbum)
 		$this->albumQueryPolicy = resolve(AlbumQueryPolicy::class);
 		$this->sorting = $owningAlbum->album_sorting ?? AlbumSortingCriterion::createDefault();
 		parent::__construct(
-			/** @phpstan-ignore-next-line */
 			$owningAlbum->newQuery(),
 			$owningAlbum,
 			'parent_id',

database/migrations/2020_12_26_153220_nested_set_for_albums.php

@@ -26,7 +26,7 @@ public function up(): void
 			$table->index([self::LEFT, self::RIGHT]);
 		});
 
-		NestedSetForAlbums_AlbumModel::query()->fixTree(); /** @phpstan-ignore-line */
+		NestedSetForAlbums_AlbumModel::query()->fixTree();
 	}
 
 	/**