diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStreamTrait.php b/core/lib/Drupal/Core/StreamWrapper/LocalStreamTrait.php index 141f3303a8..40c56c0bb7 100644 --- a/core/lib/Drupal/Core/StreamWrapper/LocalStreamTrait.php +++ b/core/lib/Drupal/Core/StreamWrapper/LocalStreamTrait.php @@ -66,5 +66,4 @@ protected function getTarget($uri = NULL) { return trim($uri_parts[1], '\/'); } - } diff --git a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperBase.php b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperBase.php index 9bea1adc50..366a2f11d7 100644 --- a/core/lib/Drupal/Core/StreamWrapper/StreamWrapperBase.php +++ b/core/lib/Drupal/Core/StreamWrapper/StreamWrapperBase.php @@ -33,7 +33,7 @@ /** * {@inheritdoc} */ - function setUri($uri) { + public function setUri($uri) { if (strpos($uri, '://') === FALSE) { // The delimiter ('://') was not found in $uri, malformed $uri passed. throw new \InvalidArgumentException("Malformed uri parameter passed: {$this->uri}"); @@ -44,7 +44,7 @@ function setUri($uri) { /** * {@inheritdoc} */ - function getUri() { + public function getUri() { return $this->uri; } diff --git a/core/modules/system/tests/src/Kernel/File/ExtensionStreamTest.php b/core/modules/system/tests/src/Kernel/File/ExtensionStreamTest.php index 6b867739bb..e3a625563b 100644 --- a/core/modules/system/tests/src/Kernel/File/ExtensionStreamTest.php +++ b/core/modules/system/tests/src/Kernel/File/ExtensionStreamTest.php @@ -57,7 +57,7 @@ public function setUp() { $system_module_files += ['minimal' => 'core/profiles/minimal/minimal.info.yml']; $state->set('system.module.files', $system_module_files); // Add default profile for the purposes of this test. - new Settings(Settings::getAll() + ['install_profile' => 'minimal']); + new Settings(Settings::getAll() + ['install_profile' => 'minimal']); $this->config('core.extension')->set('module.minimal', 0)->save(); $this->container->get('module_handler')->addProfile('minimal', 'core/profiles/minimal'); @@ -136,7 +136,7 @@ public function testStreamWrapperMethods($uri, $dirname, $realpath, $getExternal $case = compact('dirname', 'realpath', 'getExternalUrl'); foreach ($case as $method => $expected) { - list($scheme, ) = explode('://', $uri); + list($scheme,) = explode('://', $uri); $this->streamWrappers[$scheme]->setUri($uri); if ($expected instanceof \InvalidArgumentException || $expected instanceof \RuntimeException) { /** @var \Exception $expected */ @@ -153,7 +153,7 @@ public function testStreamWrapperMethods($uri, $dirname, $realpath, $getExternal } } elseif (is_string($expected)) { - $this->assertSame($expected, $this->streamWrappers[$scheme]->$method()); + $this->assertSame($expected, $this->streamWrappers[$scheme]->$method()); } } }