Skip to content

Commit

Permalink
Merge branch '11.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Apr 29, 2024
2 parents fe9685e + e89f433 commit bed3bfd
Show file tree
Hide file tree
Showing 18 changed files with 0 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use PHPUnit\Framework\Attributes\TestDox;
Expand All @@ -21,7 +20,6 @@
#[Group('test-doubles/mock-object')]
#[Medium]
#[TestDox('createConfiguredMock()')]
#[CoversMethod(TestCase::class, 'createConfiguredMock')]
final class CreateConfiguredMockTest extends TestCase
{
public function testCreatesMockObjectForInterfaceOrExtendableClassWithReturnValueConfigurationForMultipleMethods(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use PHPUnit\Framework\Attributes\TestDox;
Expand All @@ -21,7 +20,6 @@
#[Group('test-doubles/test-stub')]
#[Medium]
#[TestDox('createConfiguredStub()')]
#[CoversMethod(TestCase::class, 'createConfiguredStub')]
final class CreateConfiguredStubTest extends TestCase
{
public function testCreatesTestStubForInterfaceOrExtendableClassWithReturnValueConfigurationForMultipleMethods(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use PHPUnit\Framework\Attributes\TestDox;
Expand All @@ -25,7 +24,6 @@
#[Group('test-doubles/mock-object')]
#[Medium]
#[TestDox('createMockForIntersectionOfInterfaces()')]
#[CoversMethod(TestCase::class, 'createMockForIntersectionOfInterfaces')]
final class CreateMockForIntersectionOfInterfacesTest extends TestCase
{
public function testCreatesMockObjectForIntersectionOfInterfaces(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\DisableReturnValueGenerationForTestDoubles;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -24,7 +23,6 @@
#[Medium]
#[TestDox('createMockForIntersectionOfInterfaces()')]
#[DisableReturnValueGenerationForTestDoubles]
#[CoversMethod(TestCase::class, 'createMockForIntersectionOfInterfaces')]
final class CreateMockForIntersectionOfInterfacesWithDisabledReturnValueGenerationTest extends TestCase
{
public function testReturnValueGenerationCanBeDisabledWithAttribute(): void
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/Framework/MockObject/Creation/CreateMockTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use PHPUnit\Framework\Attributes\TestDox;
Expand All @@ -28,7 +27,6 @@
#[Group('test-doubles/mock-object')]
#[Medium]
#[TestDox('createMock()')]
#[CoversMethod(TestCase::class, 'createMock')]
final class CreateMockTest extends TestCase
{
public function testCreatesMockObjectForInterface(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\DisableReturnValueGenerationForTestDoubles;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -23,7 +22,6 @@
#[Medium]
#[TestDox('createMock()')]
#[DisableReturnValueGenerationForTestDoubles]
#[CoversMethod(TestCase::class, 'createMock')]
final class CreateMockWithDisabledReturnValueGenerationTest extends TestCase
{
public function testReturnValueGenerationCanBeDisabledWithAttribute(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use PHPUnit\Framework\Attributes\TestDox;
Expand All @@ -22,7 +21,6 @@
#[Group('test-doubles/mock-object')]
#[Medium]
#[TestDox('createPartialMock()')]
#[CoversMethod(TestCase::class, 'createPartialMock')]
final class CreatePartialMockTest extends TestCase
{
public function testCreatesPartialMockObjectForExtendableClass(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\DisableReturnValueGenerationForTestDoubles;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -23,7 +22,6 @@
#[Medium]
#[TestDox('createPartialMock()')]
#[DisableReturnValueGenerationForTestDoubles]
#[CoversMethod(TestCase::class, 'createPartialMock')]
final class CreatePartialMockWithDisabledReturnValueGenerationTest extends TestCase
{
public function testReturnValueGenerationCanBeDisabledWithAttribute(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use PHPUnit\Framework\Attributes\TestDox;
Expand All @@ -25,7 +24,6 @@
#[Group('test-doubles/test-stub')]
#[Medium]
#[TestDox('createStubForIntersectionOfInterfaces()')]
#[CoversMethod(TestCase::class, 'createStubForIntersectionOfInterfaces')]
final class CreateStubForIntersectionOfInterfacesTest extends TestCase
{
public function testCreatesTestStubForIntersectionOfInterfaces(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\DisableReturnValueGenerationForTestDoubles;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -24,7 +23,6 @@
#[Medium]
#[TestDox('createStubForIntersectionOfInterfaces()')]
#[DisableReturnValueGenerationForTestDoubles]
#[CoversMethod(TestCase::class, 'createStubForIntersectionOfInterfaces')]
final class CreateStubForIntersectionOfInterfacesWithDisabledReturnValueGenerationTest extends TestCase
{
public function testReturnValueGenerationCanBeDisabledWithAttribute(): void
Expand Down
2 changes: 0 additions & 2 deletions tests/unit/Framework/MockObject/Creation/CreateStubTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
use PHPUnit\Framework\Attributes\TestDox;
Expand All @@ -28,7 +27,6 @@
#[Group('test-doubles/test-stub')]
#[Medium]
#[TestDox('createStub()')]
#[CoversMethod(TestCase::class, 'createStub')]
final class CreateStubTest extends TestCase
{
public function testCreatesTestStubForInterface(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\DisableReturnValueGenerationForTestDoubles;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -23,7 +22,6 @@
#[Medium]
#[TestDox('createStub()')]
#[DisableReturnValueGenerationForTestDoubles]
#[CoversMethod(TestCase::class, 'createStub')]
final class CreateStubWithDisabledReturnValueGenerationTest extends TestCase
{
public function testReturnValueGenerationCanBeDisabledWithAttribute(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
namespace PHPUnit\Framework\MockObject;

use function assert;
use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\IgnorePhpunitDeprecations;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -24,7 +23,6 @@
#[Medium]
#[TestDox('createTestProxy()')]
#[IgnorePhpunitDeprecations]
#[CoversMethod(TestCase::class, 'createTestProxy')]
final class CreateTestProxyTest extends TestCase
{
public function testCreatesTestProxyForExtendableClass(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\IgnorePhpunitDeprecations;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -27,7 +26,6 @@
#[RequiresPhpExtension('soap')]
#[TestDox('getMockForAbstractClass()')]
#[IgnorePhpunitDeprecations]
#[CoversMethod(TestCase::class, 'getMockForAbstractClass')]
final class GetMockForAbstractClassTest extends TestCase
{
public function testCreatesMockObjectForAbstractClassAndAllowsConfigurationOfAbstractMethods(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\IgnorePhpunitDeprecations;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -24,7 +23,6 @@
#[Medium]
#[TestDox('getMockForTrait()')]
#[IgnorePhpunitDeprecations]
#[CoversMethod(TestCase::class, 'getMockForTrait')]
final class GetMockForTraitTest extends TestCase
{
public function testCreatesMockObjectForTraitAndAllowsConfigurationOfAbstractMethods(): void
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\IgnorePhpunitDeprecations;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -24,7 +23,6 @@
#[RequiresPhpExtension('soap')]
#[TestDox('getMockFromWsdl()')]
#[IgnorePhpunitDeprecations]
#[CoversMethod(TestCase::class, 'getMockFromWsdl')]
final class GetMockFromWsdlTest extends TestCase
{
#[TestDox('Creates mock object from WSDL file')]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
*/
namespace PHPUnit\Framework\MockObject;

use PHPUnit\Framework\Attributes\CoversMethod;
use PHPUnit\Framework\Attributes\Group;
use PHPUnit\Framework\Attributes\IgnorePhpunitDeprecations;
use PHPUnit\Framework\Attributes\Medium;
Expand All @@ -23,7 +22,6 @@
#[Medium]
#[TestDox('getObjectForTrait()')]
#[IgnorePhpunitDeprecations]
#[CoversMethod(TestCase::class, 'getObjectForTrait')]
final class GetObjectForTraitTest extends TestCase
{
public function testCreatesObjectForTrait(): void
Expand Down
40 changes: 0 additions & 40 deletions tests/unit/TextUI/Configuration/Xml/MigratorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,50 +9,10 @@
*/
namespace PHPUnit\TextUI\XmlConfiguration;

use PHPUnit\Framework\Attributes\CoversClass;
use PHPUnit\Framework\Attributes\Medium;
use PHPUnit\Framework\Attributes\TestDox;
use PHPUnit\Framework\TestCase;
use PHPUnit\Util\Xml\Loader as XmlLoader;

#[CoversClass(Migrator::class)]
#[CoversClass(MigrationBuilder::class)]
#[CoversClass(RemoveLogTypes::class)]
#[CoversClass(RemoveCacheTokensAttribute::class)]
#[CoversClass(IntroduceCoverageElement::class)]
#[CoversClass(MoveAttributesFromRootToCoverage::class)]
#[CoversClass(MoveAttributesFromFilterWhitelistToCoverage::class)]
#[CoversClass(MoveWhitelistIncludesToCoverage::class)]
#[CoversClass(MoveWhitelistExcludesToCoverage::class)]
#[CoversClass(RemoveEmptyFilter::class)]
#[CoversClass(CoverageCloverToReport::class)]
#[CoversClass(CoverageCrap4jToReport::class)]
#[CoversClass(CoverageHtmlToReport::class)]
#[CoversClass(CoveragePhpToReport::class)]
#[CoversClass(CoverageTextToReport::class)]
#[CoversClass(CoverageXmlToReport::class)]
#[CoversClass(ConvertLogTypes::class)]
#[CoversClass(RemoveListeners::class)]
#[CoversClass(RemoveTestSuiteLoaderAttributes::class)]
#[CoversClass(RemoveCacheResultFileAttribute::class)]
#[CoversClass(RemoveCoverageElementCacheDirectoryAttribute::class)]
#[CoversClass(RemoveCoverageElementProcessUncoveredFilesAttribute::class)]
#[CoversClass(IntroduceCacheDirectoryAttribute::class)]
#[CoversClass(RenameBackupStaticAttributesAttribute::class)]
#[CoversClass(RemoveBeStrictAboutResourceUsageDuringSmallTestsAttribute::class)]
#[CoversClass(RemoveBeStrictAboutTodoAnnotatedTestsAttribute::class)]
#[CoversClass(RemovePrinterAttributes::class)]
#[CoversClass(RemoveVerboseAttribute::class)]
#[CoversClass(RenameForceCoversAnnotationAttribute::class)]
#[CoversClass(RenameBeStrictAboutCoversAnnotationAttribute::class)]
#[CoversClass(RemoveConversionToExceptionsAttributes::class)]
#[CoversClass(RemoveNoInteractionAttribute::class)]
#[CoversClass(RemoveLoggingElements::class)]
#[CoversClass(RemoveTestDoxGroupsElement::class)]
#[CoversClass(MoveCoverageDirectoriesToSource::class)]
#[CoversClass(RemoveRegisterMockObjectsFromTestArgumentsRecursivelyAttribute::class)]
#[CoversClass(ReplaceRestrictDeprecationsWithIgnoreDeprecations::class)]
#[Medium]
final class MigratorTest extends TestCase
{
#[TestDox('Can migrate PHPUnit 9.2 configuration')]
Expand Down

0 comments on commit bed3bfd

Please sign in to comment.