summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathaniel Catchpole2017-08-22 07:16:08 (GMT)
committerNathaniel Catchpole2017-08-22 07:16:08 (GMT)
commit98c68fdbfda59dacdfc31ec6a32409f620adf38d (patch)
tree473a9db879b76fb711f79e583f5fd3da6b8c67cd
parent0846b231efc25ed21ea5ccc202659812d94177df (diff)
Issue #2803891 by Jo Fitzgerald, pfrenssen, mfernea, gaurav.kapoor: Fix 'Drupal.Commenting.FunctionComment.ReturnTypeSpaces' coding standard
-rw-r--r--core/includes/install.inc7
-rw-r--r--core/lib/Drupal/Core/Command/DbDumpCommand.php4
-rw-r--r--core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php2
-rw-r--r--core/modules/user/src/Tests/RestRegisterUserTest.php2
-rw-r--r--core/modules/user/tests/src/Functional/UserLoginHttpTest.php4
-rw-r--r--core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php4
-rw-r--r--core/phpcs.xml.dist1
7 files changed, 12 insertions, 12 deletions
diff --git a/core/includes/install.inc b/core/includes/install.inc
index c5b93b5..5c0abca 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -114,9 +114,10 @@ function drupal_install_profile_distribution_name() {
/**
* Loads the installation profile, extracting its defined version.
*
- * @return string Distribution version defined in the profile's .info.yml file.
- * Defaults to \Drupal::VERSION if no version is explicitly provided
- * by the installation profile.
+ * @return string
+ * Distribution version defined in the profile's .info.yml file.
+ * Defaults to \Drupal::VERSION if no version is explicitly provided by the
+ * installation profile.
*
* @see install_profile_info()
*/
diff --git a/core/lib/Drupal/Core/Command/DbDumpCommand.php b/core/lib/Drupal/Core/Command/DbDumpCommand.php
index 264bd3f..aa81af0 100644
--- a/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -69,7 +69,7 @@ class DbDumpCommand extends DbCommandBase {
* The database connection to use.
* @param array $schema_only
* Table patterns for which to only dump the schema, no data.
- * @return string The PHP script.
+ * @return string
* The PHP script.
*/
protected function generateScript(Connection $connection, array $schema_only = []) {
@@ -102,7 +102,7 @@ class DbDumpCommand extends DbCommandBase {
*
* @param \Drupal\Core\Database\Connection $connection
* The database connection to use.
- * @return array An array of table names.
+ * @return array
* An array of table names.
*/
protected function getTables(Connection $connection) {
diff --git a/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php b/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php
index c3dabe4..708b9ab 100644
--- a/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php
+++ b/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php
@@ -31,7 +31,7 @@ interface TypeLinkManagerInterface extends ConfigurableLinkManagerInterface {
* @param array $context
* Context from the normalizer/serializer operation.
*
- * @return array | boolean
+ * @return array|bool
* If the URI matches a bundle, returns an array containing entity_type and
* bundle. Otherwise, returns false.
*/
diff --git a/core/modules/user/src/Tests/RestRegisterUserTest.php b/core/modules/user/src/Tests/RestRegisterUserTest.php
index 62e6bbc..450c552 100644
--- a/core/modules/user/src/Tests/RestRegisterUserTest.php
+++ b/core/modules/user/src/Tests/RestRegisterUserTest.php
@@ -117,7 +117,7 @@ class RestRegisterUserTest extends RESTTestBase {
* @param bool $include_password
* Whether to include a password in the user values.
*
- * @return string Serialized user values.
+ * @return string
* Serialized user values.
*/
protected function createSerializedUser($name, $include_password = TRUE) {
diff --git a/core/modules/user/tests/src/Functional/UserLoginHttpTest.php b/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
index 09dfebc..d01ad62 100644
--- a/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
+++ b/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
@@ -64,7 +64,7 @@ class UserLoginHttpTest extends BrowserTestBase {
* @param string $format
* The format to use to make the request.
*
- * @return \Psr\Http\Message\ResponseInterface The HTTP response.
+ * @return \Psr\Http\Message\ResponseInterface
* The HTTP response.
*/
protected function loginRequest($name, $pass, $format = 'json') {
@@ -395,7 +395,7 @@ class UserLoginHttpTest extends BrowserTestBase {
* @param string $logout_token
* The csrf token for user logout.
*
- * @return \Psr\Http\Message\ResponseInterface The HTTP response.
+ * @return \Psr\Http\Message\ResponseInterface
* The HTTP response.
*/
protected function logoutRequest($format = 'json', $logout_token = '') {
diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index c89554a..76f0cd8 100644
--- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -139,8 +139,8 @@ class RouteSubscriberTest extends UnitTestCase {
/**
* Sets up mocks of Views objects needed for testing.
*
- * @return array \Drupal\views\Plugin\views\display\DisplayRouterInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
- * An array of two mocked view displays
+ * @return \Drupal\views\Plugin\views\display\DisplayRouterInterface[]|\PHPUnit_Framework_MockObject_MockObject[]
+ * An array of two mocked view displays.
*/
protected function setupMocks() {
$executable = $this->getMockBuilder('Drupal\views\ViewExecutable')
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 5b41b69..67e47e1 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -60,7 +60,6 @@
<exclude name="Drupal.Commenting.FunctionComment.ParamMissingDefinition"/>
<exclude name="Drupal.Commenting.FunctionComment.ParamNameNoMatch"/>
<exclude name="Drupal.Commenting.FunctionComment.ParamTypeSpaces"/>
- <exclude name="Drupal.Commenting.FunctionComment.ReturnTypeSpaces"/>
<exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
</rule>
<rule ref="../vendor/drupal/coder/coder_sniffer/Drupal/Sniffs/ControlStructures/ElseIfSniff.php"/>