Clean code #16841

GraysonChiang · 2018-07-16T02:54:46Z

Description

Just modify some code, and make it Cleaner more...

magento-cicd2 · 2018-07-16T02:54:48Z

All committers have signed the CLA.

magento-engcom-team · 2018-07-16T02:55:03Z

Hi @GraysonChiang. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento-engcom-team give me test instance - deploy test instance based on PR changes
@magento-engcom-team give me {$VERSION} instance - deploy vanilla Magento instance

For more details, please, review the Magento Contributor Assistant documentation

magento-engcom-team · 2018-07-16T07:05:20Z

Hi @ihor-sviziev, thank you for the review.
ENGCOM-2366 has been created to process this Pull Request

magento-engcom-team · 2018-07-16T07:05:20Z

@GraysonChiang thank you for contributing. Please accept Community Contributors team invitation here to gain extended permissions for this repository.

ihor-sviziev · 2018-07-18T07:46:56Z

app/code/Magento/Catalog/Helper/Image.php

@@ -859,7 +859,7 @@ public function getFrame()
     */
    protected function getAttribute($name)
    {
-        return isset($this->attributes[$name]) ? $this->attributes[$name] : null;
+        return $this->attributes[$name]?? : null;


Please add space there before ??

Looks like there should not be :

GraysonChiang · 2018-07-18T07:53:16Z

Sor, I fixed it and commit that again.

ihor-sviziev · 2018-07-18T11:19:49Z

app/code/Magento/Backend/Model/Menu/Builder.php

@@ -102,6 +102,6 @@ public function getResult(\Magento\Backend\Model\Menu $menu)
     */
    protected function _getParam($params, $paramName, $defaultValue = null)
    {
-        return isset($params[$paramName]) ? $params[$paramName] : $defaultValue;
+        return $params[$paramName]?? $defaultValue;


Please add space before ??

ihor-sviziev · 2018-07-18T11:20:13Z

app/code/Magento/BundleImportExport/Model/Export/RowCustomizer.php

@@ -321,7 +321,7 @@ function ($title, $storeName) {
     */
    protected function getTypeValue($type)
    {
-        return isset($this->typeMapping[$type]) ? $this->typeMapping[$type] : self::VALUE_DYNAMIC;
+        return $this->typeMapping[$type]??  self::VALUE_DYNAMIC;


Please add space before ??

Remove 2nd space after ??

ihor-sviziev · 2018-07-18T11:20:40Z

app/code/Magento/Catalog/Helper/Output.php

@@ -105,7 +105,7 @@ public function addHandler($method, $handler)
    public function getHandlers($method)
    {
        $method = strtolower($method);
-        return isset($this->_handlers[$method]) ? $this->_handlers[$method] : [];
+        return $this->_handlers[$method] ?? : [];


Please remove : (and space hear it)

ihor-sviziev · 2018-07-18T11:20:58Z

app/code/Magento/Catalog/Model/Product/Option.php

@@ -312,7 +312,7 @@ public function getGroupByType($type = null)
            self::OPTION_TYPE_TIME => self::OPTION_GROUP_DATE,
        ];

-        return isset($optionGroupsToTypes[$type]) ? $optionGroupsToTypes[$type] : '';
+        return $optionGroupsToTypes[$type] ?? : '';


please remove : (and space near it)

ihor-sviziev · 2018-07-18T11:21:12Z

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -931,7 +931,7 @@ private function mapConditionType($conditionType)
            'eq' => 'in',
            'neq' => 'nin'
        ];
-        return isset($conditionsMap[$conditionType]) ? $conditionsMap[$conditionType] : $conditionType;
+        return $conditionsMap[$conditionType] ??  $conditionType;


please remove 2nd space after ??

ihor-sviziev · 2018-07-18T11:21:25Z

app/code/Magento/Catalog/Ui/Component/Listing/Columns.php

@@ -80,6 +80,6 @@ public function prepare()
     */
    protected function getFilterType($frontendInput)
    {
-        return isset($this->filterMap[$frontendInput]) ? $this->filterMap[$frontendInput] : $this->filterMap['default'];
+        return $this->filterMap[$frontendInput] ??  $this->filterMap['default'];


please remove 2nd space after ??

ihor-sviziev · 2018-07-18T11:21:54Z

lib/internal/Magento/Framework/DataObject/Copy/Config.php

@@ -44,6 +44,6 @@ public function getFieldset($name, $root = 'global')
        if (empty($fieldsets)) {
            return null;
        }
-        return isset($fieldsets[$name]) ? $fieldsets[$name] : null;
+        return $fieldsets[$name] ??  null;


Please remove 2nd space after ??

ihor-sviziev · 2018-07-18T11:22:04Z

lib/internal/Magento/Framework/View/Page/Config/Structure.php

@@ -251,6 +251,6 @@ public function populateWithArray(array $data)
     */
    private function getArrayValueByKey($key, array $array)
    {
-        return isset($array[$key]) ? $array[$key] : [];
+        return $array[$key] ??  [];


Please remove 2nd space after ??

GraysonChiang · 2018-07-19T01:31:03Z

I fixed.

magento-engcom-team · 2018-07-19T02:40:37Z

Hi @ihor-sviziev, thank you for the review.
ENGCOM-2366 has been created to process this Pull Request

magento-engcom-team · 2018-07-23T10:11:10Z

Hi @GraysonChiang. Thank you for your contribution.
We will aim to release these changes as part of 2.2.6.
Please check the release notes for final confirmation.

Please, consider to port this solution to 2.3 release line.
You may use Porting tool to port commits automatically.

clean code

1946b43

ihor-sviziev approved these changes Jul 16, 2018

View reviewed changes

magento-engcom-team assigned ihor-sviziev Jul 16, 2018

magento-engcom-team added this to the Release: 2.2.6 milestone Jul 16, 2018

magento-engcom-team added the Release Line: 2.2 label Jul 16, 2018

magento-engcom-team added the Progress: accept label Jul 17, 2018

GraysonChiang added 2 commits July 18, 2018 09:32

Remove latency code

b9ffc1d

Remove empty line

ab45aa8

GraysonChiang closed this Jul 18, 2018

GraysonChiang reopened this Jul 18, 2018

ihor-sviziev requested changes Jul 18, 2018

View reviewed changes

Fix Error Typing

0c3ed1c

GraysonChiang changed the title ~~clean code~~ Clean code Jul 18, 2018

ihor-sviziev requested changes Jul 18, 2018

View reviewed changes

ihor-sviziev added Progress: needs update and removed Progress: accept labels Jul 18, 2018

Fix typing error

f9d546f

ihor-sviziev approved these changes Jul 19, 2018

View reviewed changes

magento-engcom-team added the Component: multiple label Jul 19, 2018

ihor-sviziev removed the Progress: needs update label Jul 19, 2018

magento-engcom-team merged commit f9d546f into magento:2.2-develop Jul 23, 2018

magento-engcom-team pushed a commit that referenced this pull request Jul 23, 2018

ENGCOM-2366: clean code #16841

dc8cd62

torhoehn mentioned this pull request Jul 23, 2018

[Forwardport] Clean code #17047

Closed

gelanivishal mentioned this pull request Jul 25, 2018

[Forwardport] Clean code gelanivishal/magento2#52

Merged

nmalevanec mentioned this pull request Aug 23, 2018

[Forwardport] Clean code #17765

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean code #16841

Clean code #16841

GraysonChiang commented Jul 16, 2018

magento-cicd2 commented Jul 16, 2018 •

edited

Loading

magento-engcom-team commented Jul 16, 2018

magento-engcom-team commented Jul 16, 2018

magento-engcom-team commented Jul 16, 2018

ihor-sviziev Jul 18, 2018

GraysonChiang commented Jul 18, 2018

ihor-sviziev Jul 18, 2018

ihor-sviziev Jul 18, 2018

ihor-sviziev Jul 18, 2018

ihor-sviziev Jul 18, 2018

ihor-sviziev Jul 18, 2018

ihor-sviziev Jul 18, 2018

ihor-sviziev Jul 18, 2018

ihor-sviziev Jul 18, 2018

GraysonChiang commented Jul 19, 2018

magento-engcom-team commented Jul 19, 2018

magento-engcom-team commented Jul 23, 2018

Clean code #16841

Clean code #16841

Conversation

GraysonChiang commented Jul 16, 2018

Description

magento-cicd2 commented Jul 16, 2018 • edited Loading

magento-engcom-team commented Jul 16, 2018

magento-engcom-team commented Jul 16, 2018

magento-engcom-team commented Jul 16, 2018

Choose a reason for hiding this comment

GraysonChiang commented Jul 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GraysonChiang commented Jul 19, 2018

magento-engcom-team commented Jul 19, 2018

magento-engcom-team commented Jul 23, 2018

magento-cicd2 commented Jul 16, 2018 •

edited

Loading