Skip to content

[TASK] Allow PHPunit 12 #668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lolli42 merged 1 commit into from
Apr 9, 2025
Merged

[TASK] Allow PHPunit 12 #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Classes/Core/BaseTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ protected function tearDown(): void
* @param string $mockClassName the class name to use for the mock class
* @param bool $callOriginalConstructor whether to call the constructor
* @param bool $callOriginalClone whether to call the __clone method
* @param bool $callAutoload whether to call any autoload function
*
* @return MockObject&AccessibleObjectInterface&T a mock of `$originalClassName` with access methods added
*/
Expand All @@ -112,7 +111,6 @@ protected function getAccessibleMock(
string $mockClassName = '',
bool $callOriginalConstructor = true,
bool $callOriginalClone = true,
bool $callAutoload = true
) {
$mockBuilder = $this->getMockBuilder($this->buildAccessibleProxy($originalClassName))
->setConstructorArgs($arguments)
Expand All @@ -132,10 +130,6 @@ protected function getAccessibleMock(
$mockBuilder->disableOriginalClone();
}

if (!$callAutoload) {
$mockBuilder->disableAutoload();
}

return $mockBuilder->getMock();
}

Expand Down
5 changes: 2 additions & 3 deletions Tests/Unit/Core/PackageCollectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

namespace Typo3\TestingFramework\Tests\Unit\Core;

use PHPUnit\Framework\Attributes\Test;
use PHPUnit\Framework\TestCase;
use TYPO3\CMS\Core\Package\PackageManager;
use TYPO3\CMS\Core\Service\DependencyOrderingService;
Expand All @@ -31,9 +32,7 @@

final class PackageCollectionTest extends TestCase
{
/**
* @test
*/
#[Test]
public function sortsComposerPackages(): void
{
$packageStates = require __DIR__ . '/../Fixtures/Packages/PackageStates.php';
Expand Down
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"php": "^8.2",
"composer/class-map-generator": "^1.3.4",
"guzzlehttp/psr7": "^2.5.0",
"phpunit/phpunit": "^11.2.5",
"phpunit/phpunit": "^11.2.5 || ^12.1.2",
"psr/container": "^2.0",
"typo3/cms-backend": "13.*.*@dev || 14.*.*@dev",
"typo3/cms-core": "13.*.*@dev || 14.*.*@dev",
Expand Down