diff --git a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php index 9a041f1..0cc285c 100644 --- a/core/lib/Drupal/Core/StreamWrapper/LocalStream.php +++ b/core/lib/Drupal/Core/StreamWrapper/LocalStream.php @@ -339,18 +339,14 @@ public function stream_close() { } /** - * Signal that stream_select is not supported by returning false. - * - * Fixes warnings messages like this: - * finfo::file() [finfo.file]: Drupal\Core\StreamWrapper\PrivateStream::stream_cast is not implemented! + * Signals that stream_select() is not supported by returning false. * * @param int - * Can be STREAM_CAST_FOR_SELECT or STREAM_CAST_AS_STREAM + * Can be STREAM_CAST_FOR_SELECT or STREAM_CAST_AS_STREAM. * - * @return bool false + * @return false * - * @see http://drupal.org/node/1561362 - * @see: http://php.net/manual/en/streamwrapper.stream-cast.php + * @see http://php.net/manual/en/streamwrapper.stream-cast.php */ public function stream_cast($cast_as) { return false; diff --git a/core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php b/core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php index 987be11..07ea3fb 100644 --- a/core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php +++ b/core/modules/image/lib/Drupal/image/Tests/ImageStylesPathAndUrlTest.php @@ -150,8 +150,7 @@ function _testImageStyleUrlAndPath($scheme, $clean_url = TRUE, $extra_slash = FA $this->assertEqual($this->drupalGetHeader('Content-Length'), $generated_image_info['file_size'], 'Expected Content-Length was reported.'); if ($scheme == 'private') { $this->assertEqual($this->drupalGetHeader('Expires'), 'Sun, 19 Nov 1978 05:00:00 GMT', 'Expires header was sent.'); - // Checking that the 'Cache-Control' header contains 'no-cache' - $this->assertNotEqual(strpos($this->drupalGetHeader('Cache-Control'), 'no-cache'), FALSE, 'Cache-Control header was set to prevent caching.'); + $this->assertNotEqual(strpos($this->drupalGetHeader('Cache-Control'), 'no-cache'), FALSE, 'Cache-Control header contains \'no-cache\' to prevent caching.'); $this->assertEqual($this->drupalGetHeader('X-Image-Owned-By'), 'image_module_test', 'Expected custom header has been added.'); // Make sure that a second request to the already existing derivate works