Merge branch '2.1-develop' into MAGETWO-71381-2

Dmytro Voskoboinikov · Dmytro Voskoboinikov · commit 108cb64269f7 · 2018-04-25T15:23:29.000+03:00
diff --git a/README.md b/README.md
@@ -74,6 +74,19 @@ To suggest documentation improvements, click [here][4].
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>
 
+<h3>Community Maintainers</h3>
+The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
+
+<a href="https://magento.com/magento-contributors#maintainers">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
+</a>
+
+<h3>Top Contributors</h3>
+Magento is thankful for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, as their contributions are the foundation of the Magento Open Source platform.
+<a href="https://magento.com/magento-contributors">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
+</a>
+
 <h2>Reporting security issues</h2>
 
 To report security vulnerabilities in Magento software or web sites, please e-mail <a href="mailto:security@magento.com">security@magento.com</a>. Please do not report security issues using GitHub. Be sure to encrypt your e-mail with our <a href="https://info2.magento.com/rs/magentoenterprise/images/security_at_magento.asc">encryption key</a> if it includes sensitive information. Learn more about reporting security issues <a href="https://magento.com/security/reporting-magento-security-issue">here</a>.
diff --git a/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml b/app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml
@@ -22,15 +22,11 @@
         class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>">
         <?php /* @noEscape */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
     </span>
-    <?php if ($block->getSchema()): ?>
-        <span class="_hidden" itemprop="price">
-            <?php /* @noEscape */ echo $block->getDisplayValue()  ?>
-        </span>
-    <?php endif; ?>
     <?php if ($block->hasAdjustmentsHtml()): ?>
         <?php echo $block->getAdjustmentsHtml() ?>
     <?php endif; ?>
     <?php if ($block->getSchema()): ?>
+        <meta itemprop="price" content="<?php /* @noEscape */ echo $block->getDisplayValue(); ?>" />
         <meta itemprop="priceCurrency" content="<?php /* @escapeNotVerified */ echo $block->getDisplayCurrencyCode()?>" />
     <?php endif; ?>
 </span>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml b/app/code/Magento/Checkout/view/frontend/templates/cart/minicart.phtml
@@ -25,7 +25,7 @@
         </span>
     </a>
     <?php if ($block->getIsNeedToDisplaySideBar()): ?>
-        <div class="block block-minicart empty"
+        <div class="block block-minicart"
              data-role="dropdownDialog"
              data-mage-init='{"dropdownDialog":{
                 "appendTo":"[data-block=minicart]",
diff --git a/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml b/app/code/Magento/GroupedProduct/view/base/templates/product/price/final_price.phtml
@@ -17,13 +17,19 @@ $minProduct = $block->getSaleableItem()
     ->getMinProduct();
 
 if ($minProduct) {
+    $finalPrice = $minProduct->getPriceInfo()->getPrice('final_price');
+    $finalPriceValue = $finalPrice->getAmount();
     $amountRender = $block->getRendererPool()
         ->createAmountRender(
-            $minProduct->getPriceInfo()->getPrice('final_price')->getAmount(),
+            $finalPriceValue,
             $minProduct,
-            $minProduct->getPriceInfo()->getPrice('final_price'),
+            $finalPrice,
             ['include_container' => true]
         );
+    $currencyCode = $amountRender->getDisplayCurrencyCode();
+} else {
+    $finalPriceValue = 0;
+    $currencyCode = '';
 }
 ?>
 <div class="price-box" itemprop="offers" itemscope itemtype="http://schema.org/Offer">
@@ -32,4 +38,6 @@ if ($minProduct) {
         <span class="price-label"><?php /* @escapeNotVerified */ echo __('Starting at')?></span><?php echo $amountRender->toHtml();?>
     </p>
     <?php endif ?>
+    <meta itemprop="price" content="<?php /* @noEscape */ echo $finalPriceValue; ?>" />
+    <meta itemprop="priceCurrency" content="<?php /* @noEscape */ echo $currencyCode; ?>" />
 </div>
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -851,7 +851,7 @@ protected function _drawItem(\Magento\Framework\DataObject $item, \Zend_Pdf_Page
     protected function _setFontRegular($object, $size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Re-4.4.1.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerif.ttf')
         );
         $object->setFont($font, $size);
         return $font;
@@ -867,7 +867,7 @@ protected function _setFontRegular($object, $size = 7)
     protected function _setFontBold($object, $size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifBold.ttf')
         );
         $object->setFont($font, $size);
         return $font;
@@ -883,7 +883,7 @@ protected function _setFontBold($object, $size = 7)
     protected function _setFontItalic($object, $size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_It-2.8.2.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifItalic.ttf')
         );
         $object->setFont($font, $size);
         return $font;
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php
@@ -335,7 +335,7 @@ public function getItemOptions()
     protected function _setFontRegular($size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Re-4.4.1.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerif.ttf')
         );
         $this->getPage()->setFont($font, $size);
         return $font;
@@ -350,7 +350,7 @@ protected function _setFontRegular($size = 7)
     protected function _setFontBold($size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifBold.ttf')
         );
         $this->getPage()->setFont($font, $size);
         return $font;
@@ -365,7 +365,7 @@ protected function _setFontBold($size = 7)
     protected function _setFontItalic($size = 7)
     {
         $font = \Zend_Pdf_Font::fontWithPath(
-            $this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_It-2.8.2.ttf')
+            $this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifItalic.ttf')
         );
         $this->getPage()->setFont($font, $size);
         return $font;
diff --git a/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/_minicart.less
@@ -238,7 +238,6 @@
         .product-item-pricing {
             .label {
                 display: inline-block;
-                width: 4.5rem;
             }
         }
 
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -189,10 +189,6 @@
                         &:last-child {
                             margin-bottom: 0;
                         }
-
-                        &._hidden {
-                            display: none;
-                        }
                     }
                 }
             }
diff --git a/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less b/app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/_minicart.less
@@ -243,7 +243,6 @@
         .product-item-pricing {
             .label {
                 display: inline-block;
-                width: 4.5rem;
             }
         }
 
diff --git a/lib/internal/GnuFreeFont/FreeSerif.ttf b/lib/internal/GnuFreeFont/FreeSerif.ttf
diff --git a/lib/internal/GnuFreeFont/FreeSerifBold.ttf b/lib/internal/GnuFreeFont/FreeSerifBold.ttf
diff --git a/lib/internal/GnuFreeFont/FreeSerifItalic.ttf b/lib/internal/GnuFreeFont/FreeSerifItalic.ttf
diff --git a/lib/internal/Magento/Framework/Console/Cli.php b/lib/internal/Magento/Framework/Console/Cli.php
@@ -17,6 +17,7 @@
 use Magento\Framework\Shell\ComplexParameter;
 use Magento\Setup\Console\CompilerPreparation;
 use \Magento\Framework\App\ProductMetadata;
+use Magento\Framework\App\State;
 
 /**
  * Magento 2 CLI Application. This is the hood for all command line tools supported by Magento
@@ -47,6 +48,11 @@ class Cli extends SymfonyApplication
      */
     private $initException;
 
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface
+     */
+    private $objectManager;
+
     /**
      * @param string $name  application name
      * @param string $version application version
@@ -56,15 +62,7 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
     {
         $this->serviceManager = \Zend\Mvc\Application::init(require BP . '/setup/config/application.config.php')
             ->getServiceManager();
-        $generationDirectoryAccess = new GenerationDirectoryAccess($this->serviceManager);
-        if (!$generationDirectoryAccess->check()) {
-            $output = new ConsoleOutput();
-            $output->writeln(
-                '<error>Command line user does not have read and write permissions on var/generation directory.  Please'
-                . ' address this issue before using Magento command line.</error>'
-            );
-            exit(0);
-        }
+
         /**
          * Temporary workaround until the compiler is able to clear the generation directory
          * @todo remove after MAGETWO-44493 resolved
@@ -74,6 +72,21 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
             $compilerPreparation->handleCompilerEnvironment();
         }
 
+        $bootstrapParam = new ComplexParameter(self::INPUT_KEY_BOOTSTRAP);
+        $params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
+        $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
+        $bootstrap = Bootstrap::create(BP, $params);
+        $this->objectManager = $bootstrap->getObjectManager();
+
+        if ($this->checkGenerationDirectoryAccess()) {
+            $output = new ConsoleOutput();
+            $output->writeln(
+                '<error>Command line user does not have read and write permissions on var/generation directory.  Please'
+                . ' address this issue before using Magento command line.</error>'
+            );
+            exit(0);
+        }
+
         if ($version == 'UNKNOWN') {
             $directoryList      = new DirectoryList(BP);
             $composerJsonFinder = new ComposerJsonFinder($directoryList);
@@ -83,6 +96,22 @@ public function __construct($name = 'UNKNOWN', $version = 'UNKNOWN')
         parent::__construct($name, $version);
     }
 
+    /**
+     * Check generation directory access.
+     *
+     * Skip and return true if production mode is enabled.
+     *
+     * @return bool
+     */
+    private function checkGenerationDirectoryAccess()
+    {
+        $generationDirectoryAccess = new GenerationDirectoryAccess($this->serviceManager);
+        /** @var State $state */
+        $state = $this->objectManager->create(State::class);
+
+        return $state->getMode() !== State::MODE_PRODUCTION && !$generationDirectoryAccess->check();
+    }
+
     /**
      * Process an error happened during initialization of commands, if any
      *
@@ -121,31 +150,25 @@ protected function getApplicationCommands()
     {
         $commands = [];
         try {
-            $bootstrapParam = new ComplexParameter(self::INPUT_KEY_BOOTSTRAP);
-            $params = $bootstrapParam->mergeFromArgv($_SERVER, $_SERVER);
-            $params[Bootstrap::PARAM_REQUIRE_MAINTENANCE] = null;
-            $bootstrap = Bootstrap::create(BP, $params);
-            $objectManager = $bootstrap->getObjectManager();
-
             // Specialized setup command list available before and after M2 install
             if (class_exists('Magento\Setup\Console\CommandList')
                 && class_exists('Magento\Setup\Model\ObjectManagerProvider')
             ) {
                 /** @var \Magento\Setup\Model\ObjectManagerProvider $omProvider */
                 $omProvider = $this->serviceManager->get(\Magento\Setup\Model\ObjectManagerProvider::class);
-                $omProvider->setObjectManager($objectManager);
+                $omProvider->setObjectManager($this->objectManager);
                 $setupCommandList = new \Magento\Setup\Console\CommandList($this->serviceManager);
                 $commands = array_merge($commands, $setupCommandList->getCommands());
             }
 
             // Allowing instances of all modular commands only after M2 install
-            if ($objectManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
+            if ($this->objectManager->get(\Magento\Framework\App\DeploymentConfig::class)->isAvailable()) {
                 /** @var \Magento\Framework\Console\CommandListInterface $commandList */
-                $commandList = $objectManager->create(\Magento\Framework\Console\CommandListInterface::class);
+                $commandList = $this->objectManager->create(\Magento\Framework\Console\CommandListInterface::class);
                 $commands = array_merge($commands, $commandList->getCommands());
             }
 
-            $commands = array_merge($commands, $this->getVendorCommands($objectManager));
+            $commands = array_merge($commands, $this->getVendorCommands($this->objectManager));
         } catch (\Exception $e) {
             $this->initException = $e;
         }
diff --git a/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php b/lib/internal/Magento/Framework/DB/Adapter/AdapterInterface.php
@@ -492,6 +492,13 @@ public function insertForce($table, array $bind);
     /**
      * Updates table rows with specified data based on a WHERE clause.
      *
+     * The $where parameter in this instance can be a single WHERE clause or an array containing a multiple.  In all
+     * instances, a WHERE clause can be a string or an instance of {@see Zend_Db_Expr}.  In the event you use an array,
+     * you may specify the clause as the key and a value to be bound to it as the value. E.g., ['amt > ?' => $amt]
+     *
+     * If the $where parameter is an array of multiple clauses, they will be joined by AND, with each clause wrapped in
+     * parenthesis.  If you wish to use an OR, you must give a single clause that is an instance of {@see Zend_Db_Expr}
+     *
      * @param  mixed        $table The table to update.
      * @param  array        $bind  Column-value pairs.
      * @param  mixed        $where UPDATE WHERE clause(s).
@@ -928,7 +935,6 @@ public function getDateExtractSql($date, $unit);
      */
     public function getTableName($tableName);
 
-
     /**
      * Build a trigger name based on table name and trigger details
      *
diff --git a/lib/internal/Magento/Framework/Setup/FilePermissions.php b/lib/internal/Magento/Framework/Setup/FilePermissions.php
@@ -9,6 +9,8 @@
 use Magento\Framework\Backup\Filesystem\Iterator\Filter;
 use Magento\Framework\Filesystem\Filter\ExcludeFilter;
 use Magento\Framework\Filesystem;
+use Magento\Framework\App\State;
+use Magento\Framework\App\ObjectManager;
 
 class FilePermissions
 {
@@ -22,6 +24,11 @@ class FilePermissions
      */
     protected $directoryList;
 
+    /**
+     * @var State
+     */
+    private $state;
+
     /**
      * List of required writable directories for installation
      *
@@ -60,13 +67,16 @@ class FilePermissions
     /**
      * @param Filesystem $filesystem
      * @param DirectoryList $directoryList
+     * @param State $state
      */
     public function __construct(
         Filesystem $filesystem,
-        DirectoryList $directoryList
+        DirectoryList $directoryList,
+        State $state = null
     ) {
         $this->filesystem = $filesystem;
         $this->directoryList = $directoryList;
+        $this->state = $state ?: ObjectManager::getInstance()->get(State::class);
     }
 
     /**
@@ -141,12 +151,15 @@ private function checkRecursiveDirectories($directory)
             new \RecursiveDirectoryIterator($directory, \RecursiveDirectoryIterator::SKIP_DOTS),
             \RecursiveIteratorIterator::CHILD_FIRST
         );
-        $noWritableFilesFolders = [
-            $this->directoryList->getPath(DirectoryList::GENERATION) . '/',
-            $this->directoryList->getPath(DirectoryList::DI) . '/',
-        ];
 
-        $directoryIterator = new Filter($directoryIterator, $noWritableFilesFolders);
+        $generationPath = $this->directoryList->getPath(DirectoryList::GENERATION);
+        $diPath = $this->directoryList->getPath(DirectoryList::DI);
+
+        if ($this->state->getMode() === State::MODE_PRODUCTION) {
+            $directoryIterator = new ExcludeFilter($directoryIterator, [$generationPath, $diPath]);
+        } else {
+            $directoryIterator = new Filter($directoryIterator, [$generationPath . '/', $diPath . '/']);
+        }
 
         $directoryIterator = new ExcludeFilter(
             $directoryIterator,
diff --git a/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php b/lib/internal/Magento/Framework/Setup/Test/Unit/FilePermissionsTest.php
diff --git a/setup/index.php b/setup/index.php
diff --git a/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php b/setup/src/Magento/Setup/Mvc/Bootstrap/InitParamListener.php

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,6 @@`
`238`	`238`	`.product-item-pricing {`
`239`	`239`	`.label {`
`240`	`240`	`display: inline-block;`
`241`		`- width: 4.5rem;`
`242`	`241`	`}`
`243`	`242`	`}`
`244`	`243`
Original file line number	Diff line number	Diff line change
`@@ -189,10 +189,6 @@`
`189`	`189`	`&:last-child {`
`190`	`190`	`margin-bottom: 0;`
`191`	`191`	`}`
`192`		`-`
`193`		`- &._hidden {`
`194`		`- display: none;`
`195`		`- }`
`196`	`192`	`}`
`197`	`193`	`}`
`198`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,6 @@`
`243`	`243`	`.product-item-pricing {`
`244`	`244`	`.label {`
`245`	`245`	`display: inline-block;`
`246`		`- width: 4.5rem;`
`247`	`246`	`}`
`248`	`247`	`}`
`249`	`248`