diff --git a/core/includes/install.inc b/core/includes/install.inc
index c5b93b58a6..5c0abcab8e 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/Component/Diff/Diff.php b/core/lib/Drupal/Component/Diff/Diff.php
index d9042bcca7..c70c417a8c 100644
--- a/core/lib/Drupal/Component/Diff/Diff.php
+++ b/core/lib/Drupal/Component/Diff/Diff.php
@@ -44,8 +44,8 @@ public function __construct($from_lines, $to_lines) {
*
* $diff = new Diff($lines1, $lines2);
* $rev = $diff->reverse();
- * @return object A Diff object representing the inverse of the
- * original diff.
+ * @return object
+ * A Diff object representing the inverse of the original diff.
*/
public function reverse() {
$rev = $this;
diff --git a/core/lib/Drupal/Core/Command/DbDumpCommand.php b/core/lib/Drupal/Core/Command/DbDumpCommand.php
index 264bd3f2a1..aa81af041f 100644
--- a/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -69,7 +69,7 @@ protected function execute(InputInterface $input, OutputInterface $output) {
* 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 @@ protected function generateScript(Connection $connection, array $schema_only = [
*
* @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/lib/Drupal/Core/Routing/RouteProvider.php b/core/lib/Drupal/Core/Routing/RouteProvider.php
index 5d92e77e0f..bdeb563cd1 100644
--- a/core/lib/Drupal/Core/Routing/RouteProvider.php
+++ b/core/lib/Drupal/Core/Routing/RouteProvider.php
@@ -138,11 +138,11 @@ public function __construct(Connection $connection, StateInterface $state, Curre
* @param Request $request
* A request against which to match.
*
- * @return \Symfony\Component\Routing\RouteCollection with all urls that
- * could potentially match $request. Empty collection if nothing can
- * match. The collection will be sorted from highest to lowest fit (match
- * of path parts) and then in ascending order by route name for routes
- * with the same fit.
+ * @return \Symfony\Component\Routing\RouteCollection
+ * RouteCollection with all urls that could potentially match $request.
+ * Empty collection if nothing can match. The collection will be sorted from
+ * highest to lowest fit (match of path parts) and then in ascending order
+ * by route name for routes with the same fit.
*/
public function getRouteCollectionForRequest(Request $request) {
// Cache both the system path as well as route parameters and matching
diff --git a/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php b/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php
index c3dabe419a..708b9ab13e 100644
--- a/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php
+++ b/core/modules/hal/src/LinkManager/TypeLinkManagerInterface.php
@@ -31,7 +31,7 @@ public function getTypeUri($entity_type, $bundle, $context = []);
* @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 62e6bbc687..450c552919 100644
--- a/core/modules/user/src/Tests/RestRegisterUserTest.php
+++ b/core/modules/user/src/Tests/RestRegisterUserTest.php
@@ -117,7 +117,7 @@ public function testRegisterUser() {
* @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 09dfebcecb..d01ad62ece 100644
--- a/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
+++ b/core/modules/user/tests/src/Functional/UserLoginHttpTest.php
@@ -64,7 +64,7 @@ protected function setUp() {
* @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 @@ public function testPerUserLoginFloodControl() {
* @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 c89554a77c..fce0b0891d 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 @@ public function testOnAlterRoutes() {
/**
* 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[]
+ * 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 a593e62c7d..f4ca672677 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -62,7 +62,6 @@
-