Merge pull request #2575 from magento-borg/MAGETWO-89410-testValidComposer

Fixed issues:
- MAGETWO-86709 Widget isn't updated on Storefront if related Products are updated
- MAGETWO-89410 [2.3] Test testValidComposerJson fails on bundle extensions
- MAGETWO-87492 Rename 2.3 upgrade script

Author: slavvka

app/code/Magento/Catalog/etc/widget.xml

@@ -64,7 +64,11 @@
             </parameter>
             <parameter name="cache_lifetime" xsi:type="text" visible="true">
                 <label translate="true">Cache Lifetime (Seconds)</label>
-                <description translate="true">86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.</description>
+                <description translate="true">
+                    <![CDATA[Time in seconds between the widget updates.
+                    <br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+                    <br/>Widget will not show products that begin to match the specified conditions until cache is refreshed.]]>
+                </description>
             </parameter>
         </parameters>
         <containers>

app/code/Magento/Catalog/i18n/en_US.csv

@@ -705,7 +705,13 @@ Template,Template
 "New Products Names Only Template","New Products Names Only Template"
 "New Products Images Only Template","New Products Images Only Template"
 "Cache Lifetime (Seconds)","Cache Lifetime (Seconds)"
-"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Time in seconds between the widget updates.
+<br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+<br/>Widget will not show products that begin to match the specified conditions until cache is refreshed."
+,
+"Time in seconds between the widget updates.
+<br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+<br/>Widget will not show products that begin to match the specified conditions until cache is refreshed."
 "Catalog Product Link","Catalog Product Link"
 "Link to a Specified Product","Link to a Specified Product"
 "Select Product...","Select Product..."

app/code/Magento/CatalogWidget/etc/widget.xml

@@ -40,7 +40,11 @@
             </parameter>
             <parameter name="cache_lifetime" xsi:type="text" visible="true">
                 <label translate="true">Cache Lifetime (Seconds)</label>
-                <description translate="true">86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.</description>
+                <description translate="true">
+                    <![CDATA[Time in seconds between the widget updates.
+                    <br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+                    <br/>Widget will not show products that begin to match the specified conditions until cache is refreshed.]]>
+                </description>
             </parameter>
             <parameter name="condition" xsi:type="conditions" visible="true" required="true" sort_order="10"
                        class="Magento\CatalogWidget\Block\Product\Widget\Conditions">

app/code/Magento/CatalogWidget/i18n/en_US.csv

@@ -16,5 +16,11 @@ Title,Title
 Template,Template
 "Products Grid Template","Products Grid Template"
 "Cache Lifetime (Seconds)","Cache Lifetime (Seconds)"
-"86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache.","86400 by default, if not set. To refresh instantly, clear the Blocks HTML Output cache."
+"Time in seconds between the widget updates.
+<br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+<br/>Widget will not show products that begin to match the specified conditions until cache is refreshed."
+,
+"Time in seconds between the widget updates.
+<br/>If not set, equals to 86400 seconds (24 hours). To update widget instantly, go to Cache Management and clear Blocks HTML Output cache.
+<br/>Widget will not show products that begin to match the specified conditions until cache is refreshed."
 Conditions,Conditions

bin/UpgradeScripts/2.3_upgrade_additions.php renamed to bin/UpgradeScripts/pre_composer_update_2.3.php

@@ -171,7 +171,9 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
         switch ($packageType) {
             case 'magento2-module':
                 $xml = simplexml_load_file("$dir/etc/module.xml");
-                $this->assertConsistentModuleName($xml, $json->name);
+                if ($this->isVendorMagento($json->name)) {
+                    $this->assertConsistentModuleName($xml, $json->name);
+                }
                 $this->assertDependsOnPhp($json->require);
                 $this->assertPhpVersionInSync($json->name, $json->require->php);
                 $this->assertDependsOnFramework($json->require);
@@ -210,6 +212,17 @@ private function assertMagentoConventions($dir, $packageType, \StdClass $json)
         }
     }
 
+    /**
+     * Returns true if package vendor is Magento.
+     *
+     * @param string $packageName
+     * @return bool
+     */
+    private function isVendorMagento($packageName)
+    {
+        return strpos($packageName, 'magento') === 0;
+    }
+
     /**
      * Assert that component registrar is autoloaded in composer json
      *