diff --git a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml index c93b216fc89d5..bc8f3e49272b7 100644 --- a/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml +++ b/app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontSortingByPriceForConfigurableWithCatalogRuleAppliedTest.xml @@ -16,7 +16,7 @@ - + diff --git a/app/code/Magento/Deploy/Model/Filesystem.php b/app/code/Magento/Deploy/Model/Filesystem.php index bc19ee287858d..e0a341f1f3318 100644 --- a/app/code/Magento/Deploy/Model/Filesystem.php +++ b/app/code/Magento/Deploy/Model/Filesystem.php @@ -16,7 +16,7 @@ /** * Generate static files, compile * - * Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories + * Clear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories * * @SuppressWarnings(PHPMD.CouplingBetweenObjects) */ @@ -156,7 +156,7 @@ public function __construct( public function regenerateStatic( OutputInterface $output ) { - // Сlear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories + // Clear generated/code, generated/metadata/, var/view_preprocessed and pub/static directories $this->cleanupFilesystem( [ DirectoryList::CACHE, @@ -285,22 +285,7 @@ public function cleanupFilesystem($directoryCodeList) $excludePatterns = ['#.htaccess#', '#deployed_version.txt#']; foreach ($directoryCodeList as $code) { if ($code == DirectoryList::STATIC_VIEW) { - $directoryPath = $this->directoryList->getPath(DirectoryList::STATIC_VIEW); - if ($this->driverFile->isExists($directoryPath)) { - $files = $this->driverFile->readDirectory($directoryPath); - foreach ($files as $file) { - foreach ($excludePatterns as $pattern) { - if (preg_match($pattern, $file)) { - continue 2; - } - } - if ($this->driverFile->isFile($file)) { - $this->driverFile->deleteFile($file); - } else { - $this->driverFile->deleteDirectory($file); - } - } - } + $this->cleanupStaticDirectory($excludePatterns); } else { $this->filesystem->getDirectoryWrite($code) ->delete(); @@ -374,4 +359,30 @@ private function reinitCacheDirectories() $command = $this->functionCallPath . 'cache:flush'; $this->shell->execute($command); } + + /** + * Cleanup directory with static view files. + * + * @param array $excludePatterns + * @throws \Magento\Framework\Exception\FileSystemException + */ + private function cleanupStaticDirectory(array $excludePatterns): void + { + $directoryPath = $this->directoryList->getPath(DirectoryList::STATIC_VIEW); + if ($this->driverFile->isExists($directoryPath)) { + $files = $this->driverFile->readDirectory($directoryPath); + foreach ($files as $file) { + foreach ($excludePatterns as $pattern) { + if (preg_match($pattern, $file)) { + continue 2; + } + } + if ($this->driverFile->isFile($file)) { + $this->driverFile->deleteFile($file); + } else { + $this->driverFile->deleteDirectory($file); + } + } + } + } } diff --git a/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php b/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php index 79ac53d3a449f..4e72b37b9c2d9 100644 --- a/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php +++ b/app/code/Magento/Directory/Setup/Patch/Data/InitializeDirectoryData.php @@ -13,6 +13,7 @@ /** * Class InitializeDirectoryData + * * @package Magento\Directory\Setup\Patch */ class InitializeDirectoryData implements DataPatchInterface, PatchVersionInterface @@ -41,7 +42,8 @@ public function __construct( } /** - * {@inheritdoc} + * @inheritdoc + * * @SuppressWarnings(PHPMD.ExcessiveMethodLength) */ public function apply() @@ -874,7 +876,7 @@ public function apply() } /** - * {@inheritdoc} + * @inheritdoc */ public static function getDependencies() { @@ -882,7 +884,7 @@ public static function getDependencies() } /** - * {@inheritdoc} + * @inheritdoc */ public static function getVersion() { @@ -890,7 +892,7 @@ public static function getVersion() } /** - * {@inheritdoc} + * @inheritdoc */ public function getAliases() { diff --git a/app/code/Magento/Ui/etc/ui_configuration.xsd b/app/code/Magento/Ui/etc/ui_configuration.xsd index b839593a38f47..d45a3d7497637 100644 --- a/app/code/Magento/Ui/etc/ui_configuration.xsd +++ b/app/code/Magento/Ui/etc/ui_configuration.xsd @@ -560,7 +560,7 @@ The ExportButton component exports grid data to the specified data format (cvs, xml, and so on). - To enable the ExportButton сomponent, add the "exportButton" element with a "selectProvider" item + To enable the ExportButton component, add the "exportButton" element with a "selectProvider" item to the listing configuration file. diff --git a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php index c5efedf6a08d0..5fed5854025c1 100644 --- a/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php +++ b/dev/tests/functional/tests/app/Magento/CatalogImportExport/Test/Constraint/AssertImportedProducts.php @@ -155,7 +155,7 @@ private function getResultCsv($productSku) * 'type' => 'simple', * 'qty' => '100', * 'weight' => '30', - * 'url_key' => 'simple_url'б, + * 'url_key' => 'simple_url', * 'website_ids' => [ * '1' * ] diff --git a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php index a9f6b0047c888..240db6b0359c8 100644 --- a/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php +++ b/dev/tests/functional/tests/app/Magento/SalesRule/Test/Constraint/AssertCartPriceRuleApplying.php @@ -111,7 +111,7 @@ abstract protected function assert(); * 4. Clear shopping cart * 5. Add test product(s) to shopping cart with specify quantity * 6. If "salesRule/data/coupon_code" not empty: - * - fill "Enter your code" input in Dіscount Codes + * - fill "Enter your code" input in Discount Codes * - click "Apply Coupon" button * 7. If "address/data/country_id" not empty: * On Estimate Shipping and Tax: diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php index 70ee121a856d6..7c7ae9f447ae6 100644 --- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php +++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php @@ -239,7 +239,7 @@ ['_url', 'Magento\Framework\View\Asset\Minified', 'url'], ['_viewUrl', 'Magento\Framework\View\Asset\Minified', 'viewUrl'], ['_logger', 'Magento\Framework\View\Asset\Minified', 'logger'], - ['_scopeConfig', 'Magento\Framework\View\Asset\MinifyService', 'сonfig'], + ['_scopeConfig', 'Magento\Framework\View\Asset\MinifyService', 'config'], ['_objectManager', 'Magento\Framework\View\Asset\MinifyService', 'objectManager'], ['_enabled', 'Magento\Framework\View\Asset\MinifyService', 'enabled'], ['_minifiers', 'Magento\Framework\View\Asset\MinifyService', 'minifiers'], diff --git a/lib/internal/Magento/Framework/DB/Query/BatchIteratorInterface.php b/lib/internal/Magento/Framework/DB/Query/BatchIteratorInterface.php index 48b07af7aa026..b1ce64e610fb5 100644 --- a/lib/internal/Magento/Framework/DB/Query/BatchIteratorInterface.php +++ b/lib/internal/Magento/Framework/DB/Query/BatchIteratorInterface.php @@ -34,7 +34,7 @@ public function current(); /** * Return the key of the current element * - * Сan return the number of the current sub-select in the iteration. + * Can return the number of the current sub-select in the iteration. * * @return int */ diff --git a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php index e2ef4ae530a9d..2fee8d55fb673 100644 --- a/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php +++ b/lib/internal/Magento/Framework/DB/Query/BatchRangeIterator.php @@ -122,7 +122,7 @@ public function current() /** * Return the key of the current element * - * Сan return the number of the current sub-select in the iteration. + * Can return the number of the current sub-select in the iteration. * * @return int */ diff --git a/lib/internal/Magento/Framework/Locale/Config.php b/lib/internal/Magento/Framework/Locale/Config.php index fe685fdf35b73..499c3bd26a3ae 100644 --- a/lib/internal/Magento/Framework/Locale/Config.php +++ b/lib/internal/Magento/Framework/Locale/Config.php @@ -81,7 +81,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface 'ms_Latn_MY', /*Malaysian (Malaysia)*/ 'nl_BE', /*Dutch (Belgium)*/ 'nl_NL', /*Dutch (Netherlands)*/ - 'nb_NO', /*Norwegian BokmГ_l (Norway)*/ + 'nb_NO', /*Norwegian Bokmål (Norway)*/ 'nn_NO', /*Norwegian Nynorsk (Norway)*/ 'pl_PL', /*Polish (Poland)*/ 'pt_BR', /*Portuguese (Brazil)*/