IBX-10597: Fixed accessing uninitialized image variation properties when switching to the original variation (#652)

For more details see https://issues.ibexa.co/browse/IBX-10597 and #652

Key changes:

* Fixed accessing uninitialized image variation properties while switching to the original variation

* [Tests] Adjusted mock properties

Author: konradoboza

phpstan-baseline.neon

@@ -17028,18 +17028,6 @@ parameters:
 			count: 1
 			path: src/lib/Repository/LocationService.php
 
-		-
-			message: '#^Property Ibexa\\Contracts\\Core\\Repository\\Values\\ContentType\\ContentType\:\:\$defaultSortField \(int\) on left side of \?\? is not nullable\.$#'
-			identifier: nullCoalesce.property
-			count: 1
-			path: src/lib/Repository/LocationService.php
-
-		-
-			message: '#^Property Ibexa\\Contracts\\Core\\Repository\\Values\\ContentType\\ContentType\:\:\$defaultSortOrder \(int\) on left side of \?\? is not nullable\.$#'
-			identifier: nullCoalesce.property
-			count: 1
-			path: src/lib/Repository/LocationService.php
-
 		-
 			message: '#^Property Ibexa\\Core\\Repository\\LocationService\:\:\$repository \(Ibexa\\Core\\Repository\\Repository\) does not accept Ibexa\\Contracts\\Core\\Repository\\Repository\.$#'
 			identifier: assign.propertyType
@@ -22650,54 +22638,6 @@ parameters:
 			count: 1
 			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
 
-		-
-			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\AliasGeneratorTest\:\:testGetVariationAlreadyStored\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\AliasGeneratorTest\:\:testGetVariationInvalidVariation\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\AliasGeneratorTest\:\:testGetVariationNotStored\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\AliasGeneratorTest\:\:testGetVariationNotStoredHavingReferences\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\AliasGeneratorTest\:\:testGetVariationOriginal\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\AliasGeneratorTest\:\:testGetVariationOriginalNotFound\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\AliasGeneratorTest\:\:testGetVariationWrongValue\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\AliasGeneratorTest\:\:testSupportsValue\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/bundle/Core/Imagine/AliasGeneratorTest.php
-
 		-
 			message: '#^Method Ibexa\\Tests\\Bundle\\Core\\Imagine\\BinaryLoaderTest\:\:testFindBadPathRoot\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -33990,12 +33930,6 @@ parameters:
 			count: 1
 			path: tests/integration/Core/Repository/Regression/EZP21771IbexaStringTest.php
 
-		-
-			message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\Regression\\EZP21798Test\:\:testRoleChanges\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/integration/Core/Repository/Regression/EZP21798Test.php
-
 		-
 			message: '#^Parameter \#1 \$value of function count expects array\|Countable, iterable\<Ibexa\\Contracts\\Core\\Repository\\Values\\User\\Policy\> given\.$#'
 			identifier: argument.type
@@ -38496,18 +38430,6 @@ parameters:
 			count: 1
 			path: tests/integration/Core/Repository/URLWildcardServiceTest.php
 
-		-
-			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertNotNull\(\) with int will always evaluate to true\.$#'
-			identifier: staticMethod.alreadyNarrowedType
-			count: 1
-			path: tests/integration/Core/Repository/URLWildcardServiceTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\URLWildcardServiceTest\:\:testCreateSetsIdPropertyOnURLWildcard\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/integration/Core/Repository/URLWildcardServiceTest.php
-
 		-
 			message: '#^Method Ibexa\\Tests\\Integration\\Core\\Repository\\URLWildcardServiceTest\:\:testCreateSetsPropertiesOnURLWildcard\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -60372,54 +60294,12 @@ parameters:
 			count: 1
 			path: tests/lib/Repository/Values/User/RoleTest.php
 
-		-
-			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
-			identifier: staticMethod.alreadyNarrowedType
-			count: 1
-			path: tests/lib/Repository/Values/User/RoleTest.php
-
 		-
 			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Values\\User\\RoleTest\:\:assertPropertiesCorrect\(\) has no return type specified\.$#'
 			identifier: missingType.return
 			count: 1
 			path: tests/lib/Repository/Values/User/RoleTest.php
 
-		-
-			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Values\\User\\RoleTest\:\:testIsPropertySet\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/lib/Repository/Values/User/RoleTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Values\\User\\RoleTest\:\:testMissingProperty\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/lib/Repository/Values/User/RoleTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Values\\User\\RoleTest\:\:testNewClass\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/lib/Repository/Values/User/RoleTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Values\\User\\RoleTest\:\:testReadOnlyProperty\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/lib/Repository/Values/User/RoleTest.php
-
-		-
-			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Values\\User\\RoleTest\:\:testUnsetProperty\(\) has no return type specified\.$#'
-			identifier: missingType.return
-			count: 1
-			path: tests/lib/Repository/Values/User/RoleTest.php
-
-		-
-			message: '#^Property Ibexa\\Contracts\\Core\\Repository\\Values\\User\\Role\:\:\$id \(int\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: tests/lib/Repository/Values/User/RoleTest.php
-
 		-
 			message: '#^Access to an undefined property Ibexa\\Core\\Repository\\Values\\User\\UserGroup\:\:\$notDefined\.$#'
 			identifier: property.notFound
@@ -60480,24 +60360,12 @@ parameters:
 			count: 1
 			path: tests/lib/Repository/Values/User/UserTest.php
 
-		-
-			message: '#^Call to static method PHPUnit\\Framework\\Assert\:\:assertTrue\(\) with true will always evaluate to true\.$#'
-			identifier: staticMethod.alreadyNarrowedType
-			count: 1
-			path: tests/lib/Repository/Values/User/UserTest.php
-
 		-
 			message: '#^Method Ibexa\\Tests\\Core\\Repository\\Values\\User\\UserTest\:\:assertPropertiesCorrect\(\) has no return type specified\.$#'
 			identifier: missingType.return
 			count: 1
 			path: tests/lib/Repository/Values/User/UserTest.php
 
-		-
-			message: '#^Property Ibexa\\Contracts\\Core\\Repository\\Values\\User\\User\:\:\$login \(string\) in isset\(\) is not nullable\.$#'
-			identifier: isset.property
-			count: 1
-			path: tests/lib/Repository/Values/User/UserTest.php
-
 		-
 			message: '#^Method Ibexa\\Tests\\Core\\Search\\Common\\FieldValueMapper\\RemoteIdentifierMapperTest\:\:getDataForTestCanMap\(\) return type has no value type specified in iterable type iterable\.$#'
 			identifier: missingType.iterableValue

src/bundle/Core/Imagine/AliasGenerator.php

@@ -134,6 +134,8 @@ public function getVariation(Field $field, VersionInfo $versionInfo, string $var
                 'imageId' => $imageValue->imageId,
                 'width' => $variationWidth,
                 'height' => $variationHeight,
+                'fileSize' => $imageValue->getFileSize() ?? 0,
+                'mimeType' => $imageValue->mime ?? '',
             ]
         );
     }

src/lib/Repository/LocationService.php

@@ -412,10 +412,8 @@ public function createLocation(ContentInfo $contentInfo, LocationCreateStruct $l
 
         $contentType = $content->getContentType();
 
-        $locationCreateStruct->sortField = $locationCreateStruct->sortField
-            ?? ($contentType->defaultSortField ?? Location::SORT_FIELD_NAME);
-        $locationCreateStruct->sortOrder = $locationCreateStruct->sortOrder
-            ?? ($contentType->defaultSortOrder ?? Location::SORT_ORDER_ASC);
+        $locationCreateStruct->sortField = $locationCreateStruct->sortField ?? $contentType->defaultSortField;
+        $locationCreateStruct->sortOrder = $locationCreateStruct->sortOrder ?? $contentType->defaultSortOrder;
 
         $contentInfo = $content->contentInfo;