Fix bool scope config and update throws and update use clases #18065

hryvinskyi · 2018-09-15T11:35:24Z

Description

Fix bool scope config
Update throws
Update use class

Contribution checklist

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds on Travis CI are green)

magento-engcom-team · 2018-09-15T11:35:30Z

Hi @hryvinskyi. 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

ihor-sviziev · 2018-09-18T14:23:31Z

Hi @hryvinskyi,
Please look at failed tests and adjust tests or your code.

hryvinskyi · 2018-09-18T18:33:18Z

@magento-engcom-team give me test instance

magento-engcom-team · 2018-09-18T18:33:22Z

Hi @hryvinskyi. Thank you for your request. I'm working on Magento instance for you

magento-engcom-team · 2018-09-18T18:34:04Z

Hi @hryvinskyi, here is your new Magento instance.
Admin access: https://pr-18065.engcom.dev.magento.com/admin
Login: admin Password: 123123q

slavvka

Please fix the comments and other similar places

slavvka · 2018-10-02T19:54:24Z

app/code/Magento/AdvancedSearch/Model/Recommendations/DataProvider.php

            self::CONFIG_RESULTS_COUNT_ENABLED,
            ScopeInterface::SCOPE_STORE
        );
    }

    /**
-     * {@inheritdoc}
+     * Get Items


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-02T19:54:52Z

app/code/Magento/CatalogInventory/Model/Configuration.php

@@ -149,7 +152,9 @@ public function __construct(
    }

    /**
-     * {@inheritdoc}
+     * Default Scope Id


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-02T19:57:09Z

app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php

@@ -90,11 +95,15 @@ public function __construct(
    }

    /**
-     * {@inheritdoc}
+     * Get Items


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-02T19:57:25Z

app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php

@@ -118,19 +127,25 @@ public function getItems(QueryInterface $query, $limit = null, $additionalFilter
    }

    /**
-     * {@inheritdoc}
+     * Is Results Count Enabled


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

You probably missed that

slavvka · 2018-10-02T19:57:43Z

app/code/Magento/GiftMessage/Model/GiftMessageConfigProvider.php

@@ -87,28 +95,31 @@ public function __construct(
    }

    /**
-     * {@inheritdoc}
+     * Get Config


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-02T19:59:40Z

app/code/Magento/Store/Model/HeaderProvider/Hsts.php

@@ -41,11 +43,13 @@ public function __construct(\Magento\Framework\App\Config\ScopeConfigInterface $
    }

    /**
-     * {@inheritdoc}
+     * Whether the header should be attached to the response


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-02T19:59:51Z

app/code/Magento/Store/Model/StoreManager.php

@@ -114,23 +117,29 @@ public function __construct(
    }

    /**
-     * {@inheritdoc}
+     * Set current default store


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-02T19:59:59Z

app/code/Magento/Store/Model/StoreManager.php

     */
    public function setCurrentStore($store)
    {
        $this->currentStoreId = $store;
    }

    /**
-     * {@inheritdoc}
+     * Allow or disallow single store mode


slavvka · 2018-10-02T20:00:25Z

app/code/Magento/Wishlist/Model/Rss/Wishlist.php

@@ -272,7 +283,9 @@ public function getFeeds()
    }

    /**
-     * {@inheritdoc}
+     * Is Auth Required


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-02T20:01:15Z

lib/internal/Magento/Framework/Session/SidResolver.php

@@ -169,7 +176,7 @@ public function getUseSessionInUrl()
        if ($this->_useSessionInUrl === null) {
            //Using config value by default, can be overridden by using the
            //setter.
-            $this->_useSessionInUrl = (bool)$this->scopeConfig->getValue(
+            $this->_useSessionInUrl = $this->scopeConfig->getValue(


The same. You removed type casting and left the method intact

hryvinskyi · 2018-10-03T13:17:36Z

@slavvka done

slavvka

You probably missed some of my comments. Also there are the same changes that should be fixed. Please look through all your changes thoroughly and fix all them. Thank you!

slavvka · 2018-10-03T15:48:36Z

app/code/Magento/Customer/Ui/Component/DataProvider/Document.php

@@ -93,7 +94,12 @@ public function __construct(
    }

    /**
-     * @inheritdoc


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-03T15:51:52Z

app/code/Magento/Customer/Ui/Component/DataProvider/Document.php

@@ -93,7 +94,12 @@ public function __construct(
    }

    /**
-     * @inheritdoc
+     * Get Custom Attribute


You probably missed that

slavvka · 2018-10-03T15:52:23Z

app/code/Magento/Elasticsearch/Model/DataProvider/Suggestions.php

@@ -118,19 +127,25 @@ public function getItems(QueryInterface $query, $limit = null, $additionalFilter
    }

    /**
-     * {@inheritdoc}
+     * Is Results Count Enabled


You probably missed that

slavvka · 2018-10-03T15:53:13Z

app/code/Magento/Store/Model/StoreManager.php

     */
    public function setIsSingleStoreModeAllowed($value)
    {
        $this->isSingleStoreAllowed = $value;
    }

    /**
-     * {@inheritdoc}
+     * Check if store has only one store view


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-03T15:53:19Z

app/code/Magento/Store/Model/StoreManager.php

@@ -139,15 +144,21 @@ public function hasSingleStore()
    }

    /**
-     * {@inheritdoc}
+     * Check if system is run in the single store mode


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-03T15:53:43Z

app/code/Magento/Store/Model/StoreManager.php

@@ -229,7 +252,9 @@ public function getWebsites($withDefault = false, $codeKey = false)
    }

    /**
-     * {@inheritdoc}
+     * Reinitialize store list


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-03T15:53:47Z

app/code/Magento/Store/Model/StoreManager.php

@@ -242,7 +267,10 @@ public function reinitStores()
    }

    /**
-     * {@inheritdoc}
+     * Retrieve default store for default group and website


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-03T15:53:51Z

app/code/Magento/Store/Model/StoreManager.php

@@ -252,7 +280,12 @@ public function getDefaultStoreView()
    }

    /**
-     * {@inheritdoc}
+     * Retrieve application store group object


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-03T15:53:56Z

app/code/Magento/Store/Model/StoreManager.php

@@ -267,7 +300,10 @@ public function getGroup($groupId = null)
    }

    /**
-     * {@inheritdoc}
+     * Prepare array of store groups


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

slavvka · 2018-10-03T15:54:02Z

app/code/Magento/Store/Model/StoreManager.php

@@ -307,7 +345,11 @@ private function getStoreWebsiteRelation()
    }

    /**
-     * @inheritdoc
+     * Get assigned to website store


Please revert the comment and just remove curly braces {}. Please refer to the guide https://devdocs.magento.com/guides/v2.3/coding-standards/docblock-standard-general.html#inheritdoc

hryvinskyi · 2018-10-03T16:32:49Z

@slavvka done

slavvka · 2018-10-03T16:55:52Z

@hryvinskyi Thank you! Let's wait for the tests

slavvka · 2018-10-09T16:29:51Z

hey @hryvinskyi you still have failing tests. Also please merge the latest mainline code and resolve the conflict.

magento-engcom-team · 2018-10-11T14:42:40Z

Hi @slavvka, thank you for the review.
ENGCOM-3164 has been created to process this Pull Request

magento-engcom-team · 2018-10-16T14:47:05Z

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

…lases #18065

slavvka · 2018-10-16T15:46:28Z

@hryvinskyi thank you. Could you please consider porting this PR to 2.2? Yuo can use the automatic tool https://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#porting-tool

Fix bool scope config and update throws and update use clases

c0a2ad1

magento-engcom-team added Release Line: 2.3 Event: lviv-meetup labels Sep 15, 2018

ishakhsuvarov modified the milestone: Release: 2.3.1 Sep 18, 2018

ihor-sviziev assigned ihor-sviziev and unassigned ihor-sviziev Sep 18, 2018

ihor-sviziev added the Progress: needs update label Sep 18, 2018

hryvinskyi added 2 commits September 18, 2018 21:31

Fix Tests

7674152

Merge branch '2.3-develop' into fix-bool-scope-config

4f849dc

hryvinskyi added 5 commits September 18, 2018 23:02

update variable name

7782252

update variable name

8ed0215

update variable name

ace0bc5

Update Tests

25b15e5

Update Tests

493239c

ihor-sviziev removed the Progress: needs update label Sep 21, 2018

slavvka requested changes Oct 2, 2018

View reviewed changes

slavvka self-assigned this Oct 2, 2018

slavvka added the Progress: needs update label Oct 2, 2018

Fix methods descriptions

efad97e

slavvka requested changes Oct 3, 2018

View reviewed changes

hryvinskyi added 2 commits October 3, 2018 19:28

Fixed

c2db6bf

Fixed

75eb9b1

Fix test

c2fd8e9

hryvinskyi added 2 commits October 10, 2018 13:00

Merge branch '2.3-develop' into fix-bool-scope-config

dbf7196

fix test

6ed47bb

slavvka approved these changes Oct 11, 2018

View reviewed changes

magento-engcom-team added the Component: multiple label Oct 11, 2018

magento-engcom-team added Progress: accept and removed Progress: needs update labels Oct 11, 2018

magento-engcom-team merged commit 6ed47bb into magento:2.3-develop Oct 16, 2018

magento-engcom-team pushed a commit that referenced this pull request Oct 16, 2018

ENGCOM-3164: Fix bool scope config and update throws and update use c…

293da5a

…lases #18065

Fix bool scope config and update throws and update use clases #18065

Fix bool scope config and update throws and update use clases #18065

Conversation

hryvinskyi commented Sep 15, 2018

Description

Contribution checklist

magento-engcom-team commented Sep 15, 2018

ihor-sviziev commented Sep 18, 2018

hryvinskyi commented Sep 18, 2018

magento-engcom-team commented Sep 18, 2018

magento-engcom-team commented Sep 18, 2018

slavvka left a 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

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

hryvinskyi commented Oct 3, 2018

slavvka left a 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

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

hryvinskyi commented Oct 3, 2018

slavvka commented Oct 3, 2018

slavvka commented Oct 9, 2018

magento-engcom-team commented Oct 11, 2018

magento-engcom-team commented Oct 16, 2018

slavvka commented Oct 16, 2018