Skip to content

Commit 5c54b69

Browse files
committed
minor symfony#12993 [2.3] Docblocks should not be followed by a blank line (GrahamCampbell)
This PR was squashed before being merged into the 2.3 branch (closes symfony#12993). Discussion ---------- [2.3] Docblocks should not be followed by a blank line | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | N/A | License | MIT | Doc PR | N/A There should be no blank line(s) between phpdocs that document properties, interfaces, classes, functions, or traits. This pull request was a test run of a new php-cs-fixer: PHP-CS-Fixer/PHP-CS-Fixer#864. Commits ------- 4e7ba1b [2.3] Docblocks should not be followed by a blank line
2 parents 206ebc7 + 4e7ba1b commit 5c54b69

File tree

4 files changed

+1
-4
lines changed

4 files changed

+1
-4
lines changed

src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ private function configureDbalAclProvider(array $config, ContainerBuilder $conta
155155
* @param array $config An array of configuration settings
156156
* @param ContainerBuilder $container A ContainerBuilder instance
157157
*/
158-
159158
private function createRoleHierarchy($config, ContainerBuilder $container)
160159
{
161160
if (!isset($config['role_hierarchy'])) {

src/Symfony/Component/HttpFoundation/BinaryFileResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the Symfony package.
55
*
66
* (c) Fabien Potencier <[email protected]>

src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*
1717
* @see http://php.net/sessionhandler
1818
*/
19-
2019
if (PHP_VERSION_ID >= 50400) {
2120
class NativeSessionHandler extends \SessionHandler
2221
{

src/Symfony/Component/Process/Tests/NonStopableProcess.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
*
88
* @example `php NonStopableProcess.php 42` will run the script for 42 seconds
99
*/
10-
1110
function handleSignal($signal)
1211
{
1312
switch ($signal) {

0 commit comments

Comments
 (0)