Skip to content

Commit

Permalink
Merge branch '9.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
sebastianbergmann committed Jan 10, 2023
2 parents 36fba38 + 37d04d6 commit d39df1e
Show file tree
Hide file tree
Showing 11 changed files with 102 additions and 26 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php declare(strict_types=1);
/*
* This file is part of PHPUnit.
*
* (c) Sebastian Bergmann <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace PHPUnit\TestFixture;

final class ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest extends AbstractTest
{
}
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php declare(strict_types=1);
/*
* This file is part of PHPUnit.
*
* (c) Sebastian Bergmann <[email protected]>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace PHPUnit\TestFixture;

final class ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest extends AbstractTestCase
{
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
--TEST--
phpunit ../../_files/AbstractTest.php
phpunit ../../../_files/abstract/with-test-suffix/AbstractTest.php
--FILE--
<?php declare(strict_types=1);
$_SERVER['argv'][] = '--do-not-cache-result';
$_SERVER['argv'][] = '--no-configuration';
$_SERVER['argv'][] = __DIR__ . '/../../_files/AbstractTest.php';
$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/with-test-suffix/AbstractTest.php';

require_once __DIR__ . '/../../bootstrap.php';
require_once __DIR__ . '/../../../bootstrap.php';
PHPUnit\TextUI\Application::main();
--EXPECTF--
Class PHPUnit\TestFixture\AbstractTest declared in %sAbstractTest.php is abstract
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
--TEST--
phpunit ../../_files/AbstractTestCase.php
phpunit ../../../_files/abstract/without-test-suffix/AbstractTestCase.php
--FILE--
<?php declare(strict_types=1);
$_SERVER['argv'][] = '--do-not-cache-result';
$_SERVER['argv'][] = '--no-configuration';
$_SERVER['argv'][] = __DIR__ . '/../../_files/AbstractTestCase.php';
$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/without-test-suffix/AbstractTestCase.php';

require_once __DIR__ . '/../../bootstrap.php';
require_once __DIR__ . '/../../../bootstrap.php';
PHPUnit\TextUI\Application::main();
--EXPECTF--
Class PHPUnit\TestFixture\AbstractTestCase declared in %sAbstractTestCase.php is abstract
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--TEST--
phpunit ../../../_files/abstract/with-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest.php
--FILE--
<?php declare(strict_types=1);
$_SERVER['argv'][] = '--do-not-cache-result';
$_SERVER['argv'][] = '--no-configuration';
$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/with-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithTestSuffixTest.php';

require_once __DIR__ . '/../../../bootstrap.php';
PHPUnit\TextUI\Application::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.

Runtime: %s

. 1 / 1 (100%)

Time: %s, Memory: %s

OK (1 test, 1 assertion)
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
phpunit ../../../_files/abstract/without-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest.php
--SKIPIF--
<?php declare(strict_types=1);
print 'skip: https://github.com/sebastianbergmann/phpunit/issues/4979';
--FILE--
<?php declare(strict_types=1);
$_SERVER['argv'][] = '--do-not-cache-result';
$_SERVER['argv'][] = '--no-configuration';
$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/without-test-suffix/ConcreteTestClassExtendingAbstractTestClassWithoutTestSuffixTest.php';

require_once __DIR__ . '/../../../bootstrap.php';
PHPUnit\TextUI\Application::main();
--EXPECTF--
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--TEST--
phpunit ../../../_files/abstract/with-test-suffix
--SKIPIF--
<?php declare(strict_types=1);
print 'skip: https://github.com/sebastianbergmann/phpunit/issues/4979';
--FILE--
<?php declare(strict_types=1);
$_SERVER['argv'][] = '--do-not-cache-result';
$_SERVER['argv'][] = '--no-configuration';
$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/with-test-suffix';

require_once __DIR__ . '/../../../bootstrap.php';
PHPUnit\TextUI\Application::main();
--EXPECTF--
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
--TEST--
phpunit ../../../_files/abstract/without-test-suffix
--FILE--
<?php declare(strict_types=1);
$_SERVER['argv'][] = '--do-not-cache-result';
$_SERVER['argv'][] = '--no-configuration';
$_SERVER['argv'][] = __DIR__ . '/../../../_files/abstract/without-test-suffix';

require_once __DIR__ . '/../../../bootstrap.php';
PHPUnit\TextUI\Application::main();
--EXPECTF--
PHPUnit %s by Sebastian Bergmann and contributors.

Runtime: %s

. 1 / 1 (100%)

Time: %s, Memory: %s

OK (1 test, 1 assertion)
20 changes: 0 additions & 20 deletions tests/end-to-end/generic/concrete-test-class.phpt

This file was deleted.

0 comments on commit d39df1e

Please sign in to comment.