From f37a5ee323cd372b98b8d5df587fd7d2e5c291e8 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Mon, 9 Jul 2018 13:28:05 +0530 Subject: [PATCH 1/2] Removed double occurrences from Magento_Catalog, Magento_Customer, Magento_Downloadable, Magento_Sales , lib and dev test function comments. --- .../Model/Indexer/Category/Product/TableMaintainer.php | 2 +- .../Magento/Catalog/Model/Layer/Filter/AbstractFilter.php | 2 +- .../Magento/Catalog/Model/ResourceModel/Product/Option.php | 2 +- .../Catalog/Model/ResourceModel/Product/Option/Value.php | 2 +- .../Controller/Adminhtml/Index/AbstractMassAction.php | 2 +- .../Magento/Customer/view/frontend/web/js/trim-username.js | 2 +- .../Downloadable/Model/ResourceModel/Link/Collection.php | 4 ++-- app/code/Magento/Indexer/Model/ProcessManager.php | 4 ++-- .../Sales/Controller/Adminhtml/Order/AbstractMassAction.php | 2 +- .../Downloadable/Test/Block/Catalog/Product/View/Links.php | 2 +- .../Setup/Test/Constraint/Extension/AssertVersionOnGrid.php | 2 +- .../Test/Constraint/AssertWidgetRecentlyViewedProducts.php | 2 +- .../FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php | 2 +- .../Magento/Framework/Console/QuestionPerformer/YesNo.php | 2 +- lib/internal/Magento/Framework/DB/TemporaryTableService.php | 2 +- lib/web/prototype/windows/README | 2 +- 16 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php index d2f8925d09a7b..06960600bf576 100644 --- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php +++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php @@ -136,7 +136,7 @@ public function getMainTable(int $storeId) public function createTablesForStore(int $storeId) { $mainTableName = $this->getMainTable($storeId); - //Create index table for store based on on main replica table + //Create index table for store based on main replica table //Using main replica table is necessary for backward capability and TableResolver plugin work $this->createTable( $this->getTable(AbstractAction::MAIN_INDEX_TABLE . $this->additionalTableSuffix), diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php index a4db630f0234b..d21a8666ec0ac 100644 --- a/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php +++ b/app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php @@ -241,7 +241,7 @@ protected function _createItem($label, $value, $count = 0) } /** - * Get all product ids from from collection with applied filters + * Get all product ids from collection with applied filters * * @return array */ diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php index 4775b96e3a448..179da06b59990 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option.php @@ -307,7 +307,7 @@ protected function _saveValueTitles(\Magento\Framework\Model\AbstractModel $obje } /** - * Get first col from from first row for option table + * Get first col from first row for option table * * @param string $tableName * @param int $optionId diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php index 91bb99ca971a7..4ebcd1f4b9ae4 100644 --- a/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php +++ b/app/code/Magento/Catalog/Model/ResourceModel/Product/Option/Value.php @@ -300,7 +300,7 @@ protected function _saveValueTitles(AbstractModel $object) } /** - * Get first col from from first row for option table + * Get first col from first row for option table * * @param string $tableName * @param int $optionId diff --git a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php index ebab2a42a02ec..e26b49aaebe7a 100644 --- a/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php +++ b/app/code/Magento/Customer/Controller/Adminhtml/Index/AbstractMassAction.php @@ -73,7 +73,7 @@ public function execute() /** * Return component referer url - * TODO: Technical dept referer url should be implement as a part of Action configuration in in appropriate way + * TODO: Technical dept referer url should be implement as a part of Action configuration in appropriate way * * @return null|string */ diff --git a/app/code/Magento/Customer/view/frontend/web/js/trim-username.js b/app/code/Magento/Customer/view/frontend/web/js/trim-username.js index 69f89cb8fe01f..1b6aab6086853 100644 --- a/app/code/Magento/Customer/view/frontend/web/js/trim-username.js +++ b/app/code/Magento/Customer/view/frontend/web/js/trim-username.js @@ -21,7 +21,7 @@ define([ */ _create: function () { // We need to look outside the module for backward compatibility, since someone can already use the module. - // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the the email field from the + // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the // newsletter email field or any other "email" field. this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector); this._bind(); diff --git a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php index 4590d5433ed72..73ae696a85187 100644 --- a/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php +++ b/app/code/Magento/Downloadable/Model/ResourceModel/Link/Collection.php @@ -87,7 +87,7 @@ public function addProductToFilter($product) } /** - * Retrieve title for for current store + * Retrieve title for current store * * @param int $storeId * @return $this @@ -113,7 +113,7 @@ public function addTitleToResult($storeId = 0) } /** - * Retrieve price for for current website + * Retrieve price for current website * * @param int $websiteId * @return $this diff --git a/app/code/Magento/Indexer/Model/ProcessManager.php b/app/code/Magento/Indexer/Model/ProcessManager.php index 66b4dc93a6727..a65cb992a2437 100644 --- a/app/code/Magento/Indexer/Model/ProcessManager.php +++ b/app/code/Magento/Indexer/Model/ProcessManager.php @@ -56,7 +56,7 @@ public function execute($userFunctions) } /** - * Execute user functions in in singleThreads mode + * Execute user functions in singleThreads mode * * @param \Traversable $userFunctions */ @@ -68,7 +68,7 @@ private function simpleThreadExecute($userFunctions) } /** - * Execute user functions in in multiThreads mode + * Execute user functions in multiThreads mode * * @param \Traversable $userFunctions * @SuppressWarnings(PHPMD.UnusedLocalVariable) diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php index 891bfeefc9f52..05066fe5b125e 100644 --- a/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php +++ b/app/code/Magento/Sales/Controller/Adminhtml/Order/AbstractMassAction.php @@ -70,7 +70,7 @@ public function execute() /** * Return component referrer url - * TODO: Technical dept referrer url should be implement as a part of Action configuration in in appropriate way + * TODO: Technical dept referrer url should be implement as a part of Action configuration in appropriate way * * @return null|string */ diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php index 3d3920f28a733..648361b0a31c8 100644 --- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php +++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Block/Catalog/Product/View/Links.php @@ -18,7 +18,7 @@ class Links extends Block { /** - * Selector title for for links + * Selector title for links * * @var string */ diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php index 0a4dd9d0772d5..43662031ce883 100644 --- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php +++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/Extension/AssertVersionOnGrid.php @@ -23,7 +23,7 @@ class AssertVersionOnGrid extends AbstractConstraint /*#@-*/ /** - * Assert that that version of extension is correct. + * Assert that version of extension is correct. * * @param Grid $grid * @param Extension $extension diff --git a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php index 90d166f483b66..acbb8844b4e47 100644 --- a/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php +++ b/dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetRecentlyViewedProducts.php @@ -16,7 +16,7 @@ use Magento\Mtf\Constraint\AbstractConstraint; /** - * Check that that widget with type Recently Viewed Products is present on category page + * Check that widget with type Recently Viewed Products is present on category page */ class AssertWidgetRecentlyViewedProducts extends AbstractConstraint { diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php index 0e191f4a90147..643f223f0d9ee 100644 --- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php +++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Pricing/Render/FinalPriceBox/RenderingBasedOnIsProductListFlagTest.php @@ -103,7 +103,7 @@ public function testRenderingByDefault() * Special price should be valid * FinalPriceBox::hasSpecialPrice should not be call * Regular price for Configurable product should be rendered for is_product_list = false (product page), but not be - * for for is_product_list = true (list of products) + * for is_product_list = true (list of products) * * @param bool $flag * @param int|bool $count diff --git a/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php b/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php index 1e9ae60472563..71056ca02e9c6 100644 --- a/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php +++ b/lib/internal/Magento/Framework/Console/QuestionPerformer/YesNo.php @@ -65,7 +65,7 @@ public function execute(array $messages, InputInterface $input, OutputInterface } /** - * Creates Question object from from given array of messages. + * Creates Question object from given array of messages. * * @param string[] $messages array of messages * @return Question diff --git a/lib/internal/Magento/Framework/DB/TemporaryTableService.php b/lib/internal/Magento/Framework/DB/TemporaryTableService.php index 479cd0c6fddb9..03c1a9b9aa7f6 100644 --- a/lib/internal/Magento/Framework/DB/TemporaryTableService.php +++ b/lib/internal/Magento/Framework/DB/TemporaryTableService.php @@ -10,7 +10,7 @@ /** * Class TemporaryTableService creates a temporary table in mysql from a Magento\Framework\DB\Select. - * Use this class to create an index with that that you want to query later for quick data access + * Use this class to create an index with that you want to query later for quick data access * * @api * @since 100.2.0 diff --git a/lib/web/prototype/windows/README b/lib/web/prototype/windows/README index e2cb960834593..44da88b6adec5 100644 --- a/lib/web/prototype/windows/README +++ b/lib/web/prototype/windows/README @@ -133,7 +133,7 @@ See samples/index.html for more details and go on my web page : http://prototype - Add Windows.focusedWindow and Windows.closeAll - Add name to iframe in case of url window - Clean up code, use _ for private function (just name convention) - - Add Dialog.info function, usefull for for submit or notice info (in Rails) + - Add Dialog.info function, usefull for submit or notice info (in Rails) - Add minimize and maximize buttons - Add alert_lite.css without any images - Debug From 432eb14df0a53311ec109f71caa1da64e6b3e03b Mon Sep 17 00:00:00 2001 From: Namrata <37930646+sanganinamrata@users.noreply.github.com> Date: Mon, 9 Jul 2018 14:06:55 +0530 Subject: [PATCH 2/2] Resolved conflict --- app/code/Magento/Customer/view/frontend/web/js/trim-username.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Customer/view/frontend/web/js/trim-username.js b/app/code/Magento/Customer/view/frontend/web/js/trim-username.js index 1b6aab6086853..69f89cb8fe01f 100644 --- a/app/code/Magento/Customer/view/frontend/web/js/trim-username.js +++ b/app/code/Magento/Customer/view/frontend/web/js/trim-username.js @@ -21,7 +21,7 @@ define([ */ _create: function () { // We need to look outside the module for backward compatibility, since someone can already use the module. - // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the email field from the + // @todo Narrow this selector in 2.3 so it doesn't accidentally finds the the email field from the // newsletter email field or any other "email" field. this.options.cache.email = $(this.options.formSelector).find(this.options.emailSelector); this._bind();