Skip to content

Commit 5f75c16

Browse files
committed
phpcs-fixer: phpdoc_trim_consecutive_blank_line_separation
- see https://cs.symfony.com/doc/rules/phpdoc/phpdoc_trim_consecutive_blank_line_separation.html
1 parent 95acf1b commit 5f75c16

File tree

43 files changed

+2
-74
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+2
-74
lines changed

.php-cs-fixer.dist.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
'phpdoc_param_order' => true,
2323
// PHPDoc should start and end with content, excluding the very first and last line of the docblocks.
2424
'phpdoc_trim' => true,
25+
// Removes extra blank lines after summary and after description in PHPDoc.
26+
'phpdoc_trim_consecutive_blank_line_separation' => true,
2527
// Single line @var PHPDoc should have proper spacing.
2628
'phpdoc_single_line_var_spacing' => true,
2729
// Sorts PHPDoc types.

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Composite/Fieldset/Options.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ public function __construct()
2727
/**
2828
* Get option html block
2929
*
30-
*
3130
* @return string
3231
*/
3332
public function getOptionHtml(Mage_Catalog_Model_Product_Option $option)

app/code/core/Mage/Adminhtml/Block/Catalog/Product/Helper/Form/Gallery.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ public function getDataObject()
134134
/**
135135
* Retrieve attribute field name
136136
*
137-
*
138137
* @param Mage_Catalog_Model_Resource_Eav_Attribute $attribute
139138
* @return string
140139
*/

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Giftmessage/Form.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ public function _prepareForm()
162162
* Prepare form fieldset
163163
* All fields are hidden
164164
*
165-
*
166165
* @return $this
167166
*/
168167
protected function _prepareHiddenFields(Varien_Data_Form_Element_Fieldset $fieldset)
@@ -196,7 +195,6 @@ protected function _prepareHiddenFields(Varien_Data_Form_Element_Fieldset $field
196195
* Prepare form fieldset
197196
* All fields are visible
198197
*
199-
*
200198
* @return $this
201199
*/
202200
protected function _prepareVisibleFields(Varien_Data_Form_Element_Fieldset $fieldset)

app/code/core/Mage/Adminhtml/Block/Widget/Container.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class Mage_Adminhtml_Block_Widget_Container extends Mage_Adminhtml_Block_Templat
2424
/**
2525
* Array of buttons
2626
*
27-
*
2827
* @var array
2928
*/
3029
protected $_buttons = [

app/code/core/Mage/Adminhtml/Block/Widget/Grid/Serializer.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ public function getDataAsJSON()
8686
* Get serialize data to manage it (called specified method, that return data to manage)
8787
* Also use reload param name for saving grid checked boxes states
8888
*
89-
*
9089
* @param Mage_Adminhtml_Block_Widget_Grid|string $grid grid object or grid block name
9190
* @param string $callback block method to retrieve data to serialize
9291
* @param string $hiddenInputName hidden input name where serialized data will be store

app/code/core/Mage/Api/Model/Server/Handler/Abstract.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ protected function _instaLogin(&$sessionId)
101101
/**
102102
* Check current user permission on resource and privilege
103103
*
104-
*
105104
* @param string $resource
106105
* @param string $privilege
107106
* @return bool

app/code/core/Mage/Api/Model/Session.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,6 @@ public function refreshAcl($user = null)
177177
/**
178178
* Check current user permission on resource and privilege
179179
*
180-
*
181180
* @param string $resource
182181
* @param string $privilege
183182
* @return bool

app/code/core/Mage/Authorizenet/Model/Directpost.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,7 +535,6 @@ protected function _matchAmount($amount)
535535
* Operate with order using information from Authorize.net.
536536
* Authorize order or authorize and capture it.
537537
*
538-
*
539538
* @throws Exception
540539
*/
541540
protected function _authOrder(Mage_Sales_Model_Order $order)

app/code/core/Mage/Bundle/Model/Option.php

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,6 @@ public function getDefaultSelection()
107107
}
108108

109109
return $this->_defaultSelection;
110-
/**
111-
* if (!$this->_defaultSelection && $this->getSelections()) {
112-
$_selections = array();
113-
foreach ($this->getSelections() as $selection) {
114-
if ($selection->getIsDefault()) {
115-
$_selections[] = $selection;
116-
}
117-
}
118-
if (!empty($_selections)) {
119-
$this->_defaultSelection = $_selections;
120-
} else {
121-
return null;
122-
}
123-
}
124-
return $this->_defaultSelection;
125-
*/
126110
}
127111

128112
/**

0 commit comments

Comments
 (0)