Skip to content

Commit 4711154

Browse files
authored
1 parent 6670614 commit 4711154

File tree

31 files changed

+127
-125
lines changed

31 files changed

+127
-125
lines changed

.php-cs-fixer.dist.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
'nullable_type_declaration_for_default_null_value' => true,
1919
// Calls to PHPUnit\Framework\TestCase static methods must all be of the same type, either $this->, self:: or static::
2020
'php_unit_test_case_static_method_calls' => ['call_type' => 'self'],
21+
// PHPDoc annotation descriptions should not be a sentence.
22+
'phpdoc_annotation_without_dot' => true,
2123
// Docblocks should have the same indentation as the documented subject.
2224
'phpdoc_indent' => true,
2325
// Annotations in PHPDoc should be ordered in defined sequence.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ protected function _beforeToHtml()
220220
* Find the root parent Tab ID recursively.
221221
*
222222
* @param string $currentAfterTabId
223-
* @param int $degree Degrees of separation between child and root parent.
224-
* @return string The parent tab ID.
223+
* @param int $degree degrees of separation between child and root parent
224+
* @return string the parent tab ID
225225
*/
226226
protected function _getRootParentTabId($currentAfterTabId, &$degree)
227227
{

app/code/core/Mage/Api/Helper/Data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public function v2AssociativeArrayUnpacker(&$obj)
115115
/**
116116
* Go through mixed and turns it to a correct look.
117117
*
118-
* @param Mixed $mixed A link to variable that may contain associative array.
118+
* @param Mixed $mixed a link to variable that may contain associative array
119119
*/
120120
public function associativeArrayUnpack(&$mixed)
121121
{

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public function initialize($paymentAction, $stateObject)
362362
/**
363363
* Generate request object and fill its fields from Quote or Order object
364364
*
365-
* @param Mage_Sales_Model_Order $order Quote or order object.
365+
* @param Mage_Sales_Model_Order $order quote or order object
366366
* @return Mage_Authorizenet_Model_Directpost_Request
367367
*/
368368
public function generateRequestFromOrder(Mage_Sales_Model_Order $order)
@@ -392,7 +392,7 @@ public function setResponseData(array $postData)
392392
* Validate response data. Needed in controllers.
393393
*
394394
* @throws Mage_Core_Exception in case of validation error
395-
* @return bool true in case of validation success.
395+
* @return bool true in case of validation success
396396
*/
397397
public function validateResponse()
398398
{
@@ -506,7 +506,7 @@ public function checkResponseCode()
506506
/**
507507
* Check transaction id came from Authorize.net
508508
*
509-
* @throws Mage_Core_Exception in case of bad transaction id.
509+
* @throws Mage_Core_Exception in case of bad transaction id
510510
* @return true in case of right transaction id
511511
*/
512512
public function checkTransId()

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ protected function _setTransactionKey($transKey)
5353
* @param string $merchantApiLoginId
5454
* @param string $merchantTransactionKey
5555
* @param string $amount
56-
* @param string $fpSequence An invoice number or random number.
56+
* @param string $fpSequence an invoice number or random number
5757
* @param string $fpTimestamp
58-
* @return string The fingerprint.
58+
* @return string the fingerprint
5959
*/
6060
public function generateRequestSign($merchantApiLoginId, $merchantTransactionKey, $amount, $currencyCode, $fpSequence, $fpTimestamp)
6161
{
@@ -189,9 +189,9 @@ public function signRequestData()
189189
* @param string $merchantSignatureKey
190190
* @param string $amount
191191
* @param string $currencyCode
192-
* @param string $fpSequence An invoice number or random number.
192+
* @param string $fpSequence an invoice number or random number
193193
* @param string $fpTimestamp
194-
* @return string The fingerprint.
194+
* @return string the fingerprint
195195
*/
196196
protected function _generateSha2RequestSign(
197197
$merchantApiLoginId,

app/code/core/Mage/Catalog/Model/Resource/Abstract.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ protected function _isAttributeValueEmpty(Mage_Eav_Model_Entity_Attribute_Abstra
522522
* Checks also attribute's store scope:
523523
* We should insert on duplicate key update values if we unchecked 'STORE VIEW' checkbox in store view.
524524
*
525-
* @param mixed $value New value of the attribute.
525+
* @param mixed $value new value of the attribute
526526
* @return bool
527527
*/
528528
protected function _canUpdateAttribute(

app/code/core/Mage/Catalog/Model/Resource/Url.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1317,7 +1317,7 @@ public function getRewriteByProductStore(array $products)
13171317
*
13181318
* @param string $requestPath
13191319
* @param int $storeId
1320-
* @param array $checkedPaths internal variable to prevent infinite loops.
1320+
* @param array $checkedPaths internal variable to prevent infinite loops
13211321
* @return bool|string
13221322
*/
13231323
public function findFinalTargetPath($requestPath, $storeId, &$checkedPaths = [])

app/code/core/Mage/CatalogSearch/Model/Resource/Helper/Mysql4.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ public function prepareTerms($str, $maxWordLength = 0)
9595
/**
9696
* Use sql compatible with Full Text indexes
9797
*
98-
* @param mixed $table The table to insert data into.
99-
* @param array $data Column-value pairs or array of column-value pairs.
98+
* @param mixed $table the table to insert data into
99+
* @param array $data column-value pairs or array of column-value pairs
100100
* @param array $fields update fields pairs or values
101-
* @return int The number of affected rows.
101+
* @return int the number of affected rows
102102
*/
103103
public function insertOnDuplicate($table, array $data, array $fields = [])
104104
{

app/code/core/Mage/ConfigurableSwatches/Model/Resource/Catalog/Product/Type/Configurable.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Mage_ConfigurableSwatches_Model_Resource_Catalog_Product_Type_Configurable
1616
* Retrieve Required children ids
1717
* Grouped by parent id.
1818
*
19-
* @param mixed $parentId may be array of integers or scalar integer.
19+
* @param mixed $parentId may be array of integers or scalar integer
2020
* @param bool $required
2121
* @return array
2222
* @see Mage_Catalog_Model_Resource_Product_Type_Configurable::getChildrenIds()

app/code/core/Mage/Core/Helper/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public function formatPrice($price, $includeContainer = true)
155155
/**
156156
* Format date using current locale options and time zone.
157157
*
158-
* @param null|int|string|Zend_Date $date If empty, return current datetime.
158+
* @param null|int|string|Zend_Date $date if empty, return current datetime
159159
* @param string $format See Mage_Core_Model_Locale::FORMAT_TYPE_* constants
160160
* @param bool $showTime Whether to include time
161161
* @return string
@@ -168,7 +168,7 @@ public function formatDate($date = null, $format = Mage_Core_Model_Locale::FORMA
168168
/**
169169
* Format date using current locale options and time zone.
170170
*
171-
* @param null|int|string|Zend_Date $date If empty, return current locale datetime.
171+
* @param null|int|string|Zend_Date $date if empty, return current locale datetime
172172
* @param string $format See Mage_Core_Model_Locale::FORMAT_TYPE_* constants
173173
* @param bool $showTime Whether to include time
174174
* @param bool $useTimezone Convert to local datetime?

0 commit comments

Comments
 (0)