Reverted changes

MateuszKolankowski · MateuszKolankowski · commit e2a499df2b02 · 2026-03-10T12:19:45.000+01:00
diff --git a/phpstan-baseline-gte-8.4.neon b/phpstan-baseline-gte-8.4.neon
@@ -41,3 +41,39 @@ parameters:
 			identifier: unset.possiblyHookedProperty
 			count: 1
 			path: tests/lib/Repository/Values/User/UserTest.php
+
+		-
+			message: '#^Cannot unset property .* because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 3
+			path: tests/bundle/Core/EventListener/BackgroundIndexingTerminateListenerTest.php
+
+		-
+			message: '#^Cannot unset property .* because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 9
+			path: tests/lib/Persistence/Cache/AbstractBaseHandlerTest.php
+
+		-
+			message: '#^Cannot unset property .* because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 3
+			path: tests/lib/Persistence/Cache/Adapter/InMemoryClearingProxyAdapterTest.php
+
+		-
+			message: '#^Cannot unset property .* because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: tests/lib/Persistence/Cache/InMemory/InMemoryCacheTest.php
+
+		-
+			message: '#^Cannot unset property .* because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 1
+			path: tests/lib/Persistence/Cache/PersistenceLoggerTest.php
+
+		-
+			message: '#^Cannot unset property .* because it might have hooks in a subclass\.$#'
+			identifier: unset.possiblyHookedProperty
+			count: 3
+			path: tests/lib/Repository/SiteAccessAware/AbstractServiceTest.php
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
diff --git a/phpstan-baseline.neon.php b/phpstan-baseline.neon.php
@@ -24,11 +24,10 @@
     $includes[] = __DIR__ . '/phpstan-baseline-lte-8.1.neon';
 }
 
-if (PHP_VERSION_ID < 80400) {
-    $includes[] = __DIR__ . '/phpstan-baseline-lte-8.3.neon';
-}
 if (PHP_VERSION_ID >= 80400) {
     $includes[] = __DIR__ . '/phpstan-baseline-gte-8.4.neon';
+} else {
+    $includes[] = __DIR__ . '/phpstan-baseline-lte-8.3.neon';
 }
 
 $versionParser = new VersionParser();
diff --git a/src/bundle/Core/Imagine/IORepositoryResolver.php b/src/bundle/Core/Imagine/IORepositoryResolver.php
@@ -92,6 +92,7 @@ public function store(BinaryInterface $binary, $path, $filter)
         $tmpFile = tmpfile();
         fwrite($tmpFile, $binary->getContent());
         $tmpMetadata = stream_get_meta_data($tmpFile);
+
         $binaryCreateStruct = $this->ioService->newBinaryCreateStructFromLocalFile($tmpMetadata['uri']);
         $binaryCreateStruct->id = $this->getFilePath($path, $filter);
         $this->ioService->createBinaryFile($binaryCreateStruct);
diff --git a/src/lib/Base/Exceptions/LimitationValidationException.php b/src/lib/Base/Exceptions/LimitationValidationException.php
@@ -34,7 +34,7 @@ class LimitationValidationException extends APILimitationValidationException imp
      */
     public function __construct(array $errors)
     {
-        $this->errors = $errors;
+        $this->validationErrors = $errors;
         $this->setMessageTemplate('Limitations did not validate');
         parent::__construct($this->getBaseTranslation());
     }
diff --git a/tests/bundle/Core/DependencyInjection/Configuration/Parser/LanguagesTest.php b/tests/bundle/Core/DependencyInjection/Configuration/Parser/LanguagesTest.php
@@ -19,7 +19,7 @@ protected function getContainerExtensions(): array
 
     protected function getMinimalConfiguration(): array
     {
-        return Yaml::parse(file_get_contents(__DIR__ . '/../../Fixtures/ezpublish_minimal.yml'));
+        return $this->minimalConfig = Yaml::parse(file_get_contents(__DIR__ . '/../../Fixtures/ezpublish_minimal.yml'));
     }
 
     public function testLanguagesSingleSiteaccess()
diff --git a/tests/bundle/Core/EventListener/BackgroundIndexingTerminateListenerTest.php b/tests/bundle/Core/EventListener/BackgroundIndexingTerminateListenerTest.php
@@ -40,6 +40,12 @@ protected function setUp(): void
         );
     }
 
+    protected function tearDown(): void
+    {
+        unset($this->persistenceMock, $this->searchMock, $this->listener);
+        parent::tearDown();
+    }
+
     public function testGetSubscribedEvents()
     {
         self::assertSame(
diff --git a/tests/bundle/Core/EventListener/RoutingListenerTest.php b/tests/bundle/Core/EventListener/RoutingListenerTest.php
@@ -14,6 +14,7 @@
 use Ibexa\Core\MVC\Symfony\Routing\Generator\UrlAliasGenerator;
 use Ibexa\Core\MVC\Symfony\SiteAccess;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
@@ -31,6 +32,7 @@ class RoutingListenerTest extends TestCase
     protected function setUp(): void
     {
         parent::setUp();
+        $this->container = $this->createMock(ContainerInterface::class);
         $this->configResolver = $this->createMock(ConfigResolverInterface::class);
         $this->urlAliasRouter = $this->createMock(UrlAliasRouter::class);
         $this->urlAliasGenerator = $this->createMock(UrlAliasGenerator::class);
diff --git a/tests/bundle/Core/EventListener/SessionSetDynamicNameListenerTest.php b/tests/bundle/Core/EventListener/SessionSetDynamicNameListenerTest.php
@@ -14,6 +14,7 @@
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpFoundation\Session\SessionInterface as SymfonySessionInterface;
 use Symfony\Component\HttpFoundation\Session\Storage\MockArraySessionStorage;
 use Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage;
 use Symfony\Component\HttpFoundation\Session\Storage\SessionStorageFactoryInterface;
@@ -36,6 +37,9 @@ protected function setUp(): void
         $this->configResolver = $this->getMockBuilder(ConfigResolverInterface::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->session = $this->getMockBuilder(SymfonySessionInterface::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->sessionStorage = $this->getMockBuilder(NativeSessionStorage::class)
             ->disableOriginalConstructor()
             ->getMock();
diff --git a/tests/bundle/Core/Routing/UrlAliasRouterTest.php b/tests/bundle/Core/Routing/UrlAliasRouterTest.php
@@ -17,6 +17,7 @@
 use Ibexa\Core\MVC\Symfony\View\Manager as ViewManager;
 use Ibexa\Core\Repository\Values\Content\Location;
 use Ibexa\Tests\Core\MVC\Symfony\Routing\UrlAliasRouterTest as BaseUrlAliasRouterTest;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\RequestContext;
 
@@ -57,6 +58,7 @@ protected function getRouter(LocationService $locationService, URLAliasService $
     protected function resetConfigResolver()
     {
         $this->configResolver = $this->createMock(ConfigResolverInterface::class);
+        $this->container = $this->createMock(ContainerInterface::class);
         $this->router->setConfigResolver($this->configResolver);
     }
 
diff --git a/tests/integration/Core/Repository/SearchServiceLocationTest.php b/tests/integration/Core/Repository/SearchServiceLocationTest.php
@@ -189,7 +189,7 @@ protected function createFolderWithNonPrintableUtf8Characters(): Content
         $createStruct->alwaysAvailable = false;
         $createStruct->setField(
             'name',
-            "Non\x09Printable\x0EFolder"
+            utf8_decode("Non\x09Printable\x0EFolder")
         );
 
         $locationCreateStruct = $repository->getLocationService()->newLocationCreateStruct(2);
@@ -335,7 +335,7 @@ public function testNonPrintableUtf8Characters(): void
                 'query' => new Criterion\Field(
                     'name',
                     Criterion\Operator::EQ,
-                    "Non\x09Printable\x0EFolder"
+                    utf8_decode("Non\x09Printable\x0EFolder")
                 ),
             ]
         );
diff --git a/tests/lib/MVC/Symfony/Templating/Twig/Extension/FileSystemTwigIntegrationTestCase.php b/tests/lib/MVC/Symfony/Templating/Twig/Extension/FileSystemTwigIntegrationTestCase.php
@@ -23,15 +23,6 @@
  */
 abstract class FileSystemTwigIntegrationTestCase extends IntegrationTestCase
 {
-    private function normalizeOutput(string $value): string
-    {
-        return preg_replace(
-            '/(^|[\s(])\\\\([A-Za-z_\\\\][A-Za-z0-9_\\\\]*::__set_state\()/m',
-            '$1$2',
-            $value
-        ) ?? $value;
-    }
-
     /**
      * Overrides the default implementation to use the chain loader so that
      * templates used internally are correctly loaded.
@@ -124,8 +115,7 @@ protected function doIntegrationTest($file, $message, $condition, $templates, $e
                 );
             }
 
-            $expected = $this->normalizeOutput(trim($match[3], "\n "));
-            $output = $this->normalizeOutput($output);
+            $expected = trim($match[3], "\n ");
 
             if ($expected != $output) {
                 echo 'Compiled template that failed:';
diff --git a/tests/lib/Persistence/Cache/AbstractBaseHandlerTest.php b/tests/lib/Persistence/Cache/AbstractBaseHandlerTest.php
@@ -127,6 +127,26 @@ static function ($key, $value, $isHit, $defaultLifetime = 0) {
         );
     }
 
+    /**
+     * Tear down test (properties).
+     */
+    protected function tearDown(): void
+    {
+        unset(
+            $this->cacheMock,
+            $this->persistenceHandlerMock,
+            $this->persistenceCacheHandler,
+            $this->loggerMock,
+            $this->cacheItemsClosure,
+            $this->inMemoryMock,
+            $this->cacheIdentifierGeneratorMock,
+            $this->cacheIdentifierSanitizer,
+            $this->locationPathConverter
+        );
+
+        parent::tearDown();
+    }
+
     /**
      * @param $key
      * @param null $value If null the cache item will be assumed to be a cache miss here.
diff --git a/tests/lib/Persistence/Cache/Adapter/InMemoryClearingProxyAdapterTest.php b/tests/lib/Persistence/Cache/Adapter/InMemoryClearingProxyAdapterTest.php
@@ -62,6 +62,18 @@ static function ($key, $value, $isHit, $defaultLifetime = 0, $tags = []) {
         );
     }
 
+    /**
+     * Tear down test (properties).
+     */
+    protected function tearDown(): void
+    {
+        unset($this->cache);
+        unset($this->innerPool);
+        unset($this->inMemory);
+
+        parent::tearDown();
+    }
+
     public function testGetItem()
     {
         $item = $this->createCacheItem('first');
diff --git a/tests/lib/Persistence/Cache/InMemory/InMemoryCacheTest.php b/tests/lib/Persistence/Cache/InMemory/InMemoryCacheTest.php
@@ -39,6 +39,7 @@ protected function tearDown(): void
     {
         $this->cache->clear();
 
+        unset($this->cache);
         unset($GLOBALS['override_time']);
         parent::tearDown();
     }
diff --git a/tests/lib/Persistence/Cache/PersistenceLoggerTest.php b/tests/lib/Persistence/Cache/PersistenceLoggerTest.php
@@ -24,6 +24,12 @@ protected function setUp(): void
         $this->logger = new PersistenceLogger();
     }
 
+    protected function tearDown(): void
+    {
+        unset($this->logger);
+        parent::tearDown();
+    }
+
     public function testGetName(): void
     {
         $this->assertEquals(PersistenceLogger::NAME, $this->logger->getName());
diff --git a/tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeTest.php b/tests/lib/Persistence/Legacy/Content/FieldValue/Converter/DateAndTimeTest.php
@@ -358,13 +358,7 @@ public function testGetDateIntervalFromXML()
             $this->converter,
             $this->getXMLStringFromDateInterval($dateIntervalReference)
         );
-        self::assertSame($dateIntervalReference->y, $generatedDateInterval->y);
-        self::assertSame($dateIntervalReference->m, $generatedDateInterval->m);
-        self::assertSame($dateIntervalReference->d, $generatedDateInterval->d);
-        self::assertSame($dateIntervalReference->h, $generatedDateInterval->h);
-        self::assertSame($dateIntervalReference->i, $generatedDateInterval->i);
-        self::assertSame($dateIntervalReference->s, $generatedDateInterval->s);
-        self::assertSame($dateIntervalReference->invert, $generatedDateInterval->invert);
+        self::assertEquals($dateIntervalReference, $generatedDateInterval);
     }
 
     /**
diff --git a/tests/lib/Repository/SiteAccessAware/AbstractServiceTest.php b/tests/lib/Repository/SiteAccessAware/AbstractServiceTest.php
@@ -58,6 +58,14 @@ protected function setUp(): void
         );
     }
 
+    protected function tearDown(): void
+    {
+        unset($this->service);
+        unset($this->languageResolverMock);
+        unset($this->innerApiServiceMock);
+        parent::tearDown();
+    }
+
     /**
      * @return array See signature on {@link testForPassTrough} for arguments and their type.
      */
diff --git a/tests/lib/Search/Common/FieldValueMapper/RemoteIdentifierMapperTest.php b/tests/lib/Search/Common/FieldValueMapper/RemoteIdentifierMapperTest.php
@@ -123,7 +123,7 @@ public function getDataForTestMap(): iterable
         yield 'identifier with non-printable characters' => [
             new Field(
                 'identifier',
-                "Non\x09Printable\x0EIdentifier",
+                utf8_decode("Non\x09Printable\x0EIdentifier"),
                 new IdentifierField()
             ),
             'Non PrintableIdentifier',

Original file line number	Diff line number	Diff line change
`@@ -24,11 +24,10 @@`
`24`	`24`	`$includes[] = __DIR__ . '/phpstan-baseline-lte-8.1.neon';`
`25`	`25`	`}`
`26`	`26`
`27`		`-if (PHP_VERSION_ID < 80400) {`
`28`		`- $includes[] = __DIR__ . '/phpstan-baseline-lte-8.3.neon';`
`29`		`-}`
`30`	`27`	`if (PHP_VERSION_ID >= 80400) {`
`31`	`28`	`$includes[] = __DIR__ . '/phpstan-baseline-gte-8.4.neon';`
	`29`	`+} else {`
	`30`	`+ $includes[] = __DIR__ . '/phpstan-baseline-lte-8.3.neon';`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`$versionParser = new VersionParser();`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class LimitationValidationException extends APILimitationValidationException imp`
`34`	`34`	`*/`
`35`	`35`	`public function __construct(array $errors)`
`36`	`36`	`{`
`37`		`- $this->errors = $errors;`
	`37`	`+ $this->validationErrors = $errors;`
`38`	`38`	`$this->setMessageTemplate('Limitations did not validate');`
`39`	`39`	`parent::__construct($this->getBaseTranslation());`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ protected function getContainerExtensions(): array`
`19`	`19`
`20`	`20`	`protected function getMinimalConfiguration(): array`
`21`	`21`	`{`
`22`		`- return Yaml::parse(file_get_contents(__DIR__ . '/../../Fixtures/ezpublish_minimal.yml'));`
	`22`	`+ return $this->minimalConfig = Yaml::parse(file_get_contents(__DIR__ . '/../../Fixtures/ezpublish_minimal.yml'));`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public function testLanguagesSingleSiteaccess()`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,12 @@ protected function setUp(): void`
`40`	`40`	`);`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ protected function tearDown(): void`
	`44`	`+ {`
	`45`	`+ unset($this->persistenceMock, $this->searchMock, $this->listener);`
	`46`	`+ parent::tearDown();`
	`47`	`+ }`
	`48`	`+`
`43`	`49`	`public function testGetSubscribedEvents()`
`44`	`50`	`{`
`45`	`51`	`self::assertSame(`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`use Ibexa\Core\MVC\Symfony\View\Manager as ViewManager;`
`18`	`18`	`use Ibexa\Core\Repository\Values\Content\Location;`
`19`	`19`	`use Ibexa\Tests\Core\MVC\Symfony\Routing\UrlAliasRouterTest as BaseUrlAliasRouterTest;`
	`20`	`+use Symfony\Component\DependencyInjection\ContainerInterface;`
`20`	`21`	`use Symfony\Component\Routing\Exception\ResourceNotFoundException;`
`21`	`22`	`use Symfony\Component\Routing\RequestContext;`
`22`	`23`
`@@ -57,6 +58,7 @@ protected function getRouter(LocationService $locationService, URLAliasService $`
`57`	`58`	`protected function resetConfigResolver()`
`58`	`59`	`{`
`59`	`60`	`$this->configResolver = $this->createMock(ConfigResolverInterface::class);`
	`61`	`+ $this->container = $this->createMock(ContainerInterface::class);`
`60`	`62`	`$this->router->setConfigResolver($this->configResolver);`
`61`	`63`	`}`
`62`	`64`