Skip to content

Commit b6e2a77

Browse files
author
Stanislav Idolov
committed
magento-engcom/magento2ce#2193: Fixed static test failures
1 parent e5b60a5 commit b6e2a77

File tree

20 files changed

+132
-64
lines changed

20 files changed

+132
-64
lines changed

app/code/Magento/Backend/Block/Widget/Button/ButtonList.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
namespace Magento\Backend\Block\Widget\Button;
88

99
/**
10+
* Button list widget
11+
*
1012
* @api
1113
* @since 100.0.2
1214
*/

app/code/Magento/Config/Model/Config/Structure/Mapper/Sorting.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
namespace Magento\Config\Model\Config\Structure\Mapper;
1111

1212
/**
13+
* Sorting mapper
14+
*
1315
* @api
1416
* @since 100.0.2
1517
*/
@@ -30,6 +32,8 @@ public function map(array $data)
3032
}
3133

3234
/**
35+
* Process config
36+
*
3337
* @param array $data
3438
* @return array
3539
*/

app/code/Magento/Deploy/Model/DeploymentConfig/ImporterPool.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ public function __construct(
110110
}
111111

112112
/**
113+
* Retrieves sections names
114+
*
113115
* Retrieves names of sections for configuration files whose data is read from these files for import
114116
* to appropriate application sources.
115117
*

app/code/Magento/Sales/Block/Adminhtml/Order/View/Tab/History.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ public function getOrder()
6161

6262
/**
6363
* Compose and get order full history.
64+
*
6465
* Consists of the status history comments as well as of invoices, shipments and creditmemos creations
6566
*
6667
* @TODO This method requires refactoring. Need to create separate model for comment history handling
@@ -218,15 +219,15 @@ protected function _prepareHistoryItem($label, $notified, $created, $comment = '
218219
}
219220

220221
/**
221-
* {@inheritdoc}
222+
* @inheritdoc
222223
*/
223224
public function getTabLabel()
224225
{
225226
return __('Comments History');
226227
}
227228

228229
/**
229-
* {@inheritdoc}
230+
* @inheritdoc
230231
*/
231232
public function getTabTitle()
232233
{
@@ -264,15 +265,15 @@ public function getTabUrl()
264265
}
265266

266267
/**
267-
* {@inheritdoc}
268+
* @inheritdoc
268269
*/
269270
public function canShowTab()
270271
{
271272
return true;
272273
}
273274

274275
/**
275-
* {@inheritdoc}
276+
* @inheritdoc
276277
*/
277278
public function isHidden()
278279
{

app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,7 @@ public function __construct(
158158
}
159159

160160
/**
161-
* Returns the total width in points of the string using the specified font and
162-
* size.
161+
* Returns the total width in points of the string using the specified font and size.
163162
*
164163
* This is not the most efficient way to perform this calculation. I'm
165164
* concentrating optimization efforts on the upcoming layout manager class.
@@ -230,7 +229,7 @@ public function getAlignCenter($string, $x, $columnWidth, \Zend_Pdf_Resource_Fon
230229
* Insert logo to pdf page
231230
*
232231
* @param \Zend_Pdf_Page &$page
233-
* @param null $store
232+
* @param string|null $store
234233
* @return void
235234
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
236235
*/
@@ -285,7 +284,7 @@ protected function insertLogo(&$page, $store = null)
285284
* Insert address to pdf page
286285
*
287286
* @param \Zend_Pdf_Page &$page
288-
* @param null $store
287+
* @param string|null $store
289288
* @return void
290289
*/
291290
protected function insertAddress(&$page, $store = null)

app/code/Magento/WebapiAsync/Controller/Rest/Asynchronous/InputParamsResolver.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ public function resolve()
110110
}
111111

112112
/**
113+
* Returns route.
114+
*
113115
* @return \Magento\Webapi\Controller\Rest\Router\Route
114116
*/
115117
public function getRoute()
@@ -118,8 +120,7 @@ public function getRoute()
118120
}
119121

120122
/**
121-
* Convert the input array from key-value format to a list of parameters
122-
* suitable for the specified class / method.
123+
* Convert the input array from key-value format to a list of parameters suitable for the specified class / method.
123124
*
124125
* Instead of \Magento\Webapi\Controller\Rest\InputParamsResolver
125126
* we don't need to merge body params with url params and use only body params

lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,7 @@ protected function _checkDdlTransaction($sql)
515515

516516
/**
517517
* Special handling for PDO query().
518+
*
518519
* All bind parameter names must begin with ':'.
519520
*
520521
* @param string|\Magento\Framework\DB\Select $sql The SQL statement with placeholders.
@@ -595,6 +596,7 @@ protected function _query($sql, $bind = [])
595596

596597
/**
597598
* Special handling for PDO query().
599+
*
598600
* All bind parameter names must begin with ':'.
599601
*
600602
* @param string|\Magento\Framework\DB\Select $sql The SQL statement with placeholders.
@@ -615,9 +617,10 @@ public function query($sql, $bind = [])
615617
}
616618

617619
/**
620+
* Allows multiple queries
621+
*
618622
* Allows multiple queries -- to safeguard against SQL injection, USE CAUTION and verify that input
619623
* cannot be tampered with.
620-
*
621624
* Special handling for PDO query().
622625
* All bind parameter names must begin with ':'.
623626
*
@@ -1278,6 +1281,7 @@ public function getForeignKeysTree()
12781281

12791282
/**
12801283
* Modify tables, used for upgrade process
1284+
*
12811285
* Change columns definitions, reset foreign keys, change tables comments and engines.
12821286
*
12831287
* The value of each array element is an associative array
@@ -1469,9 +1473,9 @@ public function select()
14691473
*
14701474
* Method revrited for handle empty arrays in value param
14711475
*
1472-
* @param string $text The text with a placeholder.
1473-
* @param mixed $value The value to quote.
1474-
* @param string $type OPTIONAL SQL datatype
1476+
* @param string $text The text with a placeholder.
1477+
* @param mixed $value The value to quote.
1478+
* @param string $type OPTIONAL SQL datatype
14751479
* @param integer $count OPTIONAL count of placeholders to replace
14761480
* @return string An SQL-safe quoted value placed into the orignal text.
14771481
*/
@@ -1514,6 +1518,7 @@ protected function _getCacheId($tableKey, $ddlType)
15141518

15151519
/**
15161520
* Load DDL data from cache
1521+
*
15171522
* Return false if cache does not exists
15181523
*
15191524
* @param string $tableCacheKey the table cache key
@@ -1568,7 +1573,8 @@ public function saveDdlCache($tableCacheKey, $ddlType, $data)
15681573

15691574
/**
15701575
* Reset cached DDL data from cache
1571-
* if table name is null - reset all cached DDL data
1576+
*
1577+
* If table name is null - reset all cached DDL data
15721578
*
15731579
* @param string $tableName
15741580
* @param string $schemaName OPTIONAL
@@ -1605,6 +1611,7 @@ public function resetDdlCache($tableName = null, $schemaName = null)
16051611

16061612
/**
16071613
* Disallow DDL caching
1614+
*
16081615
* @return $this
16091616
*/
16101617
public function disallowDdlCache()
@@ -1615,6 +1622,7 @@ public function disallowDdlCache()
16151622

16161623
/**
16171624
* Allow DDL caching
1625+
*
16181626
* @return $this
16191627
*/
16201628
public function allowDdlCache()
@@ -1675,9 +1683,10 @@ public function describeTable($tableName, $schemaName = null)
16751683

16761684
/**
16771685
* Format described column to definition, ready to be added to ddl table.
1686+
*
16781687
* Return array with keys: name, type, length, options, comment
16791688
*
1680-
* @param array $columnData
1689+
* @param array $columnData
16811690
* @return array
16821691
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
16831692
* @SuppressWarnings(PHPMD.NPathComplexity)
@@ -1892,6 +1901,7 @@ public function changeTableComment($tableName, $comment, $schemaName = null)
18921901

18931902
/**
18941903
* Inserts a table row with specified data
1904+
*
18951905
* Special for Zero values to identity column
18961906
*
18971907
* @param string $table
@@ -2782,6 +2792,7 @@ public function dropIndex($tableName, $keyName, $schemaName = null)
27822792

27832793
/**
27842794
* Add new Foreign Key to table
2795+
*
27852796
* If Foreign Key with same name is exist - it will be deleted
27862797
*
27872798
* @param string $fkName
@@ -3016,6 +3027,7 @@ protected function _transformStringSqlCondition($conditionKey, $value)
30163027

30173028
/**
30183029
* Prepare value for save in column
3030+
*
30193031
* Return converted to column data type value
30203032
*
30213033
* @param array $column the column describe array
@@ -3139,6 +3151,8 @@ public function getIfNullSql($expression, $value = 0)
31393151
}
31403152

31413153
/**
3154+
* Generates case SQL fragment
3155+
*
31423156
* Generate fragment of SQL, that check value against multiple condition cases
31433157
* and return different result depends on them
31443158
*
@@ -3163,6 +3177,7 @@ public function getCaseSql($valueName, $casesResults, $defaultValue = null)
31633177

31643178
/**
31653179
* Generate fragment of SQL, that combine together (concatenate) the results from data array
3180+
*
31663181
* All arguments in data must be quoted
31673182
*
31683183
* @param string[] $data
@@ -3177,6 +3192,7 @@ public function getConcatSql(array $data, $separator = null)
31773192

31783193
/**
31793194
* Generate fragment of SQL that returns length of character string
3195+
*
31803196
* The string argument must be quoted
31813197
*
31823198
* @param string $string
@@ -3188,6 +3204,8 @@ public function getLengthSql($string)
31883204
}
31893205

31903206
/**
3207+
* Generate least SQL fragment
3208+
*
31913209
* Generate fragment of SQL, that compare with two or more arguments, and returns the smallest
31923210
* (minimum-valued) argument
31933211
* All arguments in data must be quoted
@@ -3201,6 +3219,8 @@ public function getLeastSql(array $data)
32013219
}
32023220

32033221
/**
3222+
* Generate greatest SQL fragment
3223+
*
32043224
* Generate fragment of SQL, that compare with two or more arguments, and returns the largest
32053225
* (maximum-valued) argument
32063226
* All arguments in data must be quoted
@@ -3371,6 +3391,7 @@ public function getTriggerName($tableName, $time, $event)
33713391

33723392
/**
33733393
* Retrieve valid index name
3394+
*
33743395
* Check index name length and allowed symbols
33753396
*
33763397
* @param string $tableName
@@ -3400,6 +3421,7 @@ public function getIndexName($tableName, $fields, $indexType = '')
34003421

34013422
/**
34023423
* Retrieve valid foreign key name
3424+
*
34033425
* Check foreign key name length and allowed symbols
34043426
*
34053427
* @param string $priTableName
@@ -3668,6 +3690,7 @@ public function supportStraightJoin()
36683690

36693691
/**
36703692
* Adds order by random to select object
3693+
*
36713694
* Possible using integer field for optimization
36723695
*
36733696
* @param Select $select
@@ -3845,6 +3868,7 @@ public function getPrimaryKeyName($tableName, $schemaName = null)
38453868

38463869
/**
38473870
* Parse text size
3871+
*
38483872
* Returns max allowed size if value great it
38493873
*
38503874
* @param string|int $size
@@ -3879,6 +3903,7 @@ protected function _parseTextSize($size)
38793903

38803904
/**
38813905
* Converts fetched blob into raw binary PHP data.
3906+
*
38823907
* The MySQL drivers do it nice, no processing required.
38833908
*
38843909
* @param mixed $value

lib/internal/Magento/Framework/DB/Helper.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88

99
namespace Magento\Framework\DB;
1010

11+
/**
12+
* DataBase Helper
13+
*/
1114
class Helper extends \Magento\Framework\DB\Helper\AbstractHelper
1215
{
1316
/**
@@ -52,7 +55,7 @@ protected function _prepareOrder(\Magento\Framework\DB\Select $select, $autoRese
5255
* Field can be with 'dot' delimiter.
5356
*
5457
* @param string $field
55-
* @param bool $reverse OPTIONAL
58+
* @param bool $reverse OPTIONAL
5659
* @return string
5760
*/
5861
protected function _truncateAliasName($field, $reverse = false)
@@ -143,6 +146,7 @@ protected function _prepareHaving(\Magento\Framework\DB\Select $select, $autoRes
143146
}
144147

145148
/**
149+
* Assemble limit
146150
*
147151
* @param string $query
148152
* @param int $limitCount

0 commit comments

Comments
 (0)