diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module index bf698ff..8879742 100644 --- a/core/modules/simpletest/simpletest.module +++ b/core/modules/simpletest/simpletest.module @@ -182,7 +182,7 @@ function simpletest_run_tests($test_list) { * The parsed results of PHPUnit's JUnit XML output, in the format of * {simpletest}'s schema. * - * @deprecated in Drupal 8.1.x, will be removed before 9.0.0. Use + * @deprecated in Drupal 8.3.x, will be removed before 9.0.0. Use * Drupal\Core\Test\PhpUnitTestRunner::runTests(). */ function simpletest_run_phpunit_tests($test_id, array $unescaped_test_classnames, &$status = NULL) { @@ -261,7 +261,7 @@ function simpletest_summarize_phpunit_result($results) { * @return string * Path to the PHPUnit XML file to use for the current $test_id. * - * @deprecated in Drupal 8.1.x, will be removed before 9.0.0. Use + * @deprecated in Drupal 8.3.x, will be removed before 9.0.0. Use * Drupal\Core\Test\PhpUnitTestRunner::xmlLogFilepath(). */ function simpletest_phpunit_xml_filepath($test_id) { @@ -275,7 +275,7 @@ function simpletest_phpunit_xml_filepath($test_id) { * @return string * The path to core's phpunit.xml.dist configuration file. * - * @deprecated in Drupal 8.1.x, will be removed before 9.0.0. Use + * @deprecated in Drupal 8.3.x, will be removed before 9.0.0. Use * Drupal\Core\Test\PhpUnitTestRunner::phpUnitConfigurationFilepath(). */ function simpletest_phpunit_configuration_filepath() { @@ -296,9 +296,9 @@ function simpletest_phpunit_configuration_filepath() { * this variable. * * @return string - * The results as returned by exec(). + * The results as returned by exec(). * - * @deprecated in Drupal 8.1.x, will be removed before 9.0.0. Use + * @deprecated in Drupal 8.3.x, will be removed before 9.0.0. Use * Drupal\Core\Test\PhpUnitTestRunner::runCommand(). */ function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpunit_file, &$status = NULL) { @@ -312,7 +312,7 @@ function simpletest_phpunit_run_command(array $unescaped_test_classnames, $phpun * @return string * The command that can be run through exec(). * - * @deprecated in Drupal 8.1.x, will be removed before 9.0.0. Use + * @deprecated in Drupal 8.3.x, will be removed before 9.0.0. Use * Drupal\Core\Test\PhpUnitTestRunner::phpUnitCommand(). */ function simpletest_phpunit_command() { @@ -688,7 +688,7 @@ function simpletest_mail_alter(&$message) { * The results as array of rows in a format that can be inserted into * {simpletest}. * - * @deprecated in Drupal 8.1.x, will be removed before 9.0.0. Use + * @deprecated in Drupal 8.3.x, will be removed before 9.0.0. Use * Drupal\Core\Test\JUnitConverter::xmlToRows(). */ function simpletest_phpunit_xml_to_rows($test_id, $phpunit_xml_file) { @@ -706,7 +706,7 @@ function simpletest_phpunit_xml_to_rows($test_id, $phpunit_xml_file) { * @return array * A list of all test cases. * - * @deprecated in Drupal 8.1.x, will be removed before 9.0.0. Use + * @deprecated in Drupal 8.3.x, will be removed before 9.0.0. Use * Drupal\Core\Test\JUnitConverter::findTestCases(). */ function simpletest_phpunit_find_testcases(\SimpleXMLElement $element, \SimpleXMLElement $parent = NULL) { @@ -724,7 +724,7 @@ function simpletest_phpunit_find_testcases(\SimpleXMLElement $element, \SimpleXM * @return array * An array containing the {simpletest} result row. * - * @deprecated in Drupal 8.1.x, will be removed before 9.0.0. Use + * @deprecated in Drupal 8.3.x, will be removed before 9.0.0. Use * Drupal\Core\Test\JUnitConverter::testcaseToSimpletestRow(). */ function simpletest_phpunit_testcase_to_row($test_id, \SimpleXMLElement $testcase) { diff --git a/core/modules/simpletest/tests/src/Unit/SimpletestPhpunitRunCommandTest.php b/core/modules/simpletest/tests/src/Unit/SimpletestPhpunitRunCommandTest.php index f91cc1f..7be1630 100644 --- a/core/modules/simpletest/tests/src/Unit/SimpletestPhpunitRunCommandTest.php +++ b/core/modules/simpletest/tests/src/Unit/SimpletestPhpunitRunCommandTest.php @@ -28,17 +28,17 @@ class SimpletestPhpunitRunCommandTest extends \PHPUnit_Framework_TestCase { * * @var Drupal\Core\DependencyInjection\ContainerBuilder */ - protected $fixture_container; + protected $fixtureContainer; public function setUp() { include_once __DIR__ .'/../../fixtures/simpletest_phpunit_run_command_test.php'; $app_root = __DIR__ . '/../../../../../..'; include_once "$app_root/core/modules/simpletest/simpletest.module"; - $this->fixture_container = new ContainerBuilder; - $this->fixture_container->set('app.root', $app_root); + $this->fixtureContainer = new ContainerBuilder; + $this->fixtureContainer->set('app.root', $app_root); $file_system = $this->prophesize('Drupal\Core\File\FileSystemInterface'); $file_system->realpath('public://simpletest')->willReturn(sys_get_temp_dir()); - $this->fixture_container->set('file_system', $file_system->reveal()); + $this->fixtureContainer->set('file_system', $file_system->reveal()); } /** @@ -50,7 +50,7 @@ public function setUp() { */ public function testSimpletestPhpUnitRunCommandBackwardsCompatibility() { $test_id = 77; - \Drupal::setContainer($this->fixture_container); + \Drupal::setContainer($this->fixtureContainer); foreach (['pass', 'fail'] as $status) { putenv('SimpletestPhpunitRunCommandTestWillDie=' . $status); $ret = simpletest_run_phpunit_tests($test_id++, ['Drupal\Tests\simpletest\Unit\SimpletestPhpunitRunCommandTestWillDie']); @@ -69,7 +69,7 @@ public function testSimpletestPhpUnitRunCommandBackwardsCompatibility() { */ public function testSimpletestPhpUnitRunCommand() { $test_id = 23; - $runner = PhpUnitTestRunner::create($this->fixture_container); + $runner = PhpUnitTestRunner::create($this->fixtureContainer); foreach (['pass', 'fail'] as $status) { putenv('SimpletestPhpunitRunCommandTestWillDie=' . $status); $ret = $runner->runTests($test_id++, ['Drupal\Tests\simpletest\Unit\SimpletestPhpunitRunCommandTestWillDie']);