ENGCOM-7745: #28829 Fixing multiple typos #28832

magento-engcom-team · magento-engcom-team · commit 2cc3c73fce89 · 2020-07-09T13:11:45.000-05:00
- Merge Pull Request #28832 from pgrimaud/magento2:2.4-develop - Merged commits: 1. ae076d6
diff --git a/app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php b/app/code/Magento/Authorization/Test/Unit/Model/ResourceModel/RulesTest.php
@@ -182,7 +182,7 @@ public function testSaveRelNoResources()
     /**
      * Test LocalizedException throw case.
      */
-    public function testLocalizedExceptionOccurance()
+    public function testLocalizedExceptionOccurrence()
     {
         $this->expectException(LocalizedException::class);
         $this->expectExceptionMessage("TestException");
@@ -212,7 +212,7 @@ public function testLocalizedExceptionOccurance()
     /**
      * Test generic exception throw case.
      */
-    public function testGenericExceptionOccurance()
+    public function testGenericExceptionOccurrence()
     {
         $exception = new \Exception('GenericException');
 
diff --git a/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php b/app/code/Magento/Bundle/Test/Unit/Controller/Adminhtml/Product/Initialization/Helper/Plugin/BundleTest.php
@@ -150,13 +150,13 @@ public function testAfterInitializeIfBundleAnsCustomOptionsAndBundleSelectionsEx
         $this->productMock->expects($this->once())
             ->method('getBundleOptionsData')
             ->willReturn(['option_1' => ['delete' => 1]]);
-        $extentionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
+        $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setBundleProductOptions'])
             ->getMockForAbstractClass();
-        $extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
-        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
-        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
+        $extensionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
+        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttribute);
+        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extensionAttribute);
 
         $this->model->afterInitialize($this->subjectMock, $this->productMock);
     }
@@ -191,14 +191,14 @@ public function testAfterInitializeIfBundleOptionsNotExist(): void
             ['affect_bundle_product_selections', null, false],
         ];
         $this->requestMock->expects($this->any())->method('getPost')->willReturnMap($valueMap);
-        $extentionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
+        $extensionAttribute = $this->getMockBuilder(ProductExtensionInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['setBundleProductOptions'])
             ->getMockForAbstractClass();
-        $extentionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
+        $extensionAttribute->expects($this->once())->method('setBundleProductOptions')->with([]);
         $this->productMock->expects($this->any())->method('getCompositeReadonly')->willReturn(false);
-        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extentionAttribute);
-        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extentionAttribute);
+        $this->productMock->expects($this->once())->method('getExtensionAttributes')->willReturn($extensionAttribute);
+        $this->productMock->expects($this->once())->method('setExtensionAttributes')->with($extensionAttribute);
         $this->productMock->expects($this->once())->method('setCanSaveBundleSelections')->with(false);
 
         $this->model->afterInitialize($this->subjectMock, $this->productMock);
diff --git a/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php b/app/code/Magento/Cms/Test/Unit/Model/PageRepository/ValidationCompositeTest.php
@@ -43,7 +43,7 @@ public function testConstructorValidation($validators)
         new ValidationComposite($this->subject, $validators);
     }
 
-    public function testSaveInvokesValidatorsWithSucess()
+    public function testSaveInvokesValidatorsWithSuccess()
     {
         $validator1 = $this->getMockForAbstractClass(ValidatorInterface::class);
         $validator2 = $this->getMockForAbstractClass(ValidatorInterface::class);
diff --git a/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Product/Initialization/CleanConfigurationTmpImagesTest.php b/app/code/Magento/ConfigurableProduct/Test/Unit/Plugin/Product/Initialization/CleanConfigurationTmpImagesTest.php
@@ -64,7 +64,7 @@ class CleanConfigurationTmpImagesTest extends TestCase
     /**
      * @var Json|MockObject
      */
-    private $seralizer;
+    private $serializer;
 
     /**
      * @var ProductInitializationHelper|MockObject
@@ -87,7 +87,7 @@ protected function setUp(): void
         $this->writeFolder = $this->getMockBuilder(Write::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->seralizer = $this->getMockBuilder(Json::class)
+        $this->serializer = $this->getMockBuilder(Json::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->subjectMock = $this->getMockBuilder(ProductInitializationHelper::class)
@@ -106,7 +106,7 @@ protected function setUp(): void
                 'fileStorageDb' => $this->fileStorageDb,
                 'mediaConfig' => $this->mediaConfig,
                 'filesystem' => $this->filesystem,
-                'seralizer' => $this->seralizer
+                'serializer' => $this->serializer
             ]
         );
     }
diff --git a/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php b/app/code/Magento/Cookie/Test/Unit/Helper/CookieTest.php
@@ -162,6 +162,6 @@ public function getConfigMethodStub($hashName)
             return $defaultConfig[$hashName];
         }
 
-        throw new \InvalidArgumentException('Unknow id = ' . $hashName);
+        throw new \InvalidArgumentException('Unknown id = ' . $hashName);
     }
 }
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Address/Grid/Collection.php
@@ -185,7 +185,7 @@ public function addFieldToFilter($field, $condition = null)
     {
         if ($field === 'region') {
             $conditionSql = $this->_getConditionSql(
-                $this->getRegionNameExpresion(),
+                $this->getRegionNameExpression(),
                 $condition
             );
             $this->getSelect()->where($conditionSql);
@@ -211,7 +211,7 @@ public function addFullTextFilter(string $value)
         $whereCondition = '';
         foreach ($fields as $key => $field) {
             $field = $field === 'region'
-                ? $this->getRegionNameExpresion()
+                ? $this->getRegionNameExpression()
                 : 'main_table.' . $field;
             $condition = $this->_getConditionSql(
                 $this->getConnection()->quoteIdentifier($field),
@@ -246,18 +246,18 @@ private function joinRegionNameTable()
             )->joinLeft(
                 ['rnt' => $this->getTable('directory_country_region_name')],
                 "rnt.region_id={$regionIdField} AND {$localeCondition}",
-                ['region' => $this->getRegionNameExpresion()]
+                ['region' => $this->getRegionNameExpression()]
             );
 
         return $this;
     }
 
     /**
-     * Get SQL Expresion to define Region Name field by locale
+     * Get SQL Expression to define Region Name field by locale
      *
      * @return \Zend_Db_Expr
      */
-    private function getRegionNameExpresion(): \Zend_Db_Expr
+    private function getRegionNameExpression(): \Zend_Db_Expr
     {
         $connection = $this->getConnection();
         $defaultNameExpr = $connection->getIfNullSql(
diff --git a/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php b/app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.php
@@ -74,7 +74,7 @@ public function addFieldToFilter($field, $condition = null)
     {
         if ($field === 'billing_region') {
             $conditionSql = $this->_getConditionSql(
-                $this->getRegionNameExpresion(),
+                $this->getRegionNameExpression(),
                 $condition
             );
             $this->getSelect()->where($conditionSql);
@@ -100,7 +100,7 @@ public function addFullTextFilter(string $value)
         $whereCondition = '';
         foreach ($fields as $key => $field) {
             $field = $field === 'billing_region'
-                ? $this->getRegionNameExpresion()
+                ? $this->getRegionNameExpression()
                 : 'main_table.' . $field;
             $condition = $this->_getConditionSql(
                 $this->getConnection()->quoteIdentifier($field),
@@ -152,18 +152,18 @@ private function joinRegionNameTable()
             )->joinLeft(
                 ['rnt' => $this->getTable('directory_country_region_name')],
                 "rnt.region_id={$regionIdField} AND {$localeCondition}",
-                ['billing_region' => $this->getRegionNameExpresion()]
+                ['billing_region' => $this->getRegionNameExpression()]
             );
 
         return $this;
     }
 
     /**
-     * Get SQL Expresion to define Region Name field by locale
+     * Get SQL Expression to define Region Name field by locale
      *
      * @return \Zend_Db_Expr
      */
-    private function getRegionNameExpresion(): \Zend_Db_Expr
+    private function getRegionNameExpression(): \Zend_Db_Expr
     {
         $connection = $this->getConnection();
         $defaultNameExpr = $connection->getIfNullSql(
diff --git a/app/code/Magento/Paypal/Model/Api/Nvp.php b/app/code/Magento/Paypal/Model/Api/Nvp.php
@@ -1423,7 +1423,7 @@ protected function _validateResponse($method, $response)
      */
     protected function _deformatNVP($nvpstr)
     {
-        $intial = 0;
+        $initial = 0;
         $nvpArray = [];
 
         $nvpstr = strpos($nvpstr, "\r\n\r\n") !== false ? substr($nvpstr, strpos($nvpstr, "\r\n\r\n") + 4) : $nvpstr;
@@ -1435,7 +1435,7 @@ protected function _deformatNVP($nvpstr)
             $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
 
             /*getting the Key and Value values and storing in a Associative Array*/
-            $keyval = substr($nvpstr, $intial, $keypos);
+            $keyval = substr($nvpstr, $initial, $keypos);
             $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
             //decoding the response
             $nvpArray[urldecode($keyval)] = urldecode($valval);
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Observer/ResetAttemptForFrontendObserverTest.php
@@ -34,7 +34,7 @@ protected function setUp(): void
     /**
      * @magentoDataFixture Magento/Captcha/_files/failed_logins_frontend.php
      */
-    public function testSuccesfulLoginRemovesFailedAttempts()
+    public function testSuccessfulLoginRemovesFailedAttempts()
     {
         $customerEmail = 'mageuser@dummy.com';
         $customerFactory = $this->objectManager->get(CustomerFactory::class);
diff --git a/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php b/dev/tests/integration/testsuite/Magento/Sales/CustomerData/LastOrderedItemsTest.php
@@ -42,7 +42,7 @@ public function testDefaultFormatterIsAppliedWhenBasicIntegration()
         $this->assertEquals(
             LastOrderedItems::SIDEBAR_ORDER_LIMIT,
             count($data['items']),
-            'Section items count should not be greater then ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT
+            'Section items count should not be greater than ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT
         );
     }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/lib/internal/Magento/Framework/Test/Unit/View/Element/UiComponentFactoryTest.php b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/root/lib/internal/Magento/Framework/Test/Unit/View/Element/UiComponentFactoryTest.php
@@ -115,7 +115,7 @@ public function testNonRootComponent()
         $name = "fieldset";
         $context = $this->createMock(\Magento\Framework\View\Element\UiComponent\ContextInterface::class);
         $arguments = ['context' => $context];
-        $defintionArguments = [
+        $definitionArguments = [
             'componentType' => 'select',
             'attributes' => [
                 'class' => '\Some\Class',
@@ -132,7 +132,7 @@ public function testNonRootComponent()
         $this->dataMock->expects($this->once())
             ->method('get')
             ->with($name)
-            ->willReturn($defintionArguments);
+            ->willReturn($definitionArguments);
         $this->objectManagerMock->expects($this->once())
             ->method('create')
             ->with('\Some\Class', $expectedArguments);
diff --git a/lib/internal/Magento/Framework/App/Utility/Files.php b/lib/internal/Magento/Framework/App/Utility/Files.php
@@ -1116,7 +1116,7 @@ public function getJsFilesForArea($area)
         } else {
             $frontendPaths = [BP . "/lib/web/mage"];
             /* current structure of /lib/web/mage directory contains frontend javascript in the root,
-               backend javascript in subdirectories. That's why script shouldn't go recursive throught subdirectories
+               backend javascript in subdirectories. That's why script shouldn't go recursive through subdirectories
                to get js files for frontend */
             $files = array_merge($files, self::getFiles($frontendPaths, '*.js', false));
         }
diff --git a/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php b/lib/internal/Magento/Framework/Locale/Test/Unit/CurrencyTest.php
@@ -41,8 +41,8 @@ class CurrencyTest extends TestCase
     const TEST_NONCACHED_CURRENCY_LOCALE = 'en_US';
     const TEST_CACHED_CURRENCY = 'CAD';
     const TEST_CACHED_CURRENCY_LOCALE = 'en_CA';
-    const TEST_NONEXISTANT_CURRENCY = 'QQQ';
-    const TEST_NONEXISTANT_CURRENCY_LOCALE = 'fr_FR';
+    const TEST_NONEXISTENT_CURRENCY = 'QQQ';
+    const TEST_NONEXISTENT_CURRENCY_LOCALE = 'fr_FR';
     const TEST_EXCEPTION_CURRENCY = 'ZZZ';
     const TEST_EXCEPTION_CURRENCY_LOCALE = 'es_ES';
 
@@ -146,9 +146,9 @@ public function testGetCurrencyCached()
         $this->assertEquals([self::TEST_CACHED_CURRENCY], $retrievedCurrencyObject->getCurrencyList());
     }
 
-    public function testGetNonExistantCurrency()
+    public function testGetNonExistentCurrency()
     {
-        $options = new \Zend_Currency(null, self::TEST_NONEXISTANT_CURRENCY_LOCALE);
+        $options = new \Zend_Currency(null, self::TEST_NONEXISTENT_CURRENCY_LOCALE);
 
         $this->mockCurrencyFactory
             ->expects($this->once())
@@ -164,10 +164,10 @@ public function testGetNonExistantCurrency()
             ->method('dispatch');
 
         $retrievedCurrencyObject = $this->testCurrencyObject
-            ->getCurrency(self::TEST_NONEXISTANT_CURRENCY);
+            ->getCurrency(self::TEST_NONEXISTENT_CURRENCY);
 
         $this->assertInstanceOf('Zend_Currency', $retrievedCurrencyObject);
-        $this->assertEquals(self::TEST_NONEXISTANT_CURRENCY_LOCALE, $retrievedCurrencyObject->getLocale());
+        $this->assertEquals(self::TEST_NONEXISTENT_CURRENCY_LOCALE, $retrievedCurrencyObject->getLocale());
         $this->assertEquals('euro', $retrievedCurrencyObject->getName());
         $this->assertEquals(['EUR'], $retrievedCurrencyObject->getCurrencyList());
     }

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function testConstructorValidation($validators)`
`43`	`43`	`new ValidationComposite($this->subject, $validators);`
`44`	`44`	`}`
`45`	`45`
`46`		`- public function testSaveInvokesValidatorsWithSucess()`
	`46`	`+ public function testSaveInvokesValidatorsWithSuccess()`
`47`	`47`	`{`
`48`	`48`	`$validator1 = $this->getMockForAbstractClass(ValidatorInterface::class);`
`49`	`49`	`$validator2 = $this->getMockForAbstractClass(ValidatorInterface::class);`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,6 @@ public function getConfigMethodStub($hashName)`
`162`	`162`	`return $defaultConfig[$hashName];`
`163`	`163`	`}`
`164`	`164`
`165`		`- throw new \InvalidArgumentException('Unknow id = ' . $hashName);`
	`165`	`+ throw new \InvalidArgumentException('Unknown id = ' . $hashName);`
`166`	`166`	`}`
`167`	`167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ protected function setUp(): void`
`34`	`34`	`/**`
`35`	`35`	`* @magentoDataFixture Magento/Captcha/_files/failed_logins_frontend.php`
`36`	`36`	`*/`
`37`		`- public function testSuccesfulLoginRemovesFailedAttempts()`
	`37`	`+ public function testSuccessfulLoginRemovesFailedAttempts()`
`38`	`38`	`{`
`39`	`39`	`$customerEmail = 'mageuser@dummy.com';`
`40`	`40`	`$customerFactory = $this->objectManager->get(CustomerFactory::class);`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function testDefaultFormatterIsAppliedWhenBasicIntegration()`
`42`	`42`	`$this->assertEquals(`
`43`	`43`	`LastOrderedItems::SIDEBAR_ORDER_LIMIT,`
`44`	`44`	`count($data['items']),`
`45`		`- 'Section items count should not be greater then ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT`
	`45`	`+ 'Section items count should not be greater than ' . LastOrderedItems::SIDEBAR_ORDER_LIMIT`
`46`	`46`	`);`
`47`	`47`	`}`
`48`	`48`	`}`