From 47fcaa0974fa7cfeec62c66ed21ec87d96245c30 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 4 Nov 2016 06:57:30 +0000
Subject: [PATCH] Issue #2824727 by martin107: Malformed inheritdoc prevents
Pharborist scripts from working
---
core/lib/Drupal/Component/Datetime/Time.php | 8 ++++----
.../InstallerConfigDirectorySetNoDirectoryErrorTest.php | 2 +-
.../Installer/InstallerDatabaseErrorMessagesTest.php | 4 ++--
.../src/Tests/Installer/InstallerTranslationTest.php | 2 +-
.../modules/entity_test/src/Entity/EntityTestNoLabel.php | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/core/lib/Drupal/Component/Datetime/Time.php b/core/lib/Drupal/Component/Datetime/Time.php
index cc6f2a29dbd9..77da2e2c1f5e 100644
--- a/core/lib/Drupal/Component/Datetime/Time.php
+++ b/core/lib/Drupal/Component/Datetime/Time.php
@@ -27,28 +27,28 @@ public function __construct(RequestStack $request_stack) {
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
public function getRequestTime() {
return $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME');
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
public function getRequestMicroTime() {
return $this->requestStack->getCurrentRequest()->server->get('REQUEST_TIME_FLOAT');
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
public function getCurrentTime() {
return time();
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
public function getCurrentMicroTime() {
return microtime(TRUE);
diff --git a/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php b/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
index dbb15be523f3..eb50a0d88b3d 100644
--- a/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerConfigDirectorySetNoDirectoryErrorTest.php
@@ -44,7 +44,7 @@ protected function setUpSettings() {
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
protected function setUpSite() {
// This step should not appear as we had a failure prior to the settings
diff --git a/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php b/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php
index 32829c83398c..c98a5de0b739 100644
--- a/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerDatabaseErrorMessagesTest.php
@@ -13,7 +13,7 @@
class InstallerDatabaseErrorMessagesTest extends InstallerTestBase {
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
protected function setUpSettings() {
// We are creating a table here to force an error in the installer because
@@ -25,7 +25,7 @@ protected function setUpSettings() {
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
protected function setUpSite() {
// This step should not appear as we had a failure on the settings screen.
diff --git a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
index 330d61ff6bf8..fd6e0019b0a5 100644
--- a/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerTranslationTest.php
@@ -42,7 +42,7 @@ protected function setUpLanguage() {
}
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
protected function setUpSettings() {
// We are creating a table here to force an error in the installer because
diff --git a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php
index b339f5b85549..fb69ccb34b14 100644
--- a/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php
+++ b/core/modules/system/tests/modules/entity_test/src/Entity/EntityTestNoLabel.php
@@ -19,7 +19,7 @@
class EntityTestNoLabel extends EntityTest {
/**
- * @{inheritdoc}
+ * {@inheritdoc}
*/
public function label() {
return $this->getName();
--
GitLab