diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php index 5d0927d3baad11bb4a0bd6793765b6ed2da44bf7..202156cf652f972b5e20f80f3cb5f28d3cbea769 100644 --- a/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php +++ b/typo3/sysext/recycler/Tests/Functional/Recycle/AbstractRecycleTestCase.php @@ -17,7 +17,6 @@ declare(strict_types=1); namespace TYPO3\CMS\Recycler\Tests\Functional\Recycle; -use TYPO3\CMS\Core\Core\Bootstrap; use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Recycler\Domain\Model\DeletedRecords; use TYPO3\TestingFramework\Core\Functional\FunctionalTestCase; @@ -47,7 +46,6 @@ abstract class AbstractRecycleTestCase extends FunctionalTestCase { parent::setUp(); $this->importDataSet(__DIR__ . '/../Fixtures/Database/be_groups.xml'); - Bootstrap::initializeLanguageObject(); } /** diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php index d1f57d8e59f0a908056cc6bf8afc2b6f90e355d2..aec524ace5e2ebbd4aa1791403afe2dbf71b7c9d 100644 --- a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php +++ b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/AdminRecycleTest.php @@ -17,6 +17,7 @@ declare(strict_types=1); namespace TYPO3\CMS\Recycler\Tests\Functional\Recycle\Pages; +use TYPO3\CMS\Core\Core\Bootstrap; use TYPO3\CMS\Recycler\Tests\Functional\Recycle\AbstractRecycleTestCase; /** @@ -40,6 +41,7 @@ class AdminRecycleTest extends AbstractRecycleTestCase $this->importDataSet(__DIR__ . '/../../Fixtures/Database/pages.xml'); // Set up "admin" user $this->setUpBackendUserFromFixture(1); + Bootstrap::initializeLanguageObject(); } /** @@ -52,7 +54,9 @@ class AdminRecycleTest extends AbstractRecycleTestCase self::assertCount(1, $deletedPages); self::assertArrayHasKey('pages', $deletedPages); self::assertCount(3, $deletedPages['pages']); - self::assertSame($assertData[0]['uid'], $deletedPages[0]['uid']); + self::assertTrue(0 < (int)($assertData['pages'][0]['uid'] ?? 0)); + self::assertTrue(0 < (int)($deletedPages['pages'][0]['uid'] ?? 0)); + self::assertSame((int)$assertData['pages'][0]['uid'], (int)$deletedPages['pages'][0]['uid']); } /** @@ -65,6 +69,8 @@ class AdminRecycleTest extends AbstractRecycleTestCase self::assertCount(1, $deletedPages); self::assertArrayHasKey('pages', $deletedPages); self::assertCount(4, $deletedPages['pages']); - self::assertSame($assertData[0]['uid'], $deletedPages[0]['uid']); + self::assertTrue(0 < (int)($assertData['pages'][0]['uid'] ?? 0)); + self::assertTrue(0 < (int)($deletedPages['pages'][0]['uid'] ?? 0)); + self::assertSame((int)$assertData['pages'][0]['uid'], (int)$deletedPages['pages'][0]['uid']); } } diff --git a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php index 0095db576e3c85b677a358af23fd56698b675f91..58ec1390f53b8c0a0d5be420b2c801b126a2c85d 100644 --- a/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php +++ b/typo3/sysext/recycler/Tests/Functional/Recycle/Pages/UserRecycleTest.php @@ -17,6 +17,7 @@ declare(strict_types=1); namespace TYPO3\CMS\Recycler\Tests\Functional\Recycle\Pages; +use TYPO3\CMS\Core\Core\Bootstrap; use TYPO3\CMS\Recycler\Tests\Functional\Recycle\AbstractRecycleTestCase; /** @@ -40,6 +41,7 @@ class UserRecycleTest extends AbstractRecycleTestCase $this->importDataSet(__DIR__ . '/../../Fixtures/Database/pages.xml'); // Set up "editor" user $this->setUpBackendUserFromFixture(2); + Bootstrap::initializeLanguageObject(); } /** @@ -52,7 +54,9 @@ class UserRecycleTest extends AbstractRecycleTestCase self::assertCount(1, $deletedPages); self::assertArrayHasKey('pages', $deletedPages); self::assertCount(2, $deletedPages['pages']); - self::assertSame($assertData[0]['uid'], $deletedPages[0]['uid']); + self::assertTrue(0 < (int)($assertData['pages'][0]['uid'] ?? 0)); + self::assertTrue(0 < (int)($deletedPages['pages'][0]['uid'] ?? 0)); + self::assertSame((int)$assertData['pages'][0]['uid'], (int)$deletedPages['pages'][0]['uid']); } /** @@ -65,7 +69,9 @@ class UserRecycleTest extends AbstractRecycleTestCase self::assertCount(1, $deletedPages); self::assertArrayHasKey('pages', $deletedPages); self::assertCount(3, $deletedPages['pages']); - self::assertSame($assertData[0]['uid'], $deletedPages[0]['uid']); + self::assertTrue(0 < (int)($assertData['pages'][0]['uid'] ?? 0)); + self::assertTrue(0 < (int)($deletedPages['pages'][0]['uid'] ?? 0)); + self::assertSame((int)$assertData['pages'][0]['uid'], (int)$deletedPages['pages'][0]['uid']); } /**