From 30a49aabb35f1f57ae4452b7da3bb78c57976ccd Mon Sep 17 00:00:00 2001 From: Laura Kishimoto Date: Wed, 30 Sep 2015 14:46:03 +0100 Subject: [PATCH 01/11] Inline link template correction Use inline `span` elements instead of divs for inline link templates. --- .../Cms/view/frontend/templates/widget/link/link_inline.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml index 3004d3191f7c5..aa288cc38fb2d 100644 --- a/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml +++ b/app/code/Magento/Cms/view/frontend/templates/widget/link/link_inline.phtml @@ -4,8 +4,8 @@ * See COPYING.txt for license details. */ ?> -
+ getLinkAttributes() ?>> escapeHtml($block->getLabel()) ?> -
+ From 93990b90bf6400cc8b1329ad6c02de049b97fb7a Mon Sep 17 00:00:00 2001 From: Laura Kishimoto Date: Wed, 30 Sep 2015 14:46:29 +0100 Subject: [PATCH 02/11] Inline link template correction Use inline `span` elements. --- .../frontend/templates/product/widget/link/link_inline.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml index e977e14e25f1e..e2e0f397f4401 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/widget/link/link_inline.phtml @@ -4,6 +4,6 @@ * See COPYING.txt for license details. */ ?> -
+ getLinkAttributes() ?>>escapeHtml($block->getLabel()) ?> -
+ From 1a5ad5bdd4f1a40b0b19697eb30da0728cc0a155 Mon Sep 17 00:00:00 2001 From: Andrii Holovan Date: Tue, 23 Aug 2016 11:17:15 +0300 Subject: [PATCH 03/11] Update elements.xsd looks like elementNameType validator is very strict. I've got an exception in dev mode: #0 (Magento\Framework\Config\Dom\ValidationException): Element 'block', attribute 'name': [facet 'pattern'] The value '4d072daa2b95b9d3fd3995d2faaf2993' is not accepted by the pattern '[a-zA-Z][a-zA-Z\d\-_\.]*'. Line: 645 --- lib/internal/Magento/Framework/View/Layout/etc/elements.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd index 4966d7f88ffbc..401bf2e93f366 100755 --- a/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd +++ b/lib/internal/Magento/Framework/View/Layout/etc/elements.xsd @@ -140,7 +140,7 @@ - + From 4bfd294add2522668f4e193b7e220e26eb3b0c8e Mon Sep 17 00:00:00 2001 From: Denis Rul Date: Wed, 31 Aug 2016 13:37:52 +0300 Subject: [PATCH 04/11] MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline - Apply changes made in 2.1 version --- app/code/Magento/Theme/etc/config.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/code/Magento/Theme/etc/config.xml b/app/code/Magento/Theme/etc/config.xml index 5fa88578183d4..98df41096daef 100644 --- a/app/code/Magento/Theme/etc/config.xml +++ b/app/code/Magento/Theme/etc/config.xml @@ -64,5 +64,10 @@ Disallow: /*SID= + + + 1 + + From 641658c290d521d586ca111593712fbcff035d73 Mon Sep 17 00:00:00 2001 From: Ievgen Kolesov Date: Fri, 2 Sep 2016 19:00:05 +0300 Subject: [PATCH 05/11] MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline - Updating tests --- .../Magento/Catalog/Model/Product/ImageTest.php | 2 +- .../Magento/Cms/Model/Wysiwyg/ConfigTest.php | 2 +- .../Magento/Cms/Model/Wysiwyg/Images/StorageTest.php | 2 +- .../Magento/Email/Model/Template/FilterTest.php | 1 + .../testsuite/Magento/Email/Model/TemplateTest.php | 11 ++++++++--- .../Framework/View/Element/AbstractBlockTest.php | 5 ++++- .../Magento/Variable/Model/Variable/ConfigTest.php | 9 +++++---- .../Magento/Widget/Model/Widget/ConfigTest.php | 6 ++++-- 8 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php index 688dc42958b0b..88fd7797e768f 100644 --- a/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php +++ b/dev/tests/integration/testsuite/Magento/Catalog/Model/Product/ImageTest.php @@ -46,7 +46,7 @@ public function testSaveFilePlaceholder($model) public function testGetUrlPlaceholder($model) { $this->assertStringMatchesFormat( - 'http://localhost/pub/static/frontend/%s/Magento_Catalog/images/product/placeholder/image.jpg', + 'http://localhost/pub/static/%s/frontend/%s/Magento_Catalog/images/product/placeholder/image.jpg', $model->getUrl() ); } diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php index a5f5718d17c1e..fac6a3b48b4a6 100644 --- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/ConfigTest.php @@ -42,7 +42,7 @@ public function testGetConfig() public function testGetConfigCssUrls() { $config = $this->_model->getConfig(); - $publicPathPattern = 'http://localhost/pub/static/adminhtml/Magento/backend/en_US/mage/%s'; + $publicPathPattern = 'http://localhost/pub/static/%s/adminhtml/Magento/backend/en_US/mage/%s'; $this->assertStringMatchesFormat($publicPathPattern, $config->getPopupCss()); $this->assertStringMatchesFormat($publicPathPattern, $config->getContentCss()); } diff --git a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php index 40a97894fc55c..3211bacc613a4 100644 --- a/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php +++ b/dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php @@ -58,7 +58,7 @@ public function testGetFilesCollection() $this->assertInstanceOf(\Magento\Framework\DataObject::class, $item); $this->assertStringEndsWith('/1.swf', $item->getUrl()); $this->assertStringMatchesFormat( - 'http://%s/static/adminhtml/%s/%s/Magento_Cms/images/placeholder_thumbnail.jpg', + 'http://%s/static/%s/adminhtml/%s/%s/Magento_Cms/images/placeholder_thumbnail.jpg', $item->getThumbUrl() ); return; diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php index a6527a6c66936..be9c2afe32f42 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php @@ -283,6 +283,7 @@ public function cssDirectiveDataProvider() * @magentoComponentsDir Magento/Email/Model/_files/design * @magentoAppIsolation enabled * @magentoDbIsolation enabled + * @magentoConfigFixture default_store dev/static/sign 0 * @dataProvider inlinecssDirectiveDataProvider * * @param string $templateText diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php index 700346fe0aed1..6970664948961 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php @@ -578,7 +578,6 @@ public function testGetProcessedTemplateSubject() ->getArea(Area::AREA_FRONTEND) ->load(); - $expectedViewUrl = 'static/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico'; $this->model->setTemplateSubject('{{view url="Magento_Theme::favicon.ico"}}'); $this->model->setDesignConfig([ 'area' => 'frontend', @@ -588,10 +587,16 @@ public function testGetProcessedTemplateSubject() ]); $this->setNotDefaultThemeForFixtureStore(); - $this->assertStringEndsNotWith($expectedViewUrl, $this->model->getProcessedTemplateSubject([])); + $this->assertStringMatchesFormat( + '%s/frontend/Magento/luma/en_US/Magento_Theme/favicon.ico', + $this->model->getProcessedTemplateSubject([]) + ); $this->setDefaultThemeForFixtureStore(); - $this->assertStringEndsWith($expectedViewUrl, $this->model->getProcessedTemplateSubject([])); + $this->assertStringMatchesFormat( + '%s/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico', + $this->model->getProcessedTemplateSubject([]) + ); } /** diff --git a/dev/tests/integration/testsuite/Magento/Framework/View/Element/AbstractBlockTest.php b/dev/tests/integration/testsuite/Magento/Framework/View/Element/AbstractBlockTest.php index 6cd1323782588..1846d25f2db39 100644 --- a/dev/tests/integration/testsuite/Magento/Framework/View/Element/AbstractBlockTest.php +++ b/dev/tests/integration/testsuite/Magento/Framework/View/Element/AbstractBlockTest.php @@ -477,7 +477,10 @@ public function testGetUrl() public function testGetViewFileUrl() { $actualResult = $this->_block->getViewFileUrl('css/styles.css'); - $this->assertStringMatchesFormat('http://localhost/pub/static/frontend/%s/en_US/css/styles.css', $actualResult); + $this->assertStringMatchesFormat( + 'http://localhost/pub/static/%s/frontend/%s/en_US/css/styles.css', + $actualResult + ); } public function testGetModuleName() diff --git a/dev/tests/integration/testsuite/Magento/Variable/Model/Variable/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Variable/Model/Variable/ConfigTest.php index d41bae33c54df..4828cb68190e1 100644 --- a/dev/tests/integration/testsuite/Magento/Variable/Model/Variable/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Variable/Model/Variable/ConfigTest.php @@ -20,7 +20,7 @@ class ConfigTest extends \PHPUnit_Framework_TestCase protected function setUp() { - $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( + $this->_model = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create( \Magento\Variable\Model\Variable\Config::class ); } @@ -28,8 +28,9 @@ protected function setUp() public function testGetWysiwygJsPluginSrc() { $src = $this->_model->getWysiwygJsPluginSrc(); - $this->assertStringStartsWith('http://localhost/pub/static/adminhtml/Magento/backend/en_US/mage/adminhtml/', - $src); - $this->assertStringEndsWith('editor_plugin.js', $src); + $this->assertStringMatchesFormat( + 'http://localhost/pub/static/%s/adminhtml/Magento/backend/en_US/mage/adminhtml/%s/editor_plugin.js', + $src + ); } } diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php index 91aca8173d6f3..368aa34604a50 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php +++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Widget/ConfigTest.php @@ -43,8 +43,10 @@ public function testGetPluginSettings() $this->assertArrayHasKey('widget_window_url', $settings); $jsFilename = $settings['widget_plugin_src']; - $this->assertStringStartsWith('http://localhost/pub/static/adminhtml/Magento/backend/en_US/', $jsFilename); - $this->assertStringEndsWith('editor_plugin.js', $jsFilename); + $this->assertStringMatchesFormat( + 'http://localhost/pub/static/%s/adminhtml/Magento/backend/en_US/%s/editor_plugin.js', + $jsFilename + ); $this->assertInternalType('array', $settings['widget_placeholders']); From 5197f282864840226edd920fd41ca51f1667719b Mon Sep 17 00:00:00 2001 From: Ievgen Kolesov Date: Fri, 2 Sep 2016 20:05:10 +0300 Subject: [PATCH 06/11] MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline - Updating tests --- .../testsuite/Magento/Email/Model/TemplateTest.php | 4 ++-- .../testsuite/Magento/Review/Controller/ProductTest.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php index 6970664948961..15dca70b27a5e 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/TemplateTest.php @@ -122,7 +122,7 @@ public function testGetProcessedTemplate() ->getArea(Area::AREA_FRONTEND) ->load(); - $expectedViewUrl = 'static/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico'; + $expectedViewUrl = '/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico'; $this->model->setDesignConfig([ 'area' => 'frontend', 'store' => $this->objectManager->get(\Magento\Store\Model\StoreManagerInterface::class) @@ -610,7 +610,7 @@ public function testGetDefaultEmailLogo() ->load(); $this->assertStringEndsWith( - 'static/frontend/Magento/luma/en_US/Magento_Email/logo_email.png', + '/frontend/Magento/luma/en_US/Magento_Email/logo_email.png', $this->model->getDefaultEmailLogo() ); } diff --git a/dev/tests/integration/testsuite/Magento/Review/Controller/ProductTest.php b/dev/tests/integration/testsuite/Magento/Review/Controller/ProductTest.php index 35d83ef500077..9c54835d3c511 100644 --- a/dev/tests/integration/testsuite/Magento/Review/Controller/ProductTest.php +++ b/dev/tests/integration/testsuite/Magento/Review/Controller/ProductTest.php @@ -18,6 +18,6 @@ public function testListActionDesign() $this->getRequest()->setParam('id', $product->getId()); $this->dispatch('review/product/listAction'); $result = $this->getResponse()->getBody(); - $this->assertContains("static/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico", $result); + $this->assertContains("/frontend/Magento/blank/en_US/Magento_Theme/favicon.ico", $result); } } From eae5c4574cd357d3c3eaf79b38649a91302c5500 Mon Sep 17 00:00:00 2001 From: "Karpenko, Oleksandr" Date: Wed, 7 Sep 2016 17:15:27 +0300 Subject: [PATCH 07/11] MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline --- app/code/Magento/Deploy/Model/Deployer.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/code/Magento/Deploy/Model/Deployer.php b/app/code/Magento/Deploy/Model/Deployer.php index bef65532fd423..3d041a39b6ffb 100644 --- a/app/code/Magento/Deploy/Model/Deployer.php +++ b/app/code/Magento/Deploy/Model/Deployer.php @@ -215,6 +215,9 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d $libFiles = $this->filesUtil->getStaticLibraryFiles(); $appFiles = $this->filesUtil->getStaticPreProcessingFiles(); + $version = (new \DateTime())->getTimestamp(); + $this->versionStorage->save($version); + foreach ($deployableAreaThemeMap as $area => $themes) { $this->emulateApplicationArea($area); foreach ($locales as $locale) { @@ -319,11 +322,7 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d $this->output->writeln("\nSuccessful: {$this->count} files modified\n---\n"); } - $version = (new \DateTime())->getTimestamp(); $this->output->writeln("New version of deployed files: {$version}"); - if (!$this->getOption(Options::DRY_RUN)) { - $this->versionStorage->save($version); - } if ($this->errorCount > 0) { // we must have an exit code higher than zero to indicate something was wrong From ad400b0576c086861b499f03dba7aec9d9e16ee3 Mon Sep 17 00:00:00 2001 From: "Karpenko, Oleksandr" Date: Wed, 7 Sep 2016 19:14:12 +0300 Subject: [PATCH 08/11] MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline --- app/code/Magento/Deploy/Model/Deployer.php | 56 ++++++++++++---------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/app/code/Magento/Deploy/Model/Deployer.php b/app/code/Magento/Deploy/Model/Deployer.php index 3d041a39b6ffb..85268f12c2ade 100644 --- a/app/code/Magento/Deploy/Model/Deployer.php +++ b/app/code/Magento/Deploy/Model/Deployer.php @@ -216,7 +216,9 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d $appFiles = $this->filesUtil->getStaticPreProcessingFiles(); $version = (new \DateTime())->getTimestamp(); - $this->versionStorage->save($version); + if (!$this->getOption(Options::DRY_RUN)) { + $this->versionStorage->save($version); + } foreach ($deployableAreaThemeMap as $area => $themes) { $this->emulateApplicationArea($area); @@ -228,31 +230,33 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d $this->count = 0; $this->errorCount = 0; - /** @var \Magento\Theme\Model\View\Design $design */ - $design = $this->objectManager->create(\Magento\Theme\Model\View\Design::class); - $design->setDesignTheme($themePath, $area); - - $assetRepo = $this->objectManager->create( - \Magento\Framework\View\Asset\Repository::class, - [ - 'design' => $design, - ] - ); - /** @var \Magento\RequireJs\Model\FileManager $fileManager */ - $fileManager = $this->objectManager->create( - \Magento\RequireJs\Model\FileManager::class, - [ - 'config' => $this->objectManager->create( - \Magento\Framework\RequireJs\Config::class, - [ - 'assetRepo' => $assetRepo, - 'design' => $design, - ] - ), - 'assetRepo' => $assetRepo, - ] - ); - $fileManager->createRequireJsConfigAsset(); + if (!$this->getOption(Options::DRY_RUN)) { + /** @var \Magento\Theme\Model\View\Design $design */ + $design = $this->objectManager->create(\Magento\Theme\Model\View\Design::class); + $design->setDesignTheme($themePath, $area); + + $assetRepo = $this->objectManager->create( + \Magento\Framework\View\Asset\Repository::class, + [ + 'design' => $design, + ] + ); + /** @var \Magento\RequireJs\Model\FileManager $fileManager */ + $fileManager = $this->objectManager->create( + \Magento\RequireJs\Model\FileManager::class, + [ + 'config' => $this->objectManager->create( + \Magento\Framework\RequireJs\Config::class, + [ + 'assetRepo' => $assetRepo, + 'design' => $design, + ] + ), + 'assetRepo' => $assetRepo, + ] + ); + $fileManager->createRequireJsConfigAsset(); + } foreach ($appFiles as $info) { list($fileArea, $fileTheme, , $module, $filePath, $fullPath) = $info; From 012f5c041739fb50c1f3fb2566e1b0176889b143 Mon Sep 17 00:00:00 2001 From: "Karpenko, Oleksandr" Date: Thu, 8 Sep 2016 11:30:44 +0300 Subject: [PATCH 09/11] MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline --- app/code/Magento/Deploy/Model/Deployer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Deploy/Model/Deployer.php b/app/code/Magento/Deploy/Model/Deployer.php index 85268f12c2ade..b925d39d4e09a 100644 --- a/app/code/Magento/Deploy/Model/Deployer.php +++ b/app/code/Magento/Deploy/Model/Deployer.php @@ -302,7 +302,7 @@ public function deploy(ObjectManagerFactory $omFactory, array $locales, array $d $dictionaryFileName = $this->jsTranslationConfig->getDictionaryFileName(); $this->deployFile($dictionaryFileName, $area, $themePath, $locale, null); } - if ($this->getMinification()->isEnabled('js')) { + if ($this->getMinification()->isEnabled('js') && !$this->getOption(Options::DRY_RUN)) { $fileManager->createMinResolverAsset(); } } From 5df01d486904c700c04a5b79c034cd8b903d5da5 Mon Sep 17 00:00:00 2001 From: Ievgen Kolesov Date: Fri, 16 Sep 2016 15:59:41 +0300 Subject: [PATCH 10/11] MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline --- .../Magento/Deploy/Model/DeployManager.php | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Deploy/Model/DeployManager.php b/app/code/Magento/Deploy/Model/DeployManager.php index c54aa38f5a33a..93186f05f9dfd 100644 --- a/app/code/Magento/Deploy/Model/DeployManager.php +++ b/app/code/Magento/Deploy/Model/DeployManager.php @@ -108,6 +108,9 @@ public function deploy() { if ($this->idDryRun) { $this->output->writeln('Dry run. Nothing will be recorded to the target directory.'); + } else { + $version = (new \DateTime())->getTimestamp(); + $this->versionStorage->save($version); } /** @var DeployStrategyProvider $strategyProvider */ @@ -133,7 +136,9 @@ public function deploy() } $this->minifyTemplates(); - $this->saveDeployedVersion(); + if (!$this->idDryRun) { + $this->output->writeln("New version of deployed files: {$version}"); + } return $result; } @@ -197,17 +202,4 @@ private function getProcessesAmount() { return isset($this->options[Options::JOBS_AMOUNT]) ? (int)$this->options[Options::JOBS_AMOUNT] : 0; } - - /** - * Save version of deployed files - * @return void - */ - private function saveDeployedVersion() - { - if (!$this->idDryRun) { - $version = (new \DateTime())->getTimestamp(); - $this->output->writeln("New version of deployed files: {$version}"); - $this->versionStorage->save($version); - } - } } From 362148a987e4f740cb9251789d7ec7aa05de3cd5 Mon Sep 17 00:00:00 2001 From: Ievgen Kolesov Date: Mon, 19 Sep 2016 15:28:05 +0300 Subject: [PATCH 11/11] MAGETWO-56915: Versioning of static files (CSS, JS, Fonts, Images, etc.) doesn't enabled by default - for mainline --- app/code/Magento/Deploy/Model/DeployManager.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/code/Magento/Deploy/Model/DeployManager.php b/app/code/Magento/Deploy/Model/DeployManager.php index 93186f05f9dfd..57c6a78e6b572 100644 --- a/app/code/Magento/Deploy/Model/DeployManager.php +++ b/app/code/Magento/Deploy/Model/DeployManager.php @@ -12,6 +12,9 @@ use Magento\Deploy\Model\Deploy\TemplateMinifier; use Magento\Framework\App\State; +/** + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ class DeployManager { /**