From fea00575f03db3e9f8335289f52fb342e95d7bc0 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Fri, 9 Sep 2016 16:22:14 -0500
Subject: [PATCH] Revert "Issue #2793443 by dawehner: Make private functions
protected in BrowserTestBase/KernelTestBase"
This reverts commit bde190669e47834fa6d6ab2343d813b4e030496a.
---
core/tests/Drupal/KernelTests/KernelTestBase.php | 10 +++++-----
core/tests/Drupal/Tests/BrowserTestBase.php | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index 72f0b169c902..0146607aa6fb 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -131,7 +131,7 @@ abstract class KernelTestBase extends \PHPUnit_Framework_TestCase implements Ser
/**
* @var \Drupal\Core\DependencyInjection\ContainerBuilder
*/
- protected static $initialContainerBuilder;
+ private static $initialContainerBuilder;
/**
* Modules to enable.
@@ -319,7 +319,7 @@ public function getDatabasePrefix() {
/**
* Bootstraps a kernel for a test.
*/
- protected function bootKernel() {
+ private function bootKernel() {
$this->setSetting('container_yamls', []);
// Allow for test-specific overrides.
$settings_services_file = $this->root . '/sites/default' . '/testing.services.yml';
@@ -501,7 +501,7 @@ protected function getDatabaseConnectionInfo() {
* @return \Drupal\Core\DependencyInjection\ContainerBuilder
* A clone of the precompiled, empty service container.
*/
- protected function getCompiledContainerBuilder(array $modules) {
+ private function getCompiledContainerBuilder(array $modules) {
if (!isset(self::$initialContainerBuilder)) {
$kernel = new DrupalKernel('testing', $this->classLoader, FALSE);
$kernel->setSitePath($this->siteDirectory);
@@ -567,7 +567,7 @@ protected function initFileCache() {
* @see \Drupal\Tests\KernelTestBase::enableModules()
* @see \Drupal\Core\Extension\ModuleHandler::add()
*/
- protected function getExtensionsForModules(array $modules) {
+ private function getExtensionsForModules(array $modules) {
$extensions = array();
$discovery = new ExtensionDiscovery($this->root);
$discovery->setProfileDirectories(array());
@@ -1031,7 +1031,7 @@ protected function vfsDump() {
*
* @return array
*/
- protected static function getModulesToEnable($class) {
+ private static function getModulesToEnable($class) {
$modules = array();
while ($class) {
if (property_exists($class, 'modules')) {
diff --git a/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
index 79390697ef12..ea88906dc5ab 100644
--- a/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -1200,7 +1200,7 @@ protected function installParameters() {
* @see drupal_valid_test_ua()
* @see BrowserTestBase::prepareEnvironment()
*/
- protected function prepareDatabasePrefix() {
+ private function prepareDatabasePrefix() {
// Ensure that the generated test site directory does not exist already,
// which may happen with a large amount of concurrent threads and
// long-running tests.
@@ -1216,7 +1216,7 @@ protected function prepareDatabasePrefix() {
*
* @see BrowserTestBase::prepareEnvironment()
*/
- protected function changeDatabasePrefix() {
+ private function changeDatabasePrefix() {
if (empty($this->databasePrefix)) {
$this->prepareDatabasePrefix();
}
--
GitLab