Skip to content

Commit fef5e97

Browse files
author
Stanislav Idolov
committed
magento-engcom/magento2ce#2306: Code style fixes
1 parent 418f582 commit fef5e97

File tree

8 files changed

+46
-13
lines changed

8 files changed

+46
-13
lines changed

app/code/Magento/CatalogImportExport/Model/Import/Uploader.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class Uploader extends \Magento\MediaStorage\Model\File\Uploader
101101
* @param \Magento\MediaStorage\Model\File\Validator\NotProtectedExtension $validator
102102
* @param \Magento\Framework\Filesystem $filesystem
103103
* @param \Magento\Framework\Filesystem\File\ReadFactory $readFactory
104-
* @param null $filePath
104+
* @param null|string $filePath
105105
* @throws \Magento\Framework\Exception\LocalizedException
106106
*/
107107
public function __construct(
@@ -353,7 +353,7 @@ protected function _moveFile($tmpPath, $destPath)
353353
}
354354

355355
/**
356-
* {@inheritdoc}
356+
* @inheritdoc
357357
*/
358358
protected function chmod($file)
359359
{

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct(
5757
}
5858

5959
/**
60-
* {@inheritdoc}
60+
* @inheritdoc
6161
*/
6262
protected function _construct()
6363
{
@@ -102,7 +102,7 @@ protected function _prepareCollection()
102102
}
103103

104104
/**
105-
* {@inheritdoc}
105+
* @inheritdoc
106106
*/
107107
protected function _prepareColumns()
108108
{
@@ -163,7 +163,7 @@ public function getRowUrl($row)
163163
}
164164

165165
/**
166-
* {@inheritdoc}
166+
* @inheritdoc
167167
*/
168168
public function getGridUrl()
169169
{

app/code/Magento/Customer/Controller/Account/ForgotPassword.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
@@ -11,6 +10,9 @@
1110
use Magento\Framework\App\Action\Context;
1211
use Magento\Framework\View\Result\PageFactory;
1312

13+
/**
14+
* Forgot Password controller
15+
*/
1416
class ForgotPassword extends \Magento\Customer\Controller\AbstractAccount implements HttpGetActionInterface
1517
{
1618
/**

app/code/Magento/Swatches/Helper/Data.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ public function __construct(
132132
}
133133

134134
/**
135+
* Assemble Additional Data for Eav Attribute
136+
*
135137
* @param Attribute $attribute
136138
* @return $this
137139
*/
@@ -181,6 +183,8 @@ private function isMediaAvailable(ModelProduct $product, string $attributeCode):
181183
}
182184

183185
/**
186+
* Load first variation
187+
*
184188
* @param string $attributeCode swatch_image|image
185189
* @param ModelProduct $configurableProduct
186190
* @param array $requiredAttributes
@@ -204,6 +208,8 @@ private function loadFirstVariation($attributeCode, ModelProduct $configurablePr
204208
}
205209

206210
/**
211+
* Load first variation with swatch image
212+
*
207213
* @param Product $configurableProduct
208214
* @param array $requiredAttributes
209215
* @return bool|Product
@@ -214,6 +220,8 @@ public function loadFirstVariationWithSwatchImage(Product $configurableProduct,
214220
}
215221

216222
/**
223+
* Load first variation with image
224+
*
217225
* @param Product $configurableProduct
218226
* @param array $requiredAttributes
219227
* @return bool|Product
@@ -269,6 +277,8 @@ public function loadVariationByFallback(Product $parentProduct, array $attribute
269277
}
270278

271279
/**
280+
* Add filter by attribute
281+
*
272282
* @param ProductCollection $productCollection
273283
* @param array $attributes
274284
* @return void
@@ -281,6 +291,8 @@ private function addFilterByAttributes(ProductCollection $productCollection, arr
281291
}
282292

283293
/**
294+
* Add filter by parent
295+
*
284296
* @param ProductCollection $productCollection
285297
* @param integer $parentId
286298
* @return void
@@ -299,6 +311,7 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
299311

300312
/**
301313
* Method getting full media gallery for current Product
314+
*
302315
* Array structure: [
303316
* ['image'] => 'http://url/pub/media/catalog/product/2/0/blabla.jpg',
304317
* ['mediaGallery'] => [
@@ -307,7 +320,9 @@ private function addFilterByParent(ProductCollection $productCollection, $parent
307320
* ...,
308321
* ]
309322
* ]
323+
*
310324
* @param ModelProduct $product
325+
*
311326
* @return array
312327
*/
313328
public function getProductMediaGallery(ModelProduct $product)
@@ -339,6 +354,8 @@ public function getProductMediaGallery(ModelProduct $product)
339354
}
340355

341356
/**
357+
* Get all size images
358+
*
342359
* @param string $imageFile
343360
* @return array
344361
*/
@@ -476,6 +493,8 @@ private function setCachedSwatches(array $optionIds, array $swatches)
476493
}
477494

478495
/**
496+
* Add fallback options
497+
*
479498
* @param array $fallbackValues
480499
* @param array $swatches
481500
* @return array

lib/internal/Magento/Framework/Cache/Backend/Memcached.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Framework\Cache\Backend;
77

8+
/**
9+
* Memcached cache model
10+
*/
811
class Memcached extends \Zend_Cache_Backend_Memcached implements \Zend_Cache_Backend_ExtendedInterface
912
{
1013
/**
@@ -46,7 +49,7 @@ public function __construct(array $options = [])
4649
* Returns ID of a specific chunk on the basis of data's ID
4750
*
4851
* @param string $id Main data's ID
49-
* @param int $index Particular chunk number to return ID for
52+
* @param int $index Particular chunk number to return ID for
5053
* @return string
5154
*/
5255
protected function _getChunkId($id, $index)
@@ -58,7 +61,7 @@ protected function _getChunkId($id, $index)
5861
* Remove saved chunks in case something gone wrong (e.g. some chunk from the chain can not be found)
5962
*
6063
* @param string $id ID of data's info cell
61-
* @param int $chunks Number of chunks to remove (basically, the number after '{splitted}|')
64+
* @param int $chunks Number of chunks to remove (basically, the number after '{splitted}|')
6265
* @return null
6366
*/
6467
protected function _cleanTheMess($id, $chunks)
@@ -103,7 +106,7 @@ public function save($data, $id, $tags = [], $specificLifetime = false)
103106
* Load data from memcached, glue from several chunks if it was splitted upon save.
104107
*
105108
* @param string $id @see \Zend_Cache_Backend_Memcached::load()
106-
* @param bool $doNotTestCacheValidity @see \Zend_Cache_Backend_Memcached::load()
109+
* @param bool $doNotTestCacheValidity @see \Zend_Cache_Backend_Memcached::load()
107110
* @return bool|false|string
108111
*/
109112
public function load($id, $doNotTestCacheValidity = false)

lib/internal/Magento/Framework/Filter/Template.php

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
namespace Magento\Framework\Filter;
1111

1212
/**
13+
* Template filter
14+
*
1315
* @api
1416
*/
1517
class Template implements \Zend_Filter_Interface
@@ -228,8 +230,9 @@ protected function afterFilter($value)
228230
}
229231

230232
/**
231-
* Adds a callback to run after main filtering has happened. Callback must accept a single argument and return
232-
* a string of the processed value.
233+
* Adds a callback to run after main filtering has happened.
234+
*
235+
* Callback must accept a single argument and return a string of the processed value.
233236
*
234237
* @param callable $afterFilterCallback
235238
* @return $this
@@ -257,6 +260,8 @@ protected function resetAfterFilterCallbacks()
257260
}
258261

259262
/**
263+
* Get var directive
264+
*
260265
* @param string[] $construction
261266
* @return string
262267
*/
@@ -302,6 +307,8 @@ public function templateDirective($construction)
302307
}
303308

304309
/**
310+
* Get depend directive
311+
*
305312
* @param string[] $construction
306313
* @return string
307314
*/
@@ -320,6 +327,8 @@ public function dependDirective($construction)
320327
}
321328

322329
/**
330+
* If directive
331+
*
323332
* @param string[] $construction
324333
* @return string
325334
*/

setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Html.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Html extends AbstractAdapter
2020
const HTML_FILTER = "/i18n:\s?'(?<value>[^'\\\\]*(?:\\\\.[^'\\\\]*)*)'/i";
2121

2222
/**
23-
* {@inheritdoc}
23+
* @inheritdoc
2424
*/
2525
protected function _parse()
2626
{

setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
class Js extends AbstractAdapter
1212
{
1313
/**
14-
* {@inheritdoc}
14+
* @inheritdoc
1515
*/
1616
protected function _parse()
1717
{

0 commit comments

Comments
 (0)