ENGCOM-2309: [Forwardport] Fix case mismatch call (class/method) #16363

magento-engcom-team · magento-engcom-team · commit c0014d24e09c · 2018-07-12T10:26:19.000-05:00
- Merge Pull Request #16363 from lfluvisotto/magento2:2.3-develop-PR-port-16141 - Merged commits: 1. 0a48caf
diff --git a/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php b/app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php
@@ -219,7 +219,7 @@ protected function setUp()
             '_getCustomerGroupById',
             'correctExportData'
         ]);
-        $this->advancedPricing = $this->getMockbuilder(
+        $this->advancedPricing = $this->getMockBuilder(
             \Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing::class
         )
             ->setMethods($mockMethods)
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php
@@ -65,11 +65,11 @@ public function testRender()
             ->method('getLabel')
             ->willReturn('Comment label');
         $html = $this->additionalComment->render($this->abstractElementMock);
-        $this->assertRegexp(
+        $this->assertRegExp(
             "/New comment/",
             $html
         );
-        $this->assertRegexp(
+        $this->assertRegExp(
             "/Comment label/",
             $html
         );
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php
@@ -87,7 +87,7 @@ public function testRender()
         $this->localeResolver->expects($this->once())
             ->method('getLocale')
             ->willReturn('en_US');
-        $this->assertRegexp(
+        $this->assertRegExp(
             "/Eastern Standard Time \(America\/New_York\)/",
             $this->collectionTimeLabel->render($this->abstractElementMock)
         );
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/SubscriptionStatusLabelTest.php
@@ -74,7 +74,7 @@ public function testRender()
         $this->abstractElementMock->expects($this->any())
             ->method('getComment')
             ->willReturn('Subscription status: Enabled');
-        $this->assertRegexp(
+        $this->assertRegExp(
             "/Subscription status: Enabled/",
             $this->subscriptionStatusLabel->render($this->abstractElementMock)
         );
diff --git a/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php b/app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/VerticalTest.php
@@ -65,7 +65,7 @@ public function testRender()
             ->method('getHint')
             ->willReturn('New hint');
         $html = $this->vertical->render($this->abstractElementMock);
-        $this->assertRegexp(
+        $this->assertRegExp(
             "/New comment/",
             $html
         );
diff --git a/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/CardDetailsHandler.php
@@ -85,7 +85,7 @@ public function handle(array $handlingSubject, array $response)
     private function getCreditCardType($type)
     {
         $replaced = str_replace(' ', '-', strtolower($type));
-        $mapper = $this->config->getCctypesMapper();
+        $mapper = $this->config->getCcTypesMapper();
 
         return $mapper[$replaced];
     }
diff --git a/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php b/app/code/Magento/Braintree/Gateway/Response/VaultDetailsHandler.php
@@ -157,7 +157,7 @@ private function convertDetailsToJSON($details)
     private function getCreditCardType($type)
     {
         $replaced = str_replace(' ', '-', strtolower($type));
-        $mapper = $this->config->getCctypesMapper();
+        $mapper = $this->config->getCcTypesMapper();
 
         return $mapper[$replaced];
     }
diff --git a/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php b/app/code/Magento/Braintree/Model/Ui/ConfigProvider.php
@@ -70,7 +70,7 @@ public function getConfig()
                 self::CODE => [
                     'isActive' => $this->config->isActive($storeId),
                     'clientToken' => $this->getClientToken(),
-                    'ccTypesMapper' => $this->config->getCctypesMapper(),
+                    'ccTypesMapper' => $this->config->getCcTypesMapper(),
                     'sdkUrl' => $this->config->getSdkUrl(),
                     'countrySpecificCardTypes' => $this->config->getCountrySpecificCardTypeConfig($storeId),
                     'availableCardTypes' => $this->config->getAvailableCardTypes($storeId),
diff --git a/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php b/app/code/Magento/Braintree/Test/Unit/Gateway/Config/ConfigTest.php
@@ -142,7 +142,7 @@ public function testGetCcTypesMapper($value, $expected)
 
         static::assertEquals(
             $expected,
-            $this->model->getCctypesMapper()
+            $this->model->getCcTypesMapper()
         );
     }
 
diff --git a/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php b/app/code/Magento/Catalog/Test/Unit/Controller/Adminhtml/Product/ShowUpdateResultTest.php
@@ -58,7 +58,7 @@ protected function getContext()
         $objectManagerMock = $this->getMockForAbstractClass(\Magento\Framework\ObjectManagerInterface::class);
         $objectManagerMock->expects($this->any())
             ->method('get')
-            ->willreturn($productActionMock);
+            ->willReturn($productActionMock);
 
         $eventManager = $this->getMockBuilder(\Magento\Framework\Event\Manager::class)
             ->setMethods(['dispatch'])
diff --git a/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php b/app/code/Magento/Checkout/Setup/Patch/Data/PrepareInitialCheckoutConfiguration.php
@@ -817,7 +817,7 @@ public function apply()
 
                 $connection->commit();
             } catch (\Exception $e) {
-                $connection->rollback();
+                $connection->rollBack();
                 throw $e;
             }
         }
diff --git a/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php b/app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php
@@ -1269,7 +1269,7 @@ public function testGetDataWithVisibleAttributesWithAccountEdit()
         $helper = new ObjectManager($this);
         $context = $this->getMockBuilder(\Magento\Framework\View\Element\UiComponent\ContextInterface::class)
             ->setMethods(['getRequestParam'])
-            ->getMockforAbstractClass();
+            ->getMockForAbstractClass();
         $context->expects($this->any())
             ->method('getRequestParam')
             ->with('request-field-name')
diff --git a/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Attribute/CollectionTest.php b/app/code/Magento/Eav/Test/Unit/Model/ResourceModel/Attribute/CollectionTest.php
@@ -115,7 +115,7 @@ protected function setUp()
         $this->connectionMock->expects($this->any())->method('quoteIdentifier')->will($this->returnArgument(0));
         $this->connectionMock->expects($this->any())
             ->method('describeTable')
-            ->will($this->returnvalueMap(
+            ->will($this->returnValueMap(
                 [
                     [
                         'some_main_table',
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Problem/Collection.php
@@ -165,8 +165,8 @@ protected function _addCustomersData()
                     $customerName = $this->_customerView->getCustomerName($customer);
                     foreach ($problems as $problem) {
                         $problem->setCustomerName($customerName)
-                            ->setCustomerFirstName($customer->getFirstName())
-                            ->setCustomerLastName($customer->getLastName());
+                            ->setCustomerFirstName($customer->getFirstname())
+                            ->setCustomerLastName($customer->getLastname());
                     }
                 } catch (NoSuchEntityException $e) {
                     // do nothing if customer is not found by id
diff --git a/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php b/app/code/Magento/Newsletter/Model/ResourceModel/Queue/Collection.php
@@ -221,7 +221,7 @@ public function addOnlyForSendingFilter()
             [\Magento\Newsletter\Model\Queue::STATUS_SENDING, \Magento\Newsletter\Model\Queue::STATUS_NEVER]
         )->where(
             'main_table.queue_start_at < ?',
-            $this->_date->gmtdate()
+            $this->_date->gmtDate()
         )->where(
             'main_table.queue_start_at IS NOT NULL'
         );
diff --git a/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/ResourceModel/Carrier/Tablerate.php
@@ -320,7 +320,7 @@ public function getConditionName(\Magento\Framework\DataObject $object)
      */
     private function getCsvFile($filePath)
     {
-        $pathInfo = pathInfo($filePath);
+        $pathInfo = pathinfo($filePath);
         $dirName = isset($pathInfo['dirname']) ? $pathInfo['dirname'] : '';
         $fileName = isset($pathInfo['basename']) ? $pathInfo['basename'] : '';
 
diff --git a/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartManagementTest.php b/app/code/Magento/Quote/Test/Unit/Model/GuestCart/GuestCartManagementTest.php
@@ -94,7 +94,7 @@ public function testCreateEmptyCart()
         $cartId = 1;
         $this->quoteIdMaskMock->expects($this->once())->method('setQuoteId')->with($cartId)->willReturnSelf();
         $this->quoteIdMaskMock->expects($this->once())->method('save')->willReturnSelf();
-        $this->quoteIdMaskMock->expects($this->once())->method('getMaskedId')->willreturn($maskedCartId);
+        $this->quoteIdMaskMock->expects($this->once())->method('getMaskedId')->willReturn($maskedCartId);
         $this->quoteIdMaskFactoryMock->expects($this->once())->method('create')->willReturn($this->quoteIdMaskMock);
         $this->quoteManagementMock->expects($this->once())->method('createEmptyCart')->willReturn($cartId);
 
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php b/app/code/Magento/Sales/Controller/Adminhtml/Order/Unhold.php
@@ -32,7 +32,7 @@ public function execute()
                 if (!$order->canUnhold()) {
                     throw new \Magento\Framework\Exception\LocalizedException(__('Can\'t unhold order.'));
                 }
-                $this->orderManagement->unhold($order->getEntityId());
+                $this->orderManagement->unHold($order->getEntityId());
                 $this->messageManager->addSuccess(__('You released the order from holding status.'));
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
                 $this->messageManager->addError($e->getMessage());
diff --git a/app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php b/app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php
@@ -70,10 +70,10 @@ protected function setUp()
 
         $this->quoteMock->expects($this->any())
             ->method('getBillingAddress')
-            ->willreturn($this->billingAddressMock);
+            ->willReturn($this->billingAddressMock);
         $this->quoteMock->expects($this->any())
             ->method('getShippingAddress')
-            ->willreturn($this->shippingAddressMock);
+            ->willReturn($this->shippingAddressMock);
         $this->sessionQuoteMock->expects($this->any())->method('getQuote')->willReturn($this->quoteMock);
         $this->totals = $this->helperManager->getObject(
             \Magento\Sales\Block\Adminhtml\Order\Create\Totals::class,
@@ -88,7 +88,7 @@ public function testGetTotals($isVirtual)
     {
         $expected = 'expected';
         $this->quoteMock->expects($this->at(1))->method('collectTotals');
-        $this->quoteMock->expects($this->once())->method('isVirtual')->willreturn($isVirtual);
+        $this->quoteMock->expects($this->once())->method('isVirtual')->willReturn($isVirtual);
         if ($isVirtual) {
             $this->billingAddressMock->expects($this->once())->method('getTotals')->willReturn($expected);
         } else {
diff --git a/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php b/app/code/Magento/SalesRule/Model/ResourceModel/Rule.php
@@ -239,7 +239,7 @@ public function saveStoreLabels($ruleId, $labels)
                 $connection->delete($table, ['rule_id=?' => $ruleId, 'store_id IN (?)' => $deleteByStoreIds]);
             }
         } catch (\Exception $e) {
-            $connection->rollback();
+            $connection->rollBack();
             throw $e;
         }
         $connection->commit();
diff --git a/app/code/Magento/Shipping/Model/Shipping/Labels.php b/app/code/Magento/Shipping/Model/Shipping/Labels.php
@@ -117,8 +117,8 @@ public function requestToShipment(Shipment $orderShipment)
             )
         );
 
-        if (!$admin->getFirstname()
-            || !$admin->getLastname()
+        if (!$admin->getFirstName()
+            || !$admin->getLastName()
             || !$storeInfo->getName()
             || !$storeInfo->getPhone()
             || !$originStreet1
@@ -188,8 +188,8 @@ protected function setShipperDetails(
         );
 
         $request->setShipperContactPersonName($storeAdmin->getName());
-        $request->setShipperContactPersonFirstName($storeAdmin->getFirstname());
-        $request->setShipperContactPersonLastName($storeAdmin->getLastname());
+        $request->setShipperContactPersonFirstName($storeAdmin->getFirstName());
+        $request->setShipperContactPersonLastName($storeAdmin->getLastName());
         $request->setShipperContactCompanyName($store->getName());
         $request->setShipperContactPhoneNumber($store->getPhone());
         $request->setShipperEmail($storeAdmin->getEmail());
diff --git a/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php b/app/code/Magento/Tax/Test/Unit/Model/TaxClass/Type/CustomerTest.php
@@ -26,9 +26,9 @@ public function testIsAssignedToObjects()
 
         $filterBuilder->expects($this->once())->method('setField')->with(
             \Magento\Customer\Api\Data\GroupInterface::TAX_CLASS_ID
-        )->willReturnself();
-        $filterBuilder->expects($this->once())->method('setValue')->willReturnself();
-        $filterBuilder->expects($this->once())->method('create')->willReturnself();
+        )->willReturnSelf();
+        $filterBuilder->expects($this->once())->method('setValue')->willReturnSelf();
+        $filterBuilder->expects($this->once())->method('create')->willReturnSelf();
 
         $filterGroupBuilder = $this->createMock(\Magento\Framework\Api\Search\FilterGroupBuilder::class);
         $searchCriteriaBuilder = $this->getMockBuilder(\Magento\Framework\Api\SearchCriteriaBuilder::class)
diff --git a/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php b/app/code/Magento/Theme/Test/Unit/Controller/Adminhtml/System/Design/Theme/UploadJsTest.php
@@ -63,22 +63,22 @@ public function testExecuteWithoutTheme()
             ->expects($this->at(0))
             ->method('get')
             ->with(\Magento\Theme\Model\Uploader\Service::class)
-            ->WillReturn($this->serviceModel);
+            ->willReturn($this->serviceModel);
         $this->_objectManagerMock
             ->expects($this->at(1))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
-            ->WillReturn($this->themeFactory);
+            ->willReturn($this->themeFactory);
         $this->_objectManagerMock
             ->expects($this->at(2))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
-            ->WillReturn($this->customizationJs);
+            ->willReturn($this->customizationJs);
         $this->_objectManagerMock
             ->expects($this->at(3))
             ->method('get')
             ->with(\Magento\Framework\Json\Helper\Data::class)
-            ->WillReturn($this->jsonHelper);
+            ->willReturn($this->jsonHelper);
 
         $this->themeFactory->expects($this->once())
             ->method('create')
@@ -107,21 +107,21 @@ public function testExecuteWithException()
         $this->_objectManagerMock->expects($this->at(0))
             ->method('get')
             ->with(\Magento\Theme\Model\Uploader\Service::class)
-            ->WillReturn($this->serviceModel);
+            ->willReturn($this->serviceModel);
         $this->_objectManagerMock->expects($this->at(1))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
-            ->WillReturn($this->themeFactory);
+            ->willReturn($this->themeFactory);
         $this->_objectManagerMock
             ->expects($this->at(2))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
-            ->WillReturn($this->customizationJs);
+            ->willReturn($this->customizationJs);
         $this->_objectManagerMock
             ->expects($this->at(4))
             ->method('get')
             ->with(\Magento\Framework\Json\Helper\Data::class)
-            ->WillReturn($this->jsonHelper);
+            ->willReturn($this->jsonHelper);
 
         $this->themeFactory->expects($this->once())
             ->method('create')
@@ -172,19 +172,19 @@ public function testExecute()
         $this->_objectManagerMock->expects($this->at(0))
             ->method('get')
             ->with(\Magento\Theme\Model\Uploader\Service::class)
-            ->WillReturn($this->serviceModel);
+            ->willReturn($this->serviceModel);
         $this->_objectManagerMock->expects($this->at(1))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\FlyweightFactory::class)
-            ->WillReturn($this->themeFactory);
+            ->willReturn($this->themeFactory);
         $this->_objectManagerMock->expects($this->at(2))
             ->method('get')
             ->with(\Magento\Framework\View\Design\Theme\Customization\File\Js::class)
-            ->WillReturn($this->customizationJs);
+            ->willReturn($this->customizationJs);
         $this->_objectManagerMock->expects($this->at(4))
             ->method('get')
             ->with(\Magento\Framework\Json\Helper\Data::class)
-            ->WillReturn($this->jsonHelper);
+            ->willReturn($this->jsonHelper);
 
         $this->themeFactory->expects($this->once())
             ->method('create')
diff --git a/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php b/app/code/Magento/User/Test/Unit/Model/ResourceModel/UserTest.php
@@ -330,7 +330,7 @@ public function testDeleteFromRole()
         $roleId = 44;
         $methodUserMock->expects($this->once())->method('getUserId')->willReturn($uid);
         $this->resourceMock->expects($this->atLeastOnce())->method('getConnection')->willReturn($this->dbAdapterMock);
-        $methodUserMock->expects($this->atleastOnce())->method('getRoleId')->willReturn($roleId);
+        $methodUserMock->expects($this->atLeastOnce())->method('getRoleId')->willReturn($roleId);
         $this->dbAdapterMock->expects($this->once())->method('delete');
 
         $this->assertInstanceOf(
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php b/lib/internal/Magento/Framework/App/Test/Unit/BootstrapTest.php
@@ -135,7 +135,7 @@ public function testCreateFilesystemDriverPool()
         );
         /** @var \Magento\Framework\Filesystem\DriverPool $result */
         $this->assertInstanceOf(\Magento\Framework\Filesystem\DriverPool::class, $result);
-        $this->assertInstanceof($driverClass, $result->getDriver('custom'));
+        $this->assertInstanceOf($driverClass, $result->getDriver('custom'));
     }
 
     public function testGetParams()
diff --git a/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php b/lib/internal/Magento/Framework/Composer/Test/Unit/DependencyCheckerTest.php
@@ -69,7 +69,7 @@ function ($input, $buffer) {
                 $buffer->writeln($output);
             }
         );
-        $composerApp->Expects($this->at(6))->method('run')->willReturnCallback(
+        $composerApp->expects($this->at(6))->method('run')->willReturnCallback(
             function ($input, $buffer) {
                 $output = 'magento/package-d requires magento/package-c (1.0)' . PHP_EOL .
                     'magento/project-community-edition requires magento/package-a (1.0)' . PHP_EOL;
diff --git a/lib/internal/Magento/Framework/File/Size.php b/lib/internal/Magento/Framework/File/Size.php
@@ -36,7 +36,7 @@ class Size
      */
     public function getPostMaxSize()
     {
-        return $this->_iniget('post_max_size');
+        return $this->_iniGet('post_max_size');
     }
 
     /**
@@ -46,7 +46,7 @@ public function getPostMaxSize()
      */
     public function getUploadMaxSize()
     {
-        return $this->_iniget('upload_max_filesize');
+        return $this->_iniGet('upload_max_filesize');
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Image/Adapter/Gd2.php b/lib/internal/Magento/Framework/Image/Adapter/Gd2.php
@@ -106,7 +106,7 @@ protected function _getImageNeedMemorySize($file)
         }
 
         return round(
-            ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + Pow(2, 16)) * 1.65
+            ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $imageInfo['channels'] / 8 + pow(2, 16)) * 1.65
         );
     }
 
@@ -426,7 +426,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             imagecolortransparent($newWatermark, $col);
             imagefilledrectangle($newWatermark, 0, 0, $this->getWatermarkWidth(), $this->getWatermarkHeight(), $col);
             imagealphablending($newWatermark, true);
-            imageSaveAlpha($newWatermark, true);
+            imagesavealpha($newWatermark, true);
             imagecopyresampled(
                 $newWatermark,
                 $watermark,
@@ -451,7 +451,7 @@ public function watermark($imagePath, $positionX = 0, $positionY = 0, $opacity =
             imagecolortransparent($newWatermark, $col);
             imagefilledrectangle($newWatermark, 0, 0, $this->_imageSrcWidth, $this->_imageSrcHeight, $col);
             imagealphablending($newWatermark, true);
-            imageSaveAlpha($newWatermark, true);
+            imagesavealpha($newWatermark, true);
             imagecopyresampled(
                 $newWatermark,
                 $watermark,
@@ -669,7 +669,7 @@ private function imageDestroy()
     private function _saveAlpha($imageHandler)
     {
         $background = imagecolorallocate($imageHandler, 0, 0, 0);
-        ImageColorTransparent($imageHandler, $background);
+        imagecolortransparent($imageHandler, $background);
         imagealphablending($imageHandler, false);
         imagesavealpha($imageHandler, true);
     }
diff --git a/lib/internal/Magento/Framework/Indexer/Action/Base.php b/lib/internal/Magento/Framework/Indexer/Action/Base.php
diff --git a/lib/internal/Magento/Framework/RequireJs/Config.php b/lib/internal/Magento/Framework/RequireJs/Config.php
diff --git a/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php b/lib/internal/Magento/Framework/View/Element/UiComponent/Config/FileCollector/AggregatedFileCollector.php
diff --git a/lib/internal/Magento/Framework/View/Model/Layout/Merge.php b/lib/internal/Magento/Framework/View/Model/Layout/Merge.php
diff --git a/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php b/lib/internal/Magento/Framework/View/Page/Config/Reader/Head.php
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php b/lib/internal/Magento/Framework/View/Test/Unit/Element/Html/Link/CurrentTest.php
diff --git a/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php b/lib/internal/Magento/Framework/View/Test/Unit/LayoutTest.php
diff --git a/setup/src/Magento/Setup/Model/PhpReadinessCheck.php b/setup/src/Magento/Setup/Model/PhpReadinessCheck.php

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ protected function setUp()`
`219`	`219`	`'_getCustomerGroupById',`
`220`	`220`	`'correctExportData'`
`221`	`221`	`]);`
`222`		`- $this->advancedPricing = $this->getMockbuilder(`
	`222`	`+ $this->advancedPricing = $this->getMockBuilder(`
`223`	`223`	`\Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing::class`
`224`	`224`	`)`
`225`	`225`	`->setMethods($mockMethods)`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function handle(array $handlingSubject, array $response)`
`85`	`85`	`private function getCreditCardType($type)`
`86`	`86`	`{`
`87`	`87`	`$replaced = str_replace(' ', '-', strtolower($type));`
`88`		`- $mapper = $this->config->getCctypesMapper();`
	`88`	`+ $mapper = $this->config->getCcTypesMapper();`
`89`	`89`
`90`	`90`	`return $mapper[$replaced];`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ private function convertDetailsToJSON($details)`
`157`	`157`	`private function getCreditCardType($type)`
`158`	`158`	`{`
`159`	`159`	`$replaced = str_replace(' ', '-', strtolower($type));`
`160`		`- $mapper = $this->config->getCctypesMapper();`
	`160`	`+ $mapper = $this->config->getCcTypesMapper();`
`161`	`161`
`162`	`162`	`return $mapper[$replaced];`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public function testGetCcTypesMapper($value, $expected)`
`142`	`142`
`143`	`143`	`static::assertEquals(`
`144`	`144`	`$expected,`
`145`		`- $this->model->getCctypesMapper()`
	`145`	`+ $this->model->getCcTypesMapper()`
`146`	`146`	`);`
`147`	`147`	`}`
`148`	`148`