diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index d081d19..5f7c64f 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -819,7 +819,7 @@ function drupal_classloader_register($name, $path) {
  *
  * @see drupal_static_reset()
  *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.0.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 9.0.0.
  *   Use \Drupal\Component\Utility\StaticStorage::get().
  */
 function &drupal_static($name, $default_value = NULL) {
@@ -833,7 +833,7 @@ function &drupal_static($name, $default_value = NULL) {
  * @param $name
  *   Name of the static variable to reset. Omit to reset all variables.
  *
- * @deprecated in Drupal 8.x-dev, will be removed before Drupal 8.0.0.
+ * @deprecated in Drupal 8.x-dev, will be removed before Drupal 9.0.0.
  *   Use \Drupal\Component\Utility\StaticStorage::reset().
  */
 function drupal_static_reset($name = NULL) {
diff --git a/core/tests/Drupal/Tests/Component/Utility/StaticStorageTest.php b/core/tests/Drupal/Tests/Component/Utility/StaticStorageTest.php
index 7784bb0..c1e780e 100644
--- a/core/tests/Drupal/Tests/Component/Utility/StaticStorageTest.php
+++ b/core/tests/Drupal/Tests/Component/Utility/StaticStorageTest.php
@@ -23,7 +23,7 @@ class StaticStorageTest extends UnitTestCase {
   protected function tearDown() {
     parent::tearDown();
     $empty = &StaticStorage::get(NULL);
-    $empty = array();
+    $empty = [];
   }
 
   /**
@@ -51,12 +51,12 @@ public function testGetRepeated() {
    */
   public function testGetNull() {
     $var1 = &StaticStorage::get(NULL);
-    $this->assertSame(array(), $var1);
+    $this->assertSame([], $var1);
 
     $var2 = &StaticStorage::get(__METHOD__, 'foo');
-    $expected = array(
+    $expected = [
       __METHOD__ => $var2,
-    );
+    ];
     $this->assertSame($expected, $var1);
   }