diff --git a/.htaccess b/.htaccess
index 6247830fa8d14b67d8a4b7591753f4ae92ce6c9f..4298b10d9ca7ad863cb81a7fb574027737af0b80 100644
--- a/.htaccess
+++ b/.htaccess
@@ -346,6 +346,15 @@
Require all denied
</IfVersion>
</Files>
+ <Files auth.json>
+ <IfVersion < 2.4>
+ order allow,deny
+ deny from all
+ </IfVersion>
+ <IfVersion >= 2.4>
+ Require all denied
+ </IfVersion>
+ </Files>
<Files magento_umask>
<IfVersion < 2.4>
order allow,deny
diff --git a/.htaccess.sample b/.htaccess.sample
index 3c412725f21343bcd2212be80a969a77f4219f35..a521a347232f50154d2265a8a6ab0c3e754633b4 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -323,6 +323,15 @@
Require all denied
</IfVersion>
</Files>
+ <Files auth.json>
+ <IfVersion < 2.4>
+ order allow,deny
+ deny from all
+ </IfVersion>
+ <IfVersion >= 2.4>
+ Require all denied
+ </IfVersion>
+ </Files>
<Files magento_umask>
<IfVersion < 2.4>
order allow,deny
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8270f8908a3c70f9235183c6667922dfab28a129..a5e94e46f89d1f810dd40b774ed923b7ae996d74 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,229 @@
+2.2.2
+=============
+* GitHub issues:
+ * [#9968](https://github.com/magento/magento2/issues/9968) -- Canceled invoice can be canceled again (fixed in [#11261](https://github.com/magento/magento2/pull/11261))
+ * [#11310](https://github.com/magento/magento2/issues/11310) -- Method "getChildren" sort ordering (fixed in [#11342](https://github.com/magento/magento2/pull/11342))
+ * [#11332](https://github.com/magento/magento2/issues/11332) -- How to Fix the wrong input format of Customer date of birth (fixed in [#11351](https://github.com/magento/magento2/pull/11351))
+ * [#11207](https://github.com/magento/magento2/issues/11207) -- Shipment API won't append comment to email (fixed in [#11383](https://github.com/magento/magento2/pull/11383))
+ * [#10795](https://github.com/magento/magento2/issues/10795) -- Shipping method radios have duplicate IDs on cart page (fixed in [#11406](https://github.com/magento/magento2/pull/11406))
+ * [#10941](https://github.com/magento/magento2/issues/10941) -- Responsive Design Issue on Mobile with Magento 2.1.9 (fixed in [#11430](https://github.com/magento/magento2/pull/11430))
+ * [#10007](https://github.com/magento/magento2/issues/10007) -- ProductAlert: Product alerts not showing in admin side product edit page (fixed in [#11445](https://github.com/magento/magento2/pull/11445))
+ * [#10231](https://github.com/magento/magento2/issues/10231) -- Custom URL Rewrite Not working (fixed in [#11470](https://github.com/magento/magento2/pull/11470))
+ * [#11176](https://github.com/magento/magento2/issues/11176) -- Configured table prefix is not recognized in CLI admin:user:create (fixed in [#11199](https://github.com/magento/magento2/pull/11199))
+ * [#11275](https://github.com/magento/magento2/issues/11275) -- Call to a member function addCrumb() (fixed in [#11299](https://github.com/magento/magento2/pull/11299))
+ * [#10441](https://github.com/magento/magento2/issues/10441) -- State/Province Not displayed after edit Billing Address on Sales Orders - Backend Admin. (fixed in [#11381](https://github.com/magento/magento2/pull/11381))
+ * [#11140](https://github.com/magento/magento2/issues/11140) -- Going to '/admin' while using storecodes in url and a different adminhtml url will throw exception (fixed in [#11460](https://github.com/magento/magento2/pull/11460))
+ * [#10765](https://github.com/magento/magento2/issues/10765) -- Export data from grid not adding custom rendered data magento2 (fixed in [#11437](https://github.com/magento/magento2/pull/11437))
+ * [#7678](https://github.com/magento/magento2/issues/7678) -- StockItemCriteria::setProductsFilter doesn't work with array of ids (fixed in [#11500](https://github.com/magento/magento2/pull/11500))
+ * [#9783](https://github.com/magento/magento2/issues/9783) -- Multiple parameters in widget.xml not allowed (fixed in [#11495](https://github.com/magento/magento2/pull/11495))
+ * [#10824](https://github.com/magento/magento2/issues/10824) -- Cannot add new columns to item grid in admin sales_order_view layout (fixed in [#11235](https://github.com/magento/magento2/pull/11235))
+ * [#9919](https://github.com/magento/magento2/issues/9919) -- Pattern Validation via UI Component Fails to Interpret String as RegEx Pattern (fixed in [#11565](https://github.com/magento/magento2/pull/11565))
+ * [#5439](https://github.com/magento/magento2/issues/5439) -- Newsletter subscription (fixed in [#11317](https://github.com/magento/magento2/pull/11317))
+ * [#10856](https://github.com/magento/magento2/issues/10856) -- Sync billing with shipping address on Admin Reorder and Admin Customer Create Order page does not work for Existing address selected (fixed in [#11385](https://github.com/magento/magento2/pull/11385))
+ * [#10025](https://github.com/magento/magento2/issues/10025) -- Integration tests don't reset the database (fixed in [#11499](https://github.com/magento/magento2/pull/11499))
+ * [#10301](https://github.com/magento/magento2/issues/10301) -- Customer review report search Bug in 2.1.x, 2.2 (fixed in [#11522](https://github.com/magento/magento2/pull/11522))
+ * [#11540](https://github.com/magento/magento2/issues/11540) -- Magento sets iso invalid language code in html header (fixed in [#11561](https://github.com/magento/magento2/pull/11561))
+ * [#11586](https://github.com/magento/magento2/issues/11586) -- Cron install / remove via command messes up stderr 2>&1 entries (fixed in [#11591](https://github.com/magento/magento2/pull/11591))
+ * [#6350](https://github.com/magento/magento2/issues/6350) -- Frontend: Datepicker/calendar control does not use the store locale (fixed in [#11057](https://github.com/magento/magento2/pull/11057))
+ * [#11328](https://github.com/magento/magento2/issues/11328) -- app:config:dump adds extra space every time in multiline array value (fixed in [#11439](https://github.com/magento/magento2/pull/11439))
+ * [#7591](https://github.com/magento/magento2/issues/7591) -- PayPal module, "didgit" misspelling (fixed in [#11673](https://github.com/magento/magento2/pull/11673))
+ * [#7767](https://github.com/magento/magento2/issues/7767) -- in system.xml translate phrase not work (fixed in [#11675](https://github.com/magento/magento2/pull/11675))
+ * [#7915](https://github.com/magento/magento2/issues/7915) -- customer objects are equal to eachother after observing event customer_save_after_data_object (fixed in [#11676](https://github.com/magento/magento2/pull/11676))
+ * [#10275](https://github.com/magento/magento2/issues/10275) -- Admin global search - submit by enter doesn't work (fixed in [#11250](https://github.com/magento/magento2/pull/11250))
+ * [#11022](https://github.com/magento/magento2/issues/11022) -- GET v1/products/attribute-sets/sets/list inconsistent return result (fixed in [#11421](https://github.com/magento/magento2/pull/11421))
+ * [#5956](https://github.com/magento/magento2/issues/5956) -- Untranslatable string "Please enter the same value again." (fixed in [#11440](https://github.com/magento/magento2/pull/11440))
+ * [#9944](https://github.com/magento/magento2/issues/9944) -- Name attribute shows empty when creating custom fields on product creation form (fixed in [#11637](https://github.com/magento/magento2/pull/11637))
+ * [#10168](https://github.com/magento/magento2/issues/10168) -- Coupon codes not showing in invoice (fixed in [#11635](https://github.com/magento/magento2/pull/11635))
+ * [#9763](https://github.com/magento/magento2/issues/9763) -- When go checkout,Cart Price Rules 25%test coupon code can go wrong (fixed in [#11710](https://github.com/magento/magento2/pull/11710))
+ * [#11157](https://github.com/magento/magento2/issues/11157) -- nginx.sample.conf missing heath_check.php? (fixed in [#11690](https://github.com/magento/magento2/pull/11690))
+ * [#11322](https://github.com/magento/magento2/issues/11322) -- User.ini files specify 768M - Docs recommend at least 1G (fixed in [#11734](https://github.com/magento/magento2/pull/11734))
+ * [#7927](https://github.com/magento/magento2/issues/7927) -- Dashboard graph has broken y-axis range (fixed in [#11751](https://github.com/magento/magento2/pull/11751))
+ * [#7099](https://github.com/magento/magento2/issues/7099) -- Admin: field labels wrapping poorly (fixed in [#11745](https://github.com/magento/magento2/pull/11745))
+ * [#9869](https://github.com/magento/magento2/issues/9869) -- datetime type product attribute showing current date (fixed in [#11749](https://github.com/magento/magento2/pull/11749))
+ * [#11365](https://github.com/magento/magento2/issues/11365) -- "Ignore this notification" isn't working (fixed in [#11410](https://github.com/magento/magento2/pull/11410))
+ * [#6891](https://github.com/magento/magento2/issues/6891) -- Add-to-cart checkbox still visible when $canItemsAddToCart = false (fixed in [#11610](https://github.com/magento/magento2/pull/11610))
+ * [#11729](https://github.com/magento/magento2/issues/11729) -- Exported Excel with negative number can't be opened by MS Office (fixed in [#11757](https://github.com/magento/magento2/pull/11757))
+ * [#6924](https://github.com/magento/magento2/issues/6924) -- Magento 2.1.0 - "General system exception happened" on Import .csv (fixed in [#11363](https://github.com/magento/magento2/pull/11363))
+ * [#7640](https://github.com/magento/magento2/issues/7640) -- X-Magento-Tags header containing whitespaces causes exception (fixed in [#11767](https://github.com/magento/magento2/pull/11767))
+ * [#4711](https://github.com/magento/magento2/issues/4711) -- Improve error reporting for products images import (fixed in [#11779](https://github.com/magento/magento2/pull/11779))
+ * [#4696](https://github.com/magento/magento2/issues/4696) -- Admin product search - Pressing enter does not submit (fixed in [#11827](https://github.com/magento/magento2/pull/11827))
+ * [#11581](https://github.com/magento/magento2/issues/11581) -- Reference to wrong / non-existing class (fixed in [#11830](https://github.com/magento/magento2/pull/11830))
+ * [#10908](https://github.com/magento/magento2/issues/10908) -- [2.2.0-rc3.0] Language switcher is broken when using multiple times (fixed in [#11337](https://github.com/magento/magento2/pull/11337))
+ * [#11211](https://github.com/magento/magento2/issues/11211) -- Store View switcher not working on front-end and it throws an error (fixed in [#11337](https://github.com/magento/magento2/pull/11337))
+ * [#2991](https://github.com/magento/magento2/issues/2991) -- Products added to cart with REST API give total prices equal to zero (fixed in [#11458](https://github.com/magento/magento2/pull/11458))
+ * [#10032](https://github.com/magento/magento2/issues/10032) -- Download back-up .tgz always takes the latest that's created (fixed in [#11595](https://github.com/magento/magento2/pull/11595))
+ * [#11534](https://github.com/magento/magento2/issues/11534) -- Values of Visual Swatch Attribute drop down is not work correct (fixed in [#11747](https://github.com/magento/magento2/pull/11747))
+ * [#10291](https://github.com/magento/magento2/issues/10291) -- Magento 2 Loading custom option dropdown issue (fixed in [#11824](https://github.com/magento/magento2/pull/11824))
+ * [#11095](https://github.com/magento/magento2/issues/11095) -- Magento_Tax "postcode is a required field" when upgrading from 2.1.9 to 2.2 (fixed in [#11651](https://github.com/magento/magento2/pull/11651))
+ * [#8236](https://github.com/magento/magento2/issues/8236) -- CMS blocks are not validated against having same store and identifier (fixed in [#11802](https://github.com/magento/magento2/pull/11802))
+ * [#4808](https://github.com/magento/magento2/issues/4808) -- The price of product custom option can't be set to 0. (fixed in [#11843](https://github.com/magento/magento2/pull/11843))
+ * [#9566](https://github.com/magento/magento2/issues/9566) -- Status label is wrong in admin (fixed in [#11397](https://github.com/magento/magento2/pull/11397))
+ * [#5015](https://github.com/magento/magento2/issues/5015) -- Report error csv doesn't work when trying to import a csv file with semicolon delimiter (fixed in [#11732](https://github.com/magento/magento2/pull/11732))
+ * [#10682](https://github.com/magento/magento2/issues/10682) -- Meta description and keywords transform to html entities for non latin/cyrilic characters in category and product pages (fixed in [#11829](https://github.com/magento/magento2/pull/11829))
+ * [#10185](https://github.com/magento/magento2/issues/10185) -- New Orders are not in Order grid after data migration from M 1.7.0.2 to M 2.1.7 (fixed in [#11911](https://github.com/magento/magento2/pull/11911))
+ * [#8970](https://github.com/magento/magento2/issues/8970) -- Cannot assign products to categories not under tree root (fixed in [#11817](https://github.com/magento/magento2/pull/11817))
+ * [#9028](https://github.com/magento/magento2/issues/9028) -- You cannot set a 303 redirect response using a result factory (fixed in [#11405](https://github.com/magento/magento2/pull/11405))
+ * [#11697](https://github.com/magento/magento2/issues/11697) -- Theme: Added html node to page xml root, cause validation error (fixed in [#11858](https://github.com/magento/magento2/pull/11858))
+ * [#8954](https://github.com/magento/magento2/issues/8954) -- Error While Trying To Load Quote Item Collection Using Magento\Quote\Model\ResourceModel\QuoteItem\Collection::getItems() (fixed in [#11869](https://github.com/magento/magento2/pull/11869))
+ * [#8799](https://github.com/magento/magento2/issues/8799) -- Image brackground (fixed in [#11889](https://github.com/magento/magento2/pull/11889))
+ * [#11868](https://github.com/magento/magento2/issues/11868) -- "Add Products" button has been duplicated after the customer group was changed (fixed in [#11949](https://github.com/magento/magento2/pull/11949))
+ * [#11898](https://github.com/magento/magento2/issues/11898) -- Zip code Netherlands should allow zipcode without space (fixed in [#11959](https://github.com/magento/magento2/pull/11959))
+ * [#11996](https://github.com/magento/magento2/issues/11996) -- Magento 2 Store Code validation regex: doesn't support uppercase letters in store code (fixed in [#12011](https://github.com/magento/magento2/pull/12011))
+ * [#7995](https://github.com/magento/magento2/issues/7995) -- If you leave as default, shipping lines disappear (fixed in [#12013](https://github.com/magento/magento2/pull/12013))
+ * [#8846](https://github.com/magento/magento2/issues/8846) -- Attribute option value uniqueness is not checked if created via REST Api (fixed in [#11785](https://github.com/magento/magento2/pull/11785))
+ * [#11700](https://github.com/magento/magento2/issues/11700) -- "Something Went Wrong" error for limited access admin user (fixed in [#11993](https://github.com/magento/magento2/pull/11993))
+ * [#12017](https://github.com/magento/magento2/issues/12017) -- Cross-sell product placeholder image size issue (fixed in [#12018](https://github.com/magento/magento2/pull/12018))
+ * [#10583](https://github.com/magento/magento2/issues/10583) -- Checkout place order exception when using a new address (fixed in [#11556](https://github.com/magento/magento2/pull/11556))
+ * [#4004](https://github.com/magento/magento2/issues/4004) -- Newsletter Subscriber create-date not set, and change_status_at broken (fixed in [#11879](https://github.com/magento/magento2/pull/11879))
+ * [#7225](https://github.com/magento/magento2/issues/7225) -- [BUG] [Magento 2.1.2] Programmatically creating an empty dropdown attribute, "apply_to" is set to NULL (from "simple") after adding options through store admin (fixed in [#11588](https://github.com/magento/magento2/pull/11588))
+ * [#11197](https://github.com/magento/magento2/issues/11197) -- Blank page at the checkout 'shipping' step (fixed in [#11958](https://github.com/magento/magento2/pull/11958))
+ * [#11880](https://github.com/magento/magento2/issues/11880) -- Magento 2.1.9 Configurable::getUsedProducts returns a different array after product collections is cached (fixed in [#12107](https://github.com/magento/magento2/pull/12107))
+ * [#10811](https://github.com/magento/magento2/issues/10811) -- Replace FollowSymLinks with SymLinksIfOwnerMatch (fixed in [#11461](https://github.com/magento/magento2/pull/11461))
+ * [#10920](https://github.com/magento/magento2/issues/10920) -- Sku => Entity_id relations are fetched inefficiently when inserting attributes values during product import (fixed in [#11719](https://github.com/magento/magento2/pull/11719))
+ * [#6802](https://github.com/magento/magento2/issues/6802) -- Magento\Search\Helper\getSuggestUrl() not used in search template (fixed in [#11722](https://github.com/magento/magento2/pull/11722))
+ * [#9151](https://github.com/magento/magento2/issues/9151) -- Sitemap.xml: lastmod timestamp can contain invalid dates (fixed in [#11902](https://github.com/magento/magento2/pull/11902))
+ * [#10195](https://github.com/magento/magento2/issues/10195) -- Order relation child is not set during edit operation. (fixed in [#11988](https://github.com/magento/magento2/pull/11988))
+ * [#11793](https://github.com/magento/magento2/issues/11793) -- Magento2.1.5 admin shipping report shows wrong currency code (fixed in [#11962](https://github.com/magento/magento2/pull/11962))
+ * [#6661](https://github.com/magento/magento2/issues/6661) -- XHTML templates Don't Use Schema URNs (fixed in [#12031](https://github.com/magento/magento2/pull/12031))
+ * [#12079](https://github.com/magento/magento2/issues/12079) -- Products in cart report error when we have grouped or bundle product (fixed in [#12082](https://github.com/magento/magento2/pull/12082))
+ * [#9768](https://github.com/magento/magento2/issues/9768) -- Admin dashboard Most Viewed Products Tab only gives default attribute set's products (fixed in [#12139](https://github.com/magento/magento2/pull/12139))
+ * [#6238](https://github.com/magento/magento2/issues/6238) -- Meta description allows too many characters (fixed in [#11914](https://github.com/magento/magento2/pull/11914))
+ * [#11230](https://github.com/magento/magento2/issues/11230) -- Unit test fails after fresh installation (fixed in [#12144](https://github.com/magento/magento2/pull/12144))
+ * [#10810](https://github.com/magento/magento2/issues/10810) -- Add support of apache2.4 commands in htaccess (fixed in [#11459](https://github.com/magento/magento2/pull/11459))
+ * [#10834](https://github.com/magento/magento2/issues/10834) -- signing in after selecting checkout button, will not end up to checkout page! (fixed in [#11876](https://github.com/magento/magento2/pull/11876))
+ * [#10477](https://github.com/magento/magento2/issues/10477) -- Cart price rule has failed if use dropdown attribute (fixed in [#11274](https://github.com/magento/magento2/pull/11274))
+ * [#11832](https://github.com/magento/magento2/issues/11832) -- Create order (on Customer edit page) - not working from admin environment (fixed in [#11952](https://github.com/magento/magento2/pull/11952))
+ * [#10014](https://github.com/magento/magento2/issues/10014) -- Newsletter subscriptions status not isolated between multi stores (fixed in [#12035](https://github.com/magento/magento2/pull/12035))
+ * [#11532](https://github.com/magento/magento2/issues/11532) -- Duplicate Simple Product Throws Error: Undefined offset: 0 in SaveHandler.php on line 122 (fixed in [#12001](https://github.com/magento/magento2/pull/12001))
+ * [#10628](https://github.com/magento/magento2/issues/10628) -- Color attribute swatches are not visible if sorting is enabled (fixed in [#12077](https://github.com/magento/magento2/pull/12077))
+ * [#8022](https://github.com/magento/magento2/issues/8022) -- Uncaught Error: Call to a member function addItem() on array in app/code/Magento/Sales/Model/Order/Shipment.php (fixed in [#12173](https://github.com/magento/magento2/pull/12173))
+* GitHub pull requests:
+ * [#11240](https://github.com/magento/magento2/pull/11240) -- Virtual Theme load: Check for null to actually reach the code that handles this case to t… (by @leptoquark1)
+ * [#11261](https://github.com/magento/magento2/pull/11261) -- Prevent invoice cancelation multiple times 2.2-develop [Backport] (by @osrecio)
+ * [#11342](https://github.com/magento/magento2/pull/11342) -- ADDED $sortByPostion flag to getChildren() (by @denisristic)
+ * [#11351](https://github.com/magento/magento2/pull/11351) -- Fix the wrong input format of Customer date of birth (by @manuelson)
+ * [#11359](https://github.com/magento/magento2/pull/11359) -- [Backport 2.2-develop] Unable to manage (install/uninstall) cron via bin/magento cron:install / cron:remove with multiple installations against same crontab (by @adrian-martinez-interactiv4)
+ * [#11383](https://github.com/magento/magento2/pull/11383) -- Append shipment comment to shipment if appendComment is true (by @JeroenVanLeusden)
+ * [#11406](https://github.com/magento/magento2/pull/11406) -- Added carrier code to ID to distinguish shipping methods (by @peterjaap)
+ * [#11430](https://github.com/magento/magento2/pull/11430) -- Fix toolbar-amount placing in mobile device (by @slackerzz)
+ * [#11445](https://github.com/magento/magento2/pull/11445) -- Show product alerts in admin product detail [backport 2.2] (by @raumatbel)
+ * [#11470](https://github.com/magento/magento2/pull/11470) -- FR#10231_22 Custom URL Rewrite Not working [backport 2.2] (by @mrodespin)
+ * [#11493](https://github.com/magento/magento2/pull/11493) -- Add "optional" translation in checkout password field (by @JeroenVanLeusden)
+ * [#11199](https://github.com/magento/magento2/pull/11199) -- Add db-prefix from env conf when command admin:user:create is executed (by @osrecio)
+ * [#11299](https://github.com/magento/magento2/pull/11299) -- Update Guest.php (by @lano-vargas)
+ * [#11381](https://github.com/magento/magento2/pull/11381) -- Save region correctly to save sales address from admin (by @raumatbel)
+ * [#11460](https://github.com/magento/magento2/pull/11460) -- [ISSUE-11140][BUGFIX] Skip store code admin from being detected in ca… (by @diglin)
+ * [#11505](https://github.com/magento/magento2/pull/11505) -- [Backport-2.2] Retain additional cron history by default (by @mpchadwick)
+ * [#11437](https://github.com/magento/magento2/pull/11437) -- Add `confirmation` and `lock_expires ` to customer export csv - Fix issue 10765 (by @convenient)
+ * [#11486](https://github.com/magento/magento2/pull/11486) -- [Backport 2.2]Add VAT number to email source variables (by @JeroenVanLeusden)
+ * [#11495](https://github.com/magento/magento2/pull/11495) -- MAGETWO-75743: Fix for #9783 Multiple parameters in widget.… (by @diazwatson)
+ * [#11500](https://github.com/magento/magento2/pull/11500) -- MAGETWO-81245: Handling all setProductsFilter items in array as arguments (by @kirmorozov)
+ * [#11555](https://github.com/magento/magento2/pull/11555) -- Travis CI functional tests maintenance for 2.2-develop (by @ishakhsuvarov)
+ * [#11235](https://github.com/magento/magento2/pull/11235) -- [2.2-develop] Add static test to detect blocks without name attribute (by @ihor-sviziev)
+ * [#11569](https://github.com/magento/magento2/pull/11569) -- Fixed double space typo (by @dverkade)
+ * [#11565](https://github.com/magento/magento2/pull/11565) -- Fix "pattern" UI Component validation (by @bap14)
+ * [#11317](https://github.com/magento/magento2/pull/11317) -- [Backport 2.2-develop] Send email to subscribers only when are new (by @osrecio)
+ * [#11385](https://github.com/magento/magento2/pull/11385) -- Fix #10856: Sync billing with shipping address on Admin Order Page (by @joni-jones)
+ * [#11499](https://github.com/magento/magento2/pull/11499) -- Ensure database is cleared/Magento reinstalled when TESTS_CLEANUP is enabled (by @joshuaswarren)
+ * [#11510](https://github.com/magento/magento2/pull/11510) -- Add interaction to admin:user:create command (by @cmuench)
+ * [#11522](https://github.com/magento/magento2/pull/11522) -- [Backport 2.2-develop] Fix Filter Customer Report Review (by @osrecio)
+ * [#11553](https://github.com/magento/magento2/pull/11553) -- [2.2 Backport] ProductRepository sku cache is corrupted when cacheLimit is reached (by @heldchen)
+ * [#11561](https://github.com/magento/magento2/pull/11561) -- Magento sets ISO invalid language code (by @crissanclick)
+ * [#11591](https://github.com/magento/magento2/pull/11591) -- [Backport 2.2-develop] #11586 Fix duplicated crontab 2>&1 expression (by @adrian-martinez-interactiv4)
+ * [#11439](https://github.com/magento/magento2/pull/11439) -- [Backport 2.2-develop] #11328 : app:config:dump adds extra space every time in multiline array value (by @adrian-martinez-interactiv4)
+ * [#11675](https://github.com/magento/magento2/pull/11675) -- MAGETWO-77672: in system.xml translate phrase not work, if comment starts from new line. (by @nmalevanec)
+ * [#11673](https://github.com/magento/magento2/pull/11673) -- [BACKPORT 2.2] [TASK] Removed Typo in Paypal TestCase didgit => digit (by @lewisvoncken)
+ * [#11704](https://github.com/magento/magento2/pull/11704) -- [Backport 2.2-develop] Travis: surround variable TRAVIS_BRANCH with double-quotes instead of single-quotes (by @adrian-martinez-interactiv4)
+ * [#11677](https://github.com/magento/magento2/pull/11677) -- [BACKPORT 2.2] [TASK] Moved Customer Groups Menu Item from Other sett… (by @lewisvoncken)
+ * [#11676](https://github.com/magento/magento2/pull/11676) -- #7915: customer objects are equal to eachother after observing event customer_save_after_data_object (by @RomaKis)
+ * [#11250](https://github.com/magento/magento2/pull/11250) -- Fixing #10275 keyboard submit of adminhtml suggest form. (by @romainruaud)
+ * [#11421](https://github.com/magento/magento2/pull/11421) -- FIX #11022 in 2.2-develop: Filter Groups of search criteria parameter have not been included for further processing (by @davidverholen)
+ * [#11440](https://github.com/magento/magento2/pull/11440) -- Add missing translations in Magento_UI (by @JeroenVanLeusden)
+ * [#11643](https://github.com/magento/magento2/pull/11643) -- Fixed ability to set field config from layout xml #11302 [backport 2.2] (by @vovayatsyuk)
+ * [#11637](https://github.com/magento/magento2/pull/11637) -- MAGETWO-81311: Check the length of the array before attempting to sli… (by @briscoda)
+ * [#11635](https://github.com/magento/magento2/pull/11635) -- Coupon codes not showing in invoice (by @crissanclick)
+ * [#11690](https://github.com/magento/magento2/pull/11690) -- Add a health check to the NGINX configuration sample (by @andrewhowdencom)
+ * [#11710](https://github.com/magento/magento2/pull/11710) -- Allow coupon code with special charater to be applied to order in checkout (by @gabrielqs-redstage)
+ * [#11720](https://github.com/magento/magento2/pull/11720) -- Fix Notice: freePackageValue is undefined (by @amenk)
+ * [#11734](https://github.com/magento/magento2/pull/11734) -- [TASK] Updated user.ini according to Magento DevDocs (by @lewisvoncken)
+ * [#11751](https://github.com/magento/magento2/pull/11751) -- [Backport 2.2-develop] Dashboard Fix Y Axis for range (by @osrecio)
+ * [#11749](https://github.com/magento/magento2/pull/11749) -- [Backport 2.2-develop] Fix datetime type product that show current date when is empty in grids (by @enriquei4)
+ * [#11745](https://github.com/magento/magento2/pull/11745) -- [Backport 2.2-develop] Fix label to avoid wrapping poorly,now break by word (by @enriquei4)
+ * [#11765](https://github.com/magento/magento2/pull/11765) -- Allows modules with underscores in name to add blocks to layout via XML (by @bentideswell)
+ * [#11410](https://github.com/magento/magento2/pull/11410) -- "Ignore this notification" isn't working (by @crissanclick)
+ * [#11607](https://github.com/magento/magento2/pull/11607) -- [Backport 2.2-develop] Fix AcountManagementTest unit test fail randomly (by @adrian-martinez-interactiv4)
+ * [#11610](https://github.com/magento/magento2/pull/11610) -- FR#6891_22 Add-to-cart checkbox still visible when = false (by @mrodespin)
+ * [#11757](https://github.com/magento/magento2/pull/11757) -- Fix #11729 - negative value in excel export [M2.2] (by @hauso)
+ * [#11363](https://github.com/magento/magento2/pull/11363) -- Issue #6924: Unmask exception message during product import (by @tim-bezhashvyly)
+ * [#11425](https://github.com/magento/magento2/pull/11425) -- Magento setup:install interactive shell (by @denisristic)
+ * [#11767](https://github.com/magento/magento2/pull/11767) -- 7640: X-Magento-Tags header containing whitespaces causes exception (by @nmalevanec)
+ * [#11779](https://github.com/magento/magento2/pull/11779) -- MAGETWO-4711: Improve error reporting for products images import. (by @p-bystritsky)
+ * [#11830](https://github.com/magento/magento2/pull/11830) -- Fix #11581: Reference to wrong / non-existing class (by @dverkade)
+ * [#11827](https://github.com/magento/magento2/pull/11827) -- Admin product search - Pressing enter does not submit #4696 (by @bohemiorulo)
+ * [#11337](https://github.com/magento/magento2/pull/11337) -- #11211 Fix Store View switcher (by @thiagolima-bm)
+ * [#11458](https://github.com/magento/magento2/pull/11458) -- Products added to cart with REST API give total prices equal to zero (by @peterjaap)
+ * [#11595](https://github.com/magento/magento2/pull/11595) -- Fix issue #10032 - Download back-up .tgz always takes the latest that's created (2.2-develop) (by @PieterCappelle)
+ * [#11747](https://github.com/magento/magento2/pull/11747) -- [Backport 2.2-develop] FIX show visual swatches in admin - product attribute (by @enriquei4)
+ * [#11824](https://github.com/magento/magento2/pull/11824) -- Magetwo 70954: Remove the component.clear from the custom options type. This causes the 'elem' array to become out of sync with the recordData (by @briscoda)
+ * [#11651](https://github.com/magento/magento2/pull/11651) -- [BUGFIX] Solved error while upgrading from 2.1 to 2.2 (by @lewisvoncken)
+ * [#11802](https://github.com/magento/magento2/pull/11802) -- #8236 FIX CMS blocks (by @thiagolima-bm)
+ * [#11843](https://github.com/magento/magento2/pull/11843) -- Save the price 0 as price in custom options [backport 2.2] (by @raumatbel)
+ * [#11854](https://github.com/magento/magento2/pull/11854) -- FilterBuilder Doc Block Update (by @ByteCreation)
+ * [#11397](https://github.com/magento/magento2/pull/11397) -- Fix for #9566: Show the correct label in the admin (by @michielgerritsen)
+ * [#11732](https://github.com/magento/magento2/pull/11732) -- MAGETWO-5015: Report error csv doesn't work when trying to import a csv file with semicolon delimiter. (by @p-bystritsky)
+ * [#11829](https://github.com/magento/magento2/pull/11829) -- Fix #10682: Meta description and keywords transform to html entities (by @dverkade)
+ * [#11933](https://github.com/magento/magento2/pull/11933) -- Changed constructor typo in Javascript class (by @dverkade)
+ * [#11911](https://github.com/magento/magento2/pull/11911) -- Order grid - Sort by Purchase Date Desc by default (by @ihor-sviziev)
+ * [#11817](https://github.com/magento/magento2/pull/11817) -- GITHUB-8970: Cannot assign products to categories not under tree root. (by @p-bystritsky)
+ * [#11405](https://github.com/magento/magento2/pull/11405) -- Allow setting of http response status code in a Redirection (by @gabrielqs-redstage)
+ * [#11858](https://github.com/magento/magento2/pull/11858) -- #11697 Theme: Added html node to page xml root, cause validation error (by @adrian-martinez-interactiv4)
+ * [#11869](https://github.com/magento/magento2/pull/11869) -- Resolve Error While Trying To Load Quote Item Collection Using Magent… (by @neeta-wagento)
+ * [#11889](https://github.com/magento/magento2/pull/11889) -- Save background color correctly in images. [backport 2.2] (by @raumatbel)
+ * [#11917](https://github.com/magento/magento2/pull/11917) -- [BACKPORT 2.2] [TASK] Add resetPassword call to the webapi (by @lewisvoncken)
+ * [#11949](https://github.com/magento/magento2/pull/11949) -- 11868: "Add Products" button has been duplicated after the customer group was changed. (by @nmalevanec)
+ * [#11959](https://github.com/magento/magento2/pull/11959) -- #11898 - Change NL PostCode Pattern (by @osrecio)
+ * [#11620](https://github.com/magento/magento2/pull/11620) -- Check attribute unique between same fields in magento commerce (by @raumatbel)
+ * [#11770](https://github.com/magento/magento2/pull/11770) -- Product attribute creation page handles Storefront tab visibility wrong (by @euronetzrt)
+ * [#11863](https://github.com/magento/magento2/pull/11863) -- Update wrong layout update xml handle installed in CMS Home Page by default (by @adrian-martinez-interactiv4)
+ * [#12011](https://github.com/magento/magento2/pull/12011) -- [backport 2.2] Magento 2 Store Code validation regex: doesn't support uppercase letters in store code (by @manuelson)
+ * [#12013](https://github.com/magento/magento2/pull/12013) -- Add validation for number of street lines (by @crissanclick)
+ * [#11785](https://github.com/magento/magento2/pull/11785) -- fix #8846: avoid duplicated attribute option values (by @gomencal)
+ * [#11993](https://github.com/magento/magento2/pull/11993) -- 11700: "Something Went Wrong" error for limited access admin user (by @RomaKis)
+ * [#12018](https://github.com/magento/magento2/pull/12018) -- Magento 2.2.0 Solution for Cross-sell product placeholder image size … (by @emiprotech)
+ * [#11556](https://github.com/magento/magento2/pull/11556) -- Fix #10583: Checkout place order exception when using a new address (by @joni-jones)
+ * [#11879](https://github.com/magento/magento2/pull/11879) -- #4004: Newsletter Subscriber create-date not set, and change_status_at broken (by @nemesis-back)
+ * [#11588](https://github.com/magento/magento2/pull/11588) -- Fix Issue #7225 - Remove hardcoding of apply_to when saving attributes (by @MartinPeverelli)
+ * [#11958](https://github.com/magento/magento2/pull/11958) -- 11197: Blank page at the checkout 'shipping' step[backport]. (by @nmalevanec)
+ * [#12091](https://github.com/magento/magento2/pull/12091) -- Fix "Undefined variable: responseAjax" notice when trying to save a shipment package (by @lazyguru)
+ * [#11461](https://github.com/magento/magento2/pull/11461) -- [ISSUE-10811][BUGFIX] Update .htaccess.sample to replace FollowSymLin… (by @diglin)
+ * [#11719](https://github.com/magento/magento2/pull/11719) -- 10920: Sku => Entity_id relations are fetched inefficiently when inserting attributes values during product import. (by @nmalevanec)
+ * [#11722](https://github.com/magento/magento2/pull/11722) -- 6802: Magento\Search\Helper\getSuggestUrl() not used in search template. (by @nmalevanec)
+ * [#11857](https://github.com/magento/magento2/pull/11857) -- CMS Page - CMS Page - Force validate layout update xml in production mode when saving CMS Page - Handle layout update xml validation exceptions (by @adrian-martinez-interactiv4)
+ * [#11902](https://github.com/magento/magento2/pull/11902) -- #9151: [Github] Sitemap.xml: lastmod timestamp can contain invalid dates (by @serhii-balko)
+ * [#11947](https://github.com/magento/magento2/pull/11947) -- Fix json encoded attribute backend type when attribute value is null (by @tkotosz)
+ * [#11962](https://github.com/magento/magento2/pull/11962) -- 11793: Magento2.1.5 admin shipping report shows wrong currency code (by @RomaKis)
+ * [#11988](https://github.com/magento/magento2/pull/11988) -- 10195: Order relation child is not set during edit operation(backport from 2.3 to 2.2) (by @RomaKis)
+ * [#12031](https://github.com/magento/magento2/pull/12031) -- Improve urn in xhtml (by @enriquei4)
+ * [#12082](https://github.com/magento/magento2/pull/12082) -- Products in cart report error when we have grouped or bundle product (by @mihaifaget)
+ * [#12131](https://github.com/magento/magento2/pull/12131) -- [Backport 2.2] Close PayPal popup window in case of rejected request #10820 (by @vovayatsyuk)
+ * [#12139](https://github.com/magento/magento2/pull/12139) -- 9768: Admin dashboard Most Viewed Products Tab only gives default attribute set's products(backport for 2.2) (by @RomaKis)
+ * [#11914](https://github.com/magento/magento2/pull/11914) -- [BACKPORT 2.2] [BUGFIX] All UI input fields should have maxlength of 255 because of V… (by @lewisvoncken)
+ * [#11944](https://github.com/magento/magento2/pull/11944) -- Report Handled Exceptions To New Relic (by @mpchadwick)
+ * [#12144](https://github.com/magento/magento2/pull/12144) -- Removed FileClassScannerTest dependency to "Magento_Catalog" (by @wexo-team)
+ * [#11459](https://github.com/magento/magento2/pull/11459) -- close #10810 Migrates Apache Access Syntax to 2.4 on Apache >= 2.4 (by @jonashrem)
+ * [#11968](https://github.com/magento/magento2/pull/11968) -- Fix bug: Customer import deletes exiting customer entity Fields (by @jalogut)
+ * [#12061](https://github.com/magento/magento2/pull/12061) -- Cleanup for object manager references and depricated method (by @atishgoswami)
+ * [#12136](https://github.com/magento/magento2/pull/12136) -- update button.phtml overcomplicated translation phrase. 2.2 (by @ChuckyK)
+ * [#11876](https://github.com/magento/magento2/pull/11876) -- After logging in customer is now not redirecting to Customer Dashboard by default (by @p-bystritsky)
+ * [#11274](https://github.com/magento/magento2/pull/11274) -- Fix #10477 Check cart rule subselect conditions against quote item children too (by @marinagociu)
+ * [#11952](https://github.com/magento/magento2/pull/11952) -- 11832: Create order (on Customer edit page) - not working from admin environment (by @RomaKis)
+ * [#12035](https://github.com/magento/magento2/pull/12035) -- Fix newsletter subscriptions between stores (by @sbaixauli)
+ * [#12001](https://github.com/magento/magento2/pull/12001) -- 11532: Duplicate Simple Product Throws Error: Undefined offset: 0 in SaveHandler.php on line 122 (by @RomaKis)
+ * [#12077](https://github.com/magento/magento2/pull/12077) -- 10628: Color attribute swatches are not visible if sorting is enabled (by @RomaKis)
+ * [#12130](https://github.com/magento/magento2/pull/12130) -- [Backport 2.2] MAGETWO-71697: Fix possible bug when saving address with empty street line #10582 (by @vovayatsyuk)
+ * [#12141](https://github.com/magento/magento2/pull/12141) -- Fix js error when disable/enable wysiwyg editor (by @vovayatsyuk)
+ * [#12173](https://github.com/magento/magento2/pull/12173) -- 8022: Uncaught Error: Call to a member function addItem() on array in app/code/Magento/Sales/Model/Order/Shipment.php(backport to 2.2) (by @RomaKis)
+
2.2.1
=============
* GitHub issues:
diff --git a/app/code/Magento/AdminNotification/composer.json b/app/code/Magento/AdminNotification/composer.json
index a3371c702c7294d2b06b7bdb148b7ccc0abd56ca..59a3845cbd4b73617ec5f583e30f2d39201eefe5 100644
--- a/app/code/Magento/AdminNotification/composer.json
+++ b/app/code/Magento/AdminNotification/composer.json
@@ -11,7 +11,7 @@
"lib-libxml": "*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Analytics/composer.json b/app/code/Magento/Analytics/composer.json
index b17bb10cb411263cbb6ac6e6295878ec22c1780d..349e5f3c08c4c5b566ee6b95531b475dce52591c 100644
--- a/app/code/Magento/Analytics/composer.json
+++ b/app/code/Magento/Analytics/composer.json
@@ -4,10 +4,10 @@
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-backend": "100.2.*",
- "magento/module-config": "100.2.*",
+ "magento/module-config": "101.0.*",
"magento/module-integration": "100.2.*",
"magento/module-store": "100.2.*",
- "magento/framework": "100.2.*"
+ "magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
diff --git a/app/code/Magento/Backend/composer.json b/app/code/Magento/Backend/composer.json
index 3d8cfa49cd1fa01776cb4b12f0c66e00b489acf1..d2cc8f76393f9d9021f7a4e3475bed227785bd79 100644
--- a/app/code/Magento/Backend/composer.json
+++ b/app/code/Magento/Backend/composer.json
@@ -24,7 +24,7 @@
"magento/module-theme": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Backup/composer.json b/app/code/Magento/Backup/composer.json
index b8a9c3a9ab672fe74de30762476acabfff9ad6ba..69b81d76ec03fa0aed64bf08bae644497e7b818e 100644
--- a/app/code/Magento/Backup/composer.json
+++ b/app/code/Magento/Backup/composer.json
@@ -9,7 +9,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php b/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
index d11be39a9bb490c871a5fbe4c0e31b01b197e2f8..a231bcdc30f605b7e89b620c82e6f212e379d73f 100644
--- a/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
+++ b/app/code/Magento/Braintree/Model/Adapter/BraintreeAdapter.php
@@ -48,7 +48,7 @@ class BraintreeAdapter
* Initializes credentials.
*
* @return void
- * @deprecated is not used anymore
+ * @deprecated 100.2.2 is not used anymore
*/
protected function initCredentials()
{
diff --git a/app/code/Magento/Braintree/composer.json b/app/code/Magento/Braintree/composer.json
index 0248a62ccfbb2476f07dcec730edada1ed38374d..e6aca4672b00e68a1518b3ef97d8e4f07f8bd876 100644
--- a/app/code/Magento/Braintree/composer.json
+++ b/app/code/Magento/Braintree/composer.json
@@ -18,14 +18,14 @@
"magento/module-quote": "101.0.*",
"magento/module-paypal": "100.2.*",
"magento/module-ui": "101.0.*",
- "braintree/braintree_php": "3.22.0"
+ "braintree/braintree_php": "3.25.0"
},
"suggest": {
"magento/module-checkout-agreements": "100.2.*",
"magento/module-theme": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"proprietary"
],
diff --git a/app/code/Magento/Bundle/composer.json b/app/code/Magento/Bundle/composer.json
index 0983d4c6b5946787f9937567f6654840d6ddd9b1..510206054fcf0c5b9de3310fc1fb47737b19298e 100644
--- a/app/code/Magento/Bundle/composer.json
+++ b/app/code/Magento/Bundle/composer.json
@@ -25,7 +25,7 @@
"magento/module-bundle-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Catalog/composer.json b/app/code/Magento/Catalog/composer.json
index 10b408c5458780245fde6ab32a77cccd2618be8c..b76c6a548c39ad79881a211b90f58c18092fb23f 100644
--- a/app/code/Magento/Catalog/composer.json
+++ b/app/code/Magento/Catalog/composer.json
@@ -34,7 +34,7 @@
"magento/module-catalog-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "102.0.1",
+ "version": "102.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogAnalytics/composer.json b/app/code/Magento/CatalogAnalytics/composer.json
index 7c622f6fbfa078366f811755a051ed1e07693e95..bc3c8a10104499a584ca26ee32c158197195a7e8 100644
--- a/app/code/Magento/CatalogAnalytics/composer.json
+++ b/app/code/Magento/CatalogAnalytics/composer.json
@@ -3,8 +3,8 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/framework": "100.2.*",
- "magento/module-catalog": "101.1.*"
+ "magento/framework": "101.0.*",
+ "magento/module-catalog": "102.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
diff --git a/app/code/Magento/CatalogImportExport/composer.json b/app/code/Magento/CatalogImportExport/composer.json
index 2b70f65d1f830a79111c129ebf5726e322865a77..cd2cb8e26f1c220b224b335390c9377714fa76b3 100644
--- a/app/code/Magento/CatalogImportExport/composer.json
+++ b/app/code/Magento/CatalogImportExport/composer.json
@@ -16,7 +16,7 @@
"ext-ctype": "*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogInventory/composer.json b/app/code/Magento/CatalogInventory/composer.json
index 79f86612d41bd21df75993308cc734d9aae0169c..71172e26698fe78e0f2c629fc15dede919fcfe86 100644
--- a/app/code/Magento/CatalogInventory/composer.json
+++ b/app/code/Magento/CatalogInventory/composer.json
@@ -13,7 +13,7 @@
"magento/module-ui": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogRule/composer.json b/app/code/Magento/CatalogRule/composer.json
index 845bdeff31f427dbf74f8ecd0882de2794f15063..b2b3a80183ae6894c738d5e016dece1465b5624b 100644
--- a/app/code/Magento/CatalogRule/composer.json
+++ b/app/code/Magento/CatalogRule/composer.json
@@ -17,7 +17,7 @@
"magento/module-catalog-rule-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "101.0.1",
+ "version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogSearch/composer.json b/app/code/Magento/CatalogSearch/composer.json
index 13be21e3248f248c064ad877fa80deb1add36ab1..85c90731603306b8ece69e61d9df07254d005d31 100644
--- a/app/code/Magento/CatalogSearch/composer.json
+++ b/app/code/Magento/CatalogSearch/composer.json
@@ -15,7 +15,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/CatalogUrlRewrite/composer.json b/app/code/Magento/CatalogUrlRewrite/composer.json
index 344562864384fc0dde8a70554416dcb058092ffc..55cbab2077cefca326f6833e94b9584bf93b4f84 100644
--- a/app/code/Magento/CatalogUrlRewrite/composer.json
+++ b/app/code/Magento/CatalogUrlRewrite/composer.json
@@ -14,7 +14,7 @@
"magento/module-ui": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Checkout/composer.json b/app/code/Magento/Checkout/composer.json
index 48d6562c5c77e8912bb88ae1395cc87bcb657423..7f6b1dcaec01ea3b6dbf95ec187dc97925b0e256 100644
--- a/app/code/Magento/Checkout/composer.json
+++ b/app/code/Magento/Checkout/composer.json
@@ -27,7 +27,7 @@
"magento/module-cookie": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Cms/composer.json b/app/code/Magento/Cms/composer.json
index 3094908e69ca0cde95cff37e43d0701ce3d772c4..d3ccb07c8e8d36990e042710f399f39b4bbaa607 100644
--- a/app/code/Magento/Cms/composer.json
+++ b/app/code/Magento/Cms/composer.json
@@ -18,7 +18,7 @@
"magento/module-cms-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "102.0.1",
+ "version": "102.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Config/composer.json b/app/code/Magento/Config/composer.json
index a29f65473ab016f68708099ba19b640676e02935..0160339d502098c962097523b2bbde2539c74fd5 100644
--- a/app/code/Magento/Config/composer.json
+++ b/app/code/Magento/Config/composer.json
@@ -13,7 +13,7 @@
"magento/module-deploy": "100.2.*"
},
"type": "magento2-module",
- "version": "101.0.1",
+ "version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
index 487ab19de206378d02d68a65f607eb1fdab73824..a30ec81528dd38691e65bafd417aa59ae32ab3d7 100644
--- a/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/ResourceModel/Product/Indexer/Price/Configurable.php
@@ -133,6 +133,10 @@ class Configurable extends \Magento\Catalog\Model\ResourceModel\Product\Indexer\
['le' => $this->getTable('catalog_product_entity')],
'le.' . $linkField . ' = l.parent_id',
['parent_id' => 'entity_id']
+ )->join(
+ ['i' => $this->_getDefaultFinalPriceTable()],
+ 'le.entity_id = i.entity_id',
+ []
);
$select = $connection->select();
diff --git a/app/code/Magento/ConfigurableProduct/composer.json b/app/code/Magento/ConfigurableProduct/composer.json
index 3b60f57c2f923e03c9253af43598268b9aceb323..04725604a0859c8cbc0827994b81c31f198afc00 100644
--- a/app/code/Magento/ConfigurableProduct/composer.json
+++ b/app/code/Magento/ConfigurableProduct/composer.json
@@ -24,7 +24,7 @@
"magento/module-product-links-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Contact/composer.json b/app/code/Magento/Contact/composer.json
index ab0fbafe63f74014e87932c6b1ca34a8572ead8e..effec9f15a756f2196fbdb5f83e548209a3944c3 100644
--- a/app/code/Magento/Contact/composer.json
+++ b/app/code/Magento/Contact/composer.json
@@ -10,7 +10,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Cron/Model/ResourceModel/Schedule.php b/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
index a47227bb60598a752299097bbd14d0b3a9d2bb1b..25dd02c207f4e45b65c9bda79c7b72b8497471a5 100644
--- a/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
+++ b/app/code/Magento/Cron/Model/ResourceModel/Schedule.php
@@ -66,7 +66,14 @@ class Schedule extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
$connection = $this->getConnection();
- $match = $connection->quoteInto('existing.job_code = current.job_code AND existing.status = ?', $newStatus);
+ // this condition added to avoid cron jobs locking after incorrect termination of running job
+ $match = $connection->quoteInto(
+ 'existing.job_code = current.job_code ' .
+ 'AND (existing.executed_at > UTC_TIMESTAMP() - INTERVAL 1 DAY OR existing.executed_at IS NULL) ' .
+ 'AND existing.status = ?',
+ $newStatus
+ );
+
$selectIfUnlocked = $connection->select()
->joinLeft(
['existing' => $this->getTable('cron_schedule')],
diff --git a/app/code/Magento/Cron/Setup/Recurring.php b/app/code/Magento/Cron/Setup/Recurring.php
new file mode 100644
index 0000000000000000000000000000000000000000..38c9122783bd951e7106c50fc71ac8a283671171
--- /dev/null
+++ b/app/code/Magento/Cron/Setup/Recurring.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Cron\Setup;
+
+use Magento\Framework\Setup\InstallSchemaInterface;
+use Magento\Framework\Setup\ModuleContextInterface;
+use Magento\Framework\Setup\SchemaSetupInterface;
+
+/**
+ * Cron recurring setup
+ */
+class Recurring implements InstallSchemaInterface
+{
+ /**
+ * @var \Magento\Cron\Model\ResourceModel\Schedule
+ */
+ private $schedule;
+
+ /**
+ * Recurring constructor.
+ * @param \Magento\Cron\Model\ResourceModel\Schedule $schedule
+ */
+ public function __construct(
+ \Magento\Cron\Model\ResourceModel\Schedule $schedule
+ ) {
+ $this->schedule = $schedule;
+ }
+
+ /**
+ * {@inheritdoc}
+ */
+ public function install(SchemaSetupInterface $setup, ModuleContextInterface $context)
+ {
+ $connection = $this->schedule->getConnection();
+ $connection->update(
+ $this->schedule->getMainTable(),
+ [
+ 'status' => \Magento\Cron\Model\Schedule::STATUS_ERROR,
+ 'messages' => 'The job is terminated due to system upgrade'
+ ],
+ $connection->quoteInto('status = ?', \Magento\Cron\Model\Schedule::STATUS_RUNNING)
+ );
+ }
+}
diff --git a/app/code/Magento/Cron/composer.json b/app/code/Magento/Cron/composer.json
index be2c39cc2b9eb1fcc1c248d11ab2dd0ddcc83e0d..ef6b580bfe7d08a7e84be09db9fbbdc96fe88c28 100644
--- a/app/code/Magento/Cron/composer.json
+++ b/app/code/Magento/Cron/composer.json
@@ -10,7 +10,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Customer/Block/Address/Edit.php b/app/code/Magento/Customer/Block/Address/Edit.php
index e9e894b2bc130e5ecf3ad39c10cadc50e245fc68..6e2115865187916fa5f9291f2a3b5eb6fb530799 100644
--- a/app/code/Magento/Customer/Block/Address/Edit.php
+++ b/app/code/Magento/Customer/Block/Address/Edit.php
@@ -139,9 +139,11 @@ class Edit extends \Magento\Directory\Block\Data
if ($postedData = $this->_customerSession->getAddressFormData(true)) {
$postedData['region'] = [
- 'region_id' => $postedData['region_id'],
- 'region' => $postedData['region'],
+ 'region' => $postedData['region'] ?? null,
];
+ if (!empty($postedData['region_id'])) {
+ $postedData['region']['region_id'] = $postedData['region_id'];
+ }
$this->dataObjectHelper->populateWithArray(
$this->_address,
$postedData,
diff --git a/app/code/Magento/Customer/Test/Unit/Block/Address/EditTest.php b/app/code/Magento/Customer/Test/Unit/Block/Address/EditTest.php
index 0b142497d9577350f2d7105b69c77223272cd7a8..d39ace54b5c472c53dc837fc6d0dcb6de2ea9718 100644
--- a/app/code/Magento/Customer/Test/Unit/Block/Address/EditTest.php
+++ b/app/code/Magento/Customer/Test/Unit/Block/Address/EditTest.php
@@ -101,15 +101,15 @@ class EditTest extends \PHPUnit\Framework\TestCase
);
}
- public function testSetLayoutWithOwnAddressAndPostedData()
+ /**
+ * @param array $postedData
+ * @dataProvider postedDataProvider
+ */
+ public function testSetLayoutWithOwnAddressAndPostedData(array $postedData)
{
$addressId = 1;
$customerId = 1;
$title = __('Edit Address');
- $postedData = [
- 'region_id' => 1,
- 'region' => 'region',
- ];
$newPostedData = $postedData;
$newPostedData['region'] = $postedData;
@@ -169,6 +169,21 @@ class EditTest extends \PHPUnit\Framework\TestCase
$this->assertEquals($layoutMock, $this->model->getLayout());
}
+ /**
+ * @return array
+ */
+ public function postedDataProvider()
+ {
+ return [
+ [
+ ['region_id' => 1, 'region' => 'region']
+ ],
+ [
+ ['region' => 'region without id']
+ ]
+ ];
+ }
+
/**
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
diff --git a/app/code/Magento/Customer/composer.json b/app/code/Magento/Customer/composer.json
index 61fcb62932992ab4e16bce2e0b347388bb6be42e..bb64ccc076cc643c7e5b3323df0ad74f9d73bbfb 100644
--- a/app/code/Magento/Customer/composer.json
+++ b/app/code/Magento/Customer/composer.json
@@ -29,7 +29,7 @@
"magento/module-customer-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "101.0.1",
+ "version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
index 1b61dc45573b3e841cd8585905370c96c997b556..6367bf10bbade51d693fd4c0d24fc86ecb7c70d7 100644
--- a/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
+++ b/app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml
@@ -19,7 +19,7 @@
<?php
$_validationClass = $block->escapeHtmlAttr(
$this->helper('Magento\Customer\Helper\Address')
- ->getAttributeValidationClass('fax')
+ ->getAttributeValidationClass('telephone')
);
?>
<input type="text"
diff --git a/app/code/Magento/CustomerAnalytics/composer.json b/app/code/Magento/CustomerAnalytics/composer.json
index d34d6ba751e2afcd8d0113cdfb22baa1d508c922..8b88beea19a2cb452328fba3884b669fab3d05e1 100644
--- a/app/code/Magento/CustomerAnalytics/composer.json
+++ b/app/code/Magento/CustomerAnalytics/composer.json
@@ -3,8 +3,8 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/framework": "100.2.*",
- "magento/module-customer": "100.2.*"
+ "magento/framework": "101.0.*",
+ "magento/module-customer": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
diff --git a/app/code/Magento/CustomerImportExport/composer.json b/app/code/Magento/CustomerImportExport/composer.json
index 5750b25684735e9c5e500ebcb881f910099cda85..a95b329e2b63bc56c1fea4d56fd4154a26602e07 100644
--- a/app/code/Magento/CustomerImportExport/composer.json
+++ b/app/code/Magento/CustomerImportExport/composer.json
@@ -12,7 +12,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Deploy/composer.json b/app/code/Magento/Deploy/composer.json
index e33d2e72f64a418362a935618ca5d76e7cd5290f..fc8668e9dae4bc41f5839cc399435d845fdcda2a 100644
--- a/app/code/Magento/Deploy/composer.json
+++ b/app/code/Magento/Deploy/composer.json
@@ -10,7 +10,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Directory/composer.json b/app/code/Magento/Directory/composer.json
index 6d29f3f9ba6db301ad2bf86d8b55f1bdba23d2d4..5a3eb1932411b3eab9df82d7927be5b15b3ec4cf 100644
--- a/app/code/Magento/Directory/composer.json
+++ b/app/code/Magento/Directory/composer.json
@@ -10,7 +10,7 @@
"lib-libxml": "*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Downloadable/composer.json b/app/code/Magento/Downloadable/composer.json
index 8d06be0e4116d257fc43999775df9e9abde52e17..160a51c83627f51c3ed4a6de769fd6ecac2ecf24 100644
--- a/app/code/Magento/Downloadable/composer.json
+++ b/app/code/Magento/Downloadable/composer.json
@@ -25,7 +25,7 @@
"magento/module-downloadable-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Eav/composer.json b/app/code/Magento/Eav/composer.json
index 2900d8397ff40f7186a1e244ad4162dc8c32f3fa..be753a6fca7d3b74646402420f06478bd274065a 100644
--- a/app/code/Magento/Eav/composer.json
+++ b/app/code/Magento/Eav/composer.json
@@ -11,7 +11,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "101.0.0",
+ "version": "101.0.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Email/composer.json b/app/code/Magento/Email/composer.json
index 2a651a44a4a54cd857b339c9b9a6b1dd08ab79c2..9ef1c3ba39a6b16f30d67bb69ffc26b1f424d239 100644
--- a/app/code/Magento/Email/composer.json
+++ b/app/code/Magento/Email/composer.json
@@ -15,7 +15,7 @@
"magento/module-theme": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GoogleOptimizer/composer.json b/app/code/Magento/GoogleOptimizer/composer.json
index 62534b81d9b3ad88f71f9b5de37f8d67a0aac297..5aeadefbfda94479ac547673dff98aeb56fd418d 100644
--- a/app/code/Magento/GoogleOptimizer/composer.json
+++ b/app/code/Magento/GoogleOptimizer/composer.json
@@ -12,7 +12,7 @@
"magento/module-ui": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/GroupedProduct/composer.json b/app/code/Magento/GroupedProduct/composer.json
index 16d0f029539f815e00a7721974e21d0d9f9d5e71..22426af3852cb78d584fe090c1241aa4bcbfcb1d 100644
--- a/app/code/Magento/GroupedProduct/composer.json
+++ b/app/code/Magento/GroupedProduct/composer.json
@@ -21,7 +21,7 @@
"magento/module-grouped-product-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ImportExport/composer.json b/app/code/Magento/ImportExport/composer.json
index 23ed2f6346ef7b45b6c148f940eb27a1481dcf54..1c159305c89202dd7e7efa80112731cf7205cef6 100644
--- a/app/code/Magento/ImportExport/composer.json
+++ b/app/code/Magento/ImportExport/composer.json
@@ -12,7 +12,7 @@
"ext-ctype": "*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Indexer/composer.json b/app/code/Magento/Indexer/composer.json
index 58c2c7f3587f2774d740312ab4e199784927ed9c..ced51945495f9642208c80c850ceb09edbc2276e 100644
--- a/app/code/Magento/Indexer/composer.json
+++ b/app/code/Magento/Indexer/composer.json
@@ -7,7 +7,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
index 3129739ea0937f2b7494621d038dfb1e924ded78..2ad56a8859cf373992715bea64b42e290c6fd30d 100644
--- a/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
+++ b/app/code/Magento/InstantPurchase/Model/PlaceOrder.php
@@ -13,7 +13,9 @@ use Magento\InstantPurchase\Model\QuoteManagement\Purchase;
use Magento\InstantPurchase\Model\QuoteManagement\QuoteCreation;
use Magento\InstantPurchase\Model\QuoteManagement\QuoteFilling;
use Magento\InstantPurchase\Model\QuoteManagement\ShippingConfiguration;
+use Magento\Quote\Api\CartRepositoryInterface;
use Magento\Store\Model\Store;
+use \Throwable;
/**
* Place an order using instant purchase option.
@@ -22,6 +24,11 @@ use Magento\Store\Model\Store;
*/
class PlaceOrder
{
+ /**
+ * @var CartRepositoryInterface
+ */
+ private $quoteRepository;
+
/**
* @var QuoteCreation
*/
@@ -49,6 +56,7 @@ class PlaceOrder
/**
* PlaceOrder constructor.
+ * @param CartRepositoryInterface $quoteRepository
* @param QuoteCreation $quoteCreation
* @param QuoteFilling $quoteFilling
* @param ShippingConfiguration $shippingConfiguration
@@ -56,12 +64,14 @@ class PlaceOrder
* @param Purchase $purchase
*/
public function __construct(
+ CartRepositoryInterface $quoteRepository,
QuoteCreation $quoteCreation,
QuoteFilling $quoteFilling,
ShippingConfiguration $shippingConfiguration,
PaymentConfiguration $paymentConfiguration,
Purchase $purchase
) {
+ $this->quoteRepository = $quoteRepository;
$this->quoteCreation = $quoteCreation;
$this->quoteFilling = $quoteFilling;
$this->shippingConfiguration = $shippingConfiguration;
@@ -79,6 +89,7 @@ class PlaceOrder
* @param array $productRequest
* @return int order identifier
* @throws LocalizedException if order can not be placed.
+ * @throws Throwable if unpredictable error occurred.
*/
public function placeOrder(
Store $store,
@@ -98,17 +109,28 @@ class PlaceOrder
$product,
$productRequest
);
- $quote = $this->shippingConfiguration->configureShippingMethod(
- $quote,
- $instantPurchaseOption->getShippingMethod()
- );
- $quote = $this->paymentConfiguration->configurePayment(
- $quote,
- $instantPurchaseOption->getPaymentToken()
- );
- $orderId = $this->purchase->purchase(
- $quote
- );
- return $orderId;
+
+ $quote->collectTotals();
+ $this->quoteRepository->save($quote);
+ $quote = $this->quoteRepository->get($quote->getId());
+
+ try {
+ $quote = $this->shippingConfiguration->configureShippingMethod(
+ $quote,
+ $instantPurchaseOption->getShippingMethod()
+ );
+ $quote = $this->paymentConfiguration->configurePayment(
+ $quote,
+ $instantPurchaseOption->getPaymentToken()
+ );
+ $orderId = $this->purchase->purchase(
+ $quote
+ );
+ return $orderId;
+ } catch (Throwable $e) {
+ $quote->setIsActive(false);
+ $this->quoteRepository->save($quote);
+ throw $e;
+ }
}
}
diff --git a/app/code/Magento/InstantPurchase/composer.json b/app/code/Magento/InstantPurchase/composer.json
index 1c3b97a6beb9449b70a7658e424bbf50114dcf13..a771869ddd1b8b13bd2ab468963465b0fcaf3984 100644
--- a/app/code/Magento/InstantPurchase/composer.json
+++ b/app/code/Magento/InstantPurchase/composer.json
@@ -1,29 +1,29 @@
{
- "name": "magento/module-instant-purchase",
- "description": "N/A",
- "type": "magento2-module",
- "version": "100.2.0",
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "require": {
- "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/module-store": "100.2.*",
- "magento/module-catalog": "102.0.*",
- "magento/module-customer": "101.0.*",
- "magento/module-sales": "101.0.*",
- "magento/module-shipping": "100.2.*",
- "magento/module-quote": "101.0.*",
- "magento/module-vault": "101.0.*",
- "magento/framework": "100.2.*"
- },
- "autoload": {
- "files": [
- "registration.php"
+ "name": "magento/module-instant-purchase",
+ "description": "N/A",
+ "type": "magento2-module",
+ "version": "100.2.0",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
],
- "psr-4": {
- "Magento\\InstantPurchase\\": ""
+ "require": {
+ "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "magento/module-store": "100.2.*",
+ "magento/module-catalog": "102.0.*",
+ "magento/module-customer": "101.0.*",
+ "magento/module-sales": "101.0.*",
+ "magento/module-shipping": "100.2.*",
+ "magento/module-quote": "101.0.*",
+ "magento/module-vault": "101.0.*",
+ "magento/framework": "101.0.*"
+ },
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\InstantPurchase\\": ""
+ }
}
- }
-}
\ No newline at end of file
+}
diff --git a/app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js b/app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js
index b5c5b1f0a08534f3c80ce7b4d883d1da56bcd068..533cd8ea90e3e7e7b42a480b1da34a8f051cbc62 100644
--- a/app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js
+++ b/app/code/Magento/InstantPurchase/view/frontend/web/js/view/instant-purchase.js
@@ -1,111 +1,115 @@
-/*jshint browser:true*/
-/*global define*/
-define(
- [
- 'uiComponent',
- 'ko',
- 'Magento_Ui/js/modal/confirm',
- 'jquery',
- 'Magento_Customer/js/customer-data',
- 'mage/url',
- 'mage/template',
- 'jquery/ui',
- 'mage/translate'
- ], function (
- Component,
- ko,
- confirm,
- $,
- customerData,
- urlBuilder,
- mageTemplate
- ) {
- 'use strict';
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+define([
+ 'ko',
+ 'jquery',
+ 'underscore',
+ 'uiComponent',
+ 'Magento_Ui/js/modal/confirm',
+ 'Magento_Customer/js/customer-data',
+ 'mage/url',
+ 'mage/template',
+ 'mage/translate',
+ 'text!Magento_InstantPurchase/template/confirmation.html',
+ 'mage/validation'
+], function (ko, $, _, Component, confirm, customerData, urlBuilder, mageTemplate, $t, confirmationTemplate) {
+ 'use strict';
- return Component.extend({
- showButton: ko.observable(false),
- paymentToken: ko.observable(null),
- shippingAddress: ko.observable(null),
- billingAddress: ko.observable(null),
- shippingMethod: ko.observable(null),
- defaults: {
- template: 'Magento_InstantPurchase/instant-purchase',
- buttonText: $.mage.__('Instant Purchase'),
- purchaseUrl: urlBuilder.build('instantpurchase/button/placeOrder')
- },
- options: {
- message: $.mage.__('Are you sure you want to place order and pay?'),
- formSelector: '#product_addtocart_form',
- confirmTemplate: '<p class="message"><%- data.message %></p>' +
- '<strong>' + $.mage.__('Shipping Address') + ':</strong>' +
- '<p><%- data.shippingAddress().summary %></p>' +
- '<strong>' + $.mage.__('Billing Address') + ':</strong>' +
- '<p><%- data.billingAddress().summary %></p>' +
- '<strong>' + $.mage.__('Payment Method') + ':</strong>\n' +
- '<p><%- data.paymentToken().summary %></p>' +
- '<strong>' + $.mage.__('Shipping Method') + ':</strong>\n' +
- '<p><%- data.shippingMethod().summary %></p>'
- },
+ return Component.extend({
+ defaults: {
+ template: 'Magento_InstantPurchase/instant-purchase',
+ buttonText: $t('Instant Purchase'),
+ purchaseUrl: urlBuilder.build('instantpurchase/button/placeOrder'),
+ showButton: false,
+ paymentToken: null,
+ shippingAddress: null,
+ billingAddress: null,
+ shippingMethod: null,
+ productFormSelector: '#product_addtocart_form',
+ confirmationTitle: $t('Instant Purchase Confirmation'),
+ confirmationData: {
+ message: $t('Are you sure you want to place order and pay?'),
+ shippingAddressTitle: $t('Shipping Address'),
+ billingAddressTitle: $t('Billing Address'),
+ paymentMethodTitle: $t('Payment Method'),
+ shippingMethodTitle: $t('Shipping Method')
+ }
+ },
- /** @inheritdoc */
- initialize: function () {
- var self = this,
- data = customerData.get('instant-purchase')();
+ /** @inheritdoc */
+ initialize: function () {
+ var instantPurchase = customerData.get('instant-purchase');
- this._super();
+ this._super();
- self.showButton(data.available);
- self.paymentToken(data.paymentToken);
- self.shippingAddress(data.shippingAddress);
- self.billingAddress(data.billingAddress);
- self.shippingMethod(data.shippingMethod);
- },
+ this.setPurchaseData(instantPurchase());
+ instantPurchase.subscribe(this.setPurchaseData, this);
+ },
- /**
- * Confirmation method
- */
- instantPurchase: function () {
- var self = this,
- form = $(self.options.formSelector),
- confirmTemplate = mageTemplate(this.options.confirmTemplate);
+ /** @inheritdoc */
+ initObservable: function () {
+ this._super()
+ .observe('showButton paymentToken shippingAddress billingAddress shippingMethod');
- if (!(form.validation() && form.validation('isValid'))) {
- return;
- }
+ return this;
+ },
- confirm({
- title: $.mage.__('Instant Purchase Confirmation'),
- content: confirmTemplate(
- {
- data: {
- message: self.options.message,
- paymentToken: self.paymentToken,
- shippingAddress: self.shippingAddress,
- billingAddress: self.billingAddress,
- shippingMethod: self.shippingMethod
- }
- }
- ),
- actions: {
- /** @inheritdoc */
- confirm: function () {
- $.ajax({
- url: self.purchaseUrl,
- data: form.serialize(),
- type: 'post',
- dataType: 'json',
+ /**
+ * Set data from customerData.
+ *
+ * @param {Object} data
+ */
+ setPurchaseData: function (data) {
+ this.showButton(data.available);
+ this.paymentToken(data.paymentToken);
+ this.shippingAddress(data.shippingAddress);
+ this.billingAddress(data.billingAddress);
+ this.shippingMethod(data.shippingMethod);
+ },
- /** Show loader before send */
- beforeSend: function () {
- $('body').trigger('processStart');
- }
- }).always(function () {
- $('body').trigger('processStop');
- });
- }
- }
+ /**
+ * Confirmation method
+ */
+ instantPurchase: function () {
+ var form = $(this.productFormSelector),
+ confirmTemplate = mageTemplate(confirmationTemplate),
+ confirmData = _.extend({}, this.confirmationData, {
+ paymentToken: this.paymentToken().summary,
+ shippingAddress: this.shippingAddress().summary,
+ billingAddress: this.billingAddress().summary,
+ shippingMethod: this.shippingMethod().summary
});
+
+ if (!(form.validation() && form.validation('isValid'))) {
+ return;
}
- });
- }
-);
+
+ confirm({
+ title: this.confirmationTitle,
+ content: confirmTemplate({
+ data: confirmData
+ }),
+ actions: {
+ /** @inheritdoc */
+ confirm: function () {
+ $.ajax({
+ url: this.purchaseUrl,
+ data: form.serialize(),
+ type: 'post',
+ dataType: 'json',
+
+ /** Show loader before send */
+ beforeSend: function () {
+ $('body').trigger('processStart');
+ }
+ }).always(function () {
+ $('body').trigger('processStop');
+ });
+ }.bind(this)
+ }
+ });
+ }
+ });
+});
diff --git a/app/code/Magento/InstantPurchase/view/frontend/web/template/confirmation.html b/app/code/Magento/InstantPurchase/view/frontend/web/template/confirmation.html
new file mode 100644
index 0000000000000000000000000000000000000000..883cf1c2fd8f989b2d65fd54535894d8852cf731
--- /dev/null
+++ b/app/code/Magento/InstantPurchase/view/frontend/web/template/confirmation.html
@@ -0,0 +1,15 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<p class="message"><%- data.message %></p>
+<strong><%- data.shippingAddressTitle %>:</strong>
+<p><%- data.shippingAddress %></p>
+<strong><%- data.billingAddressTitle %>:</strong>
+<p><%- data.billingAddress %></p>
+<strong><%- data.paymentMethodTitle %>:</strong>
+<p><%- data.paymentToken %></p>
+<strong><%- data.shippingMethodTitle %>:</strong>
+<p><%- data.shippingMethod %></p>
\ No newline at end of file
diff --git a/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html b/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html
index 058b09e16a6874b24fec0e51ac9fb88f40dc8cae..0373b25c9c5234937ce7349026ddc300b8bb19a8 100644
--- a/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html
+++ b/app/code/Magento/InstantPurchase/view/frontend/web/template/instant-purchase.html
@@ -1,29 +1,34 @@
-<!-- ko if: showButton -->
-<button type="button"
- class="action primary instant-purchase"
- data-bind="click: instantPurchase, attr:{title: buttonText}">
- <span data-bind="text: buttonText"></span>
-</button>
-<!-- ko if: paymentToken -->
-<input type="hidden"
- name="instant_purchase_payment_token"
- data-bind="value: paymentToken().publicHash">
-<!-- /ko -->
-<!-- ko if: shippingAddress -->
-<input type="hidden"
- name="instant_purchase_shipping_address"
- data-bind="value: shippingAddress().id">
-<!-- /ko -->
-<!-- ko if: billingAddress -->
-<input type="hidden"
- name="instant_purchase_billing_address"
- data-bind="value: billingAddress().id">
-<!-- ko if: shippingMethod -->
-<input type="hidden"
- name="instant_purchase_carrier"
- data-bind="value: shippingMethod().carrier">
-<input type="hidden"
- name="instant_purchase_shipping"
- data-bind="value: shippingMethod().method">
-<!-- /ko -->
-<!-- /ko -->
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<if args="showButton()">
+ <button type="button"
+ class="action primary instant-purchase"
+ click="instantPurchase"
+ attr="title: $t(buttonText)">
+ <span translate="buttonText" />
+ </button>
+ <input if="paymentToken()"
+ type="hidden"
+ name="instant_purchase_payment_token"
+ ko-value="paymentToken().publicHash" />
+ <input if="shippingAddress()"
+ type="hidden"
+ name="instant_purchase_shipping_address"
+ ko-value="shippingAddress().id" />
+ <input if="billingAddress()"
+ type="hidden"
+ name="instant_purchase_billing_address"
+ ko-value="billingAddress().id" />
+ <if args="shippingMethod()">
+ <input type="hidden"
+ name="instant_purchase_carrier"
+ ko-value="shippingMethod().carrier" />
+ <input type="hidden"
+ name="instant_purchase_shipping"
+ ko-value="shippingMethod().method" />
+ </if>
+</if>
diff --git a/app/code/Magento/Integration/composer.json b/app/code/Magento/Integration/composer.json
index ef591e69178c31038ce598441858530d9c509c40..25c98161e6f2aeab53f9fa427310679bafd6e8bf 100644
--- a/app/code/Magento/Integration/composer.json
+++ b/app/code/Magento/Integration/composer.json
@@ -12,7 +12,7 @@
"magento/module-authorization": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/NewRelicReporting/composer.json b/app/code/Magento/NewRelicReporting/composer.json
index f8aa98ca11dc2237362541f4276880bba140d3ec..4a02d673a54f60a12b8f63960abf497c8c2ecc9a 100644
--- a/app/code/Magento/NewRelicReporting/composer.json
+++ b/app/code/Magento/NewRelicReporting/composer.json
@@ -13,7 +13,7 @@
"magento/magento-composer-installer": "*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Newsletter/composer.json b/app/code/Magento/Newsletter/composer.json
index 12ce0c988288bdd34ac9989ad024ba43965cf154..3cd5e15d46398bb134ed519aa9d6fe0adaac60cc 100644
--- a/app/code/Magento/Newsletter/composer.json
+++ b/app/code/Magento/Newsletter/composer.json
@@ -14,7 +14,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/OfflineShipping/composer.json b/app/code/Magento/OfflineShipping/composer.json
index 3998a83aa2d64863d8e39062304a152dff1f88d4..2ce66fa368d01dc4467f24f4d7f017ef96d7ff8c 100644
--- a/app/code/Magento/OfflineShipping/composer.json
+++ b/app/code/Magento/OfflineShipping/composer.json
@@ -19,7 +19,7 @@
"magento/module-offline-shipping-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/PageCache/composer.json b/app/code/Magento/PageCache/composer.json
index bb05a371bd0b26fcf41972c3c9eb36e56fb37150..cdbd8327b9cddcec56fbfb8a0b0e0a02ae209f19 100644
--- a/app/code/Magento/PageCache/composer.json
+++ b/app/code/Magento/PageCache/composer.json
@@ -9,7 +9,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/PageCache/etc/varnish4.vcl b/app/code/Magento/PageCache/etc/varnish4.vcl
index 9e57f1e362320619ba4cef195179bae80148d369..793f8f81a03f95fe8129cb58184f7fe9975a9b4f 100644
--- a/app/code/Magento/PageCache/etc/varnish4.vcl
+++ b/app/code/Magento/PageCache/etc/varnish4.vcl
@@ -157,6 +157,7 @@ sub vcl_backend_response {
}
# validate if we need to cache it and prevent from setting cookie
+ # images, css and js are cacheable by default so we have to remove cookie also
if (beresp.ttl > 0s && (bereq.method == "GET" || bereq.method == "HEAD")) {
unset beresp.http.set-cookie;
}
@@ -187,6 +188,13 @@ sub vcl_deliver {
unset resp.http.Age;
}
+ # Not letting browser to cache non-static files.
+ if (resp.http.Cache-Control !~ "private" && req.url !~ "^/(pub/)?(media|static)/") {
+ set resp.http.Pragma = "no-cache";
+ set resp.http.Expires = "-1";
+ set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
+ }
+
unset resp.http.X-Magento-Debug;
unset resp.http.X-Magento-Tags;
unset resp.http.X-Powered-By;
diff --git a/app/code/Magento/PageCache/etc/varnish5.vcl b/app/code/Magento/PageCache/etc/varnish5.vcl
index cfc2192688748bed1fabecd89dfa3032ffa73011..4dce6356d1e7367682c90ca9c483b78478b00057 100644
--- a/app/code/Magento/PageCache/etc/varnish5.vcl
+++ b/app/code/Magento/PageCache/etc/varnish5.vcl
@@ -158,6 +158,7 @@ sub vcl_backend_response {
}
# validate if we need to cache it and prevent from setting cookie
+ # images, css and js are cacheable by default so we have to remove cookie also
if (beresp.ttl > 0s && (bereq.method == "GET" || bereq.method == "HEAD")) {
unset beresp.http.set-cookie;
}
@@ -188,6 +189,13 @@ sub vcl_deliver {
unset resp.http.Age;
}
+ # Not letting browser to cache non-static files.
+ if (resp.http.Cache-Control !~ "private" && req.url !~ "^/(pub/)?(media|static)/") {
+ set resp.http.Pragma = "no-cache";
+ set resp.http.Expires = "-1";
+ set resp.http.Cache-Control = "no-store, no-cache, must-revalidate, max-age=0";
+ }
+
unset resp.http.X-Magento-Debug;
unset resp.http.X-Magento-Tags;
unset resp.http.X-Powered-By;
diff --git a/app/code/Magento/Payment/composer.json b/app/code/Magento/Payment/composer.json
index d8124f52fb0fc8ba3444f4a5ba797ad200c8b3f6..b8dbf6cd7f16f371985c255f7b1cc082730f3a7d 100644
--- a/app/code/Magento/Payment/composer.json
+++ b/app/code/Magento/Payment/composer.json
@@ -12,7 +12,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Paypal/composer.json b/app/code/Magento/Paypal/composer.json
index 6e59371da3cd44d7b4b7b23ca50fe6edebdb0af0..8aec470cb65acc60bc8b23cc075c22d3e68b32b4 100644
--- a/app/code/Magento/Paypal/composer.json
+++ b/app/code/Magento/Paypal/composer.json
@@ -26,7 +26,7 @@
"magento/module-checkout-agreements": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"proprietary"
],
diff --git a/app/code/Magento/ProductVideo/composer.json b/app/code/Magento/ProductVideo/composer.json
index 0844358cccb378a490a005cb7aa03b9d7d761945..d40707a06de8ad886e9513c99620faa6e6c4ffdf 100644
--- a/app/code/Magento/ProductVideo/composer.json
+++ b/app/code/Magento/ProductVideo/composer.json
@@ -16,7 +16,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"proprietary"
],
diff --git a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
index 5161c3a7f01f29a7f97aada87534e04f8f8f17a8..0487d7e46eb26c812ab0fb9abec91591ce13f69c 100644
--- a/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
+++ b/app/code/Magento/Quote/Model/ResourceModel/Quote/Item/Collection.php
@@ -147,21 +147,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
return $this;
}
- /**
- * Join product entities to select existing products items only
- *
- * @return void
- */
- protected function _beforeLoad()
- {
- parent::_beforeLoad();
- $this->join(
- ['cpe' => $this->getResource()->getTable('catalog_product_entity')],
- "cpe.entity_id = main_table.product_id",
- []
- );
- }
-
/**
* After load processing
*
@@ -171,18 +156,20 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
{
parent::_afterLoad();
- /**
- * Assign parent items
- */
+ $productIds = [];
foreach ($this as $item) {
+ // Assign parent items
if ($item->getParentItemId()) {
$item->setParentItem($this->getItemById($item->getParentItemId()));
}
if ($this->_quote) {
$item->setQuote($this->_quote);
}
+ // Collect quote products ids
+ $productIds[] = (int)$item->getProductId();
}
-
+ $this->_productIds = array_merge($this->_productIds, $productIds);
+ $this->removeItemsWithAbsentProducts();
/**
* Assign options and products
*/
@@ -220,12 +207,6 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
protected function _assignProducts()
{
\Magento\Framework\Profiler::start('QUOTE:' . __METHOD__, ['group' => 'QUOTE', 'method' => __METHOD__]);
- $productIds = [];
- foreach ($this as $item) {
- $productIds[] = (int)$item->getProductId();
- }
- $this->_productIds = array_merge($this->_productIds, $productIds);
-
$productCollection = $this->_productCollectionFactory->create()->setStoreId(
$this->getStoreId()
)->addIdFilter(
@@ -320,4 +301,24 @@ class Collection extends \Magento\Framework\Model\ResourceModel\Db\VersionContro
$productCollection->addTierPriceDataByGroupId($this->_quote->getCustomerGroupId());
}
}
+
+ /**
+ * Find and remove quote items with non existing products
+ *
+ * @return void
+ */
+ private function removeItemsWithAbsentProducts()
+ {
+ $productCollection = $this->_productCollectionFactory->create()->addIdFilter($this->_productIds);
+ $existingProductsIds = $productCollection->getAllIds();
+ $absentProductsIds = array_diff($this->_productIds, $existingProductsIds);
+ // Remove not existing products from items collection
+ if (!empty($absentProductsIds)) {
+ foreach ($absentProductsIds as $productIdToExclude) {
+ /** @var \Magento\Quote\Model\Quote\Item $quoteItem */
+ $quoteItem = $this->getItemByColumnValue('product_id', $productIdToExclude);
+ $this->removeItemByKey($quoteItem->getId());
+ }
+ }
+ }
}
diff --git a/app/code/Magento/Quote/composer.json b/app/code/Magento/Quote/composer.json
index a892697802e63de0f4f4de752428712064cd09c1..31f875a0f9a3595677ef52162b95f26f3b16399d 100644
--- a/app/code/Magento/Quote/composer.json
+++ b/app/code/Magento/Quote/composer.json
@@ -23,7 +23,7 @@
"magento/module-webapi": "100.2.*"
},
"type": "magento2-module",
- "version": "101.0.1",
+ "version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/QuoteAnalytics/composer.json b/app/code/Magento/QuoteAnalytics/composer.json
index abbb0ce7a042ba696adc92047667a9d2eac485db..c75abc5bb5da24597437ebe26aa1d15932ff12d9 100644
--- a/app/code/Magento/QuoteAnalytics/composer.json
+++ b/app/code/Magento/QuoteAnalytics/composer.json
@@ -3,8 +3,8 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/framework": "100.2.*",
- "magento/module-quote": "100.2.*"
+ "magento/framework": "101.0.*",
+ "magento/module-quote": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
diff --git a/app/code/Magento/ReleaseNotification/composer.json b/app/code/Magento/ReleaseNotification/composer.json
index b338420a2c143937ae563e0ef95918f9bcf31856..40e9e02db92172e0662089c9dfe794fda4afe49f 100644
--- a/app/code/Magento/ReleaseNotification/composer.json
+++ b/app/code/Magento/ReleaseNotification/composer.json
@@ -1,24 +1,24 @@
{
- "name": "magento/module-release-notification",
- "description": "N/A",
- "require": {
- "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/module-user": "101.0.*",
- "magento/module-backend": "100.2.*",
- "magento/framework": "101.0.*"
- },
- "type": "magento2-module",
- "version": "100.2.0",
- "license": [
- "OSL-3.0",
- "AFL-3.0"
- ],
- "autoload": {
- "files": [
- "registration.php"
+ "name": "magento/module-release-notification",
+ "description": "N/A",
+ "require": {
+ "php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
+ "magento/module-user": "101.0.*",
+ "magento/module-backend": "100.2.*",
+ "magento/framework": "101.0.*"
+ },
+ "type": "magento2-module",
+ "version": "100.2.0",
+ "license": [
+ "OSL-3.0",
+ "AFL-3.0"
],
- "psr-4": {
- "Magento\\ReleaseNotification\\": ""
+ "autoload": {
+ "files": [
+ "registration.php"
+ ],
+ "psr-4": {
+ "Magento\\ReleaseNotification\\": ""
+ }
}
- }
}
diff --git a/app/code/Magento/Reports/composer.json b/app/code/Magento/Reports/composer.json
index 1058052dd11221bd5e9acc1071e3740918574bae..45514175aa9f1c2234c9ca8ad8ecf7df29ed0195 100644
--- a/app/code/Magento/Reports/composer.json
+++ b/app/code/Magento/Reports/composer.json
@@ -22,7 +22,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Review/composer.json b/app/code/Magento/Review/composer.json
index 47680b454c29f631231f31f767700efceed59902..608dd51273d2e26199bedb5e09a29fcd30e7b7db 100644
--- a/app/code/Magento/Review/composer.json
+++ b/app/code/Magento/Review/composer.json
@@ -18,7 +18,7 @@
"magento/module-review-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/ReviewAnalytics/composer.json b/app/code/Magento/ReviewAnalytics/composer.json
index 965b6294db16a4e0815b872a0f563d5986b91c5a..2c982969a391f9f1f63f45e2745d831c33883f68 100644
--- a/app/code/Magento/ReviewAnalytics/composer.json
+++ b/app/code/Magento/ReviewAnalytics/composer.json
@@ -3,7 +3,7 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/framework": "100.2.*",
+ "magento/framework": "101.0.*",
"magento/module-review": "100.2.*"
},
"type": "magento2-module",
diff --git a/app/code/Magento/Sales/composer.json b/app/code/Magento/Sales/composer.json
index 9761f82d1894aff5881756eb5718520f912ad4e6..5468f1dad5f068c9b3ba6eb4f5f629509187e169 100644
--- a/app/code/Magento/Sales/composer.json
+++ b/app/code/Magento/Sales/composer.json
@@ -32,7 +32,7 @@
"magento/module-sales-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "101.0.1",
+ "version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/SalesAnalytics/composer.json b/app/code/Magento/SalesAnalytics/composer.json
index 344971d7056cfb88649a7a98d0b0e8788d22b18b..e1e60bed3bd53fed5d44f49cab09f638617240aa 100644
--- a/app/code/Magento/SalesAnalytics/composer.json
+++ b/app/code/Magento/SalesAnalytics/composer.json
@@ -3,8 +3,8 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/framework": "100.2.*",
- "magento/module-sales": "100.2.*"
+ "magento/framework": "101.0.*",
+ "magento/module-sales": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
diff --git a/app/code/Magento/SalesRule/composer.json b/app/code/Magento/SalesRule/composer.json
index 2b142135271d2bd41c43c5c1349c1f4487430cd0..b84eb3b0682dca232724dd45d02c26321abe5c1c 100644
--- a/app/code/Magento/SalesRule/composer.json
+++ b/app/code/Magento/SalesRule/composer.json
@@ -25,7 +25,7 @@
"magento/module-sales-rule-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "101.0.0",
+ "version": "101.0.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/SampleData/composer.json b/app/code/Magento/SampleData/composer.json
index 57d69977afb1c55c0f40632716775bf5d9058efe..9c2c84a1365e914ece1cf43a0353fbc0f91b361d 100644
--- a/app/code/Magento/SampleData/composer.json
+++ b/app/code/Magento/SampleData/composer.json
@@ -9,7 +9,7 @@
"magento/sample-data-media": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Search/composer.json b/app/code/Magento/Search/composer.json
index c6aecd101fc6fee6dc8a14d44a818739a37e53c2..5dc05010c525a239d6056338d0bb03f46f56c9b4 100644
--- a/app/code/Magento/Search/composer.json
+++ b/app/code/Magento/Search/composer.json
@@ -11,7 +11,7 @@
"magento/module-ui": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Shipping/composer.json b/app/code/Magento/Shipping/composer.json
index a7a2a3d48b06e30f2cb0769fdcbadace2b17ec98..25766e8a45e317eb1335552f55911440e5d5401b 100644
--- a/app/code/Magento/Shipping/composer.json
+++ b/app/code/Magento/Shipping/composer.json
@@ -25,7 +25,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Sitemap/composer.json b/app/code/Magento/Sitemap/composer.json
index 88be3616eebd05bfee6474f704389a3a0127d32d..678e6f5fe198ed74953460f6b72aad9664394ed6 100644
--- a/app/code/Magento/Sitemap/composer.json
+++ b/app/code/Magento/Sitemap/composer.json
@@ -18,7 +18,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Store/composer.json b/app/code/Magento/Store/composer.json
index f9eb84e2f9fa1010b126310f61ab18c741f0209a..b3bbb680bcd78ce3ea6f91b1a60c82a2aa07aac7 100644
--- a/app/code/Magento/Store/composer.json
+++ b/app/code/Magento/Store/composer.json
@@ -14,7 +14,7 @@
"magento/module-deploy": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Swatches/composer.json b/app/code/Magento/Swatches/composer.json
index 6efeb62a23b781c85ce3d29ae31a32748d685be6..65ba7251f45d0e11c3f4119da82915cee545ae1a 100644
--- a/app/code/Magento/Swatches/composer.json
+++ b/app/code/Magento/Swatches/composer.json
@@ -19,7 +19,7 @@
"magento/module-swatches-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"proprietary"
],
diff --git a/app/code/Magento/Tax/composer.json b/app/code/Magento/Tax/composer.json
index 1d09fb64eed893b1257cc3c6f399bda00ca77322..2c4de31f5b2eec0d07e466c43d108adf936da9de 100644
--- a/app/code/Magento/Tax/composer.json
+++ b/app/code/Magento/Tax/composer.json
@@ -22,7 +22,7 @@
"magento/module-tax-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
index 4593eccd23dea1c3a06f47791e2c8b3e12f79b23..55e1a04ccfdf77a95fe61264537df697a02ed730 100644
--- a/app/code/Magento/Theme/composer.json
+++ b/app/code/Magento/Theme/composer.json
@@ -22,7 +22,7 @@
"magento/module-directory": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Translation/composer.json b/app/code/Magento/Translation/composer.json
index a2504cdfbb9cd9da1b1f17743a08b6cdab199d1d..ce7e4e1ae87960ed87370c973682c74cab6d4715 100644
--- a/app/code/Magento/Translation/composer.json
+++ b/app/code/Magento/Translation/composer.json
@@ -12,7 +12,7 @@
"magento/module-deploy": "100.2.*"
},
"type": "magento2-module",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Ui/composer.json b/app/code/Magento/Ui/composer.json
index 1f58c55ce61b683d7fad83f62d35982917fc5e37..224213886dcd4aa92475d0b1290e3db109ac0216 100644
--- a/app/code/Magento/Ui/composer.json
+++ b/app/code/Magento/Ui/composer.json
@@ -13,7 +13,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "101.0.1",
+ "version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Ups/composer.json b/app/code/Magento/Ups/composer.json
index ec31eff4f4b0023a23c64714494d6a1054d544d9..4d527bd9f108ac125fa9a863807b839ccaedc314 100644
--- a/app/code/Magento/Ups/composer.json
+++ b/app/code/Magento/Ups/composer.json
@@ -16,7 +16,7 @@
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/UrlRewrite/composer.json b/app/code/Magento/UrlRewrite/composer.json
index 32086222e43f147748f721b95978de56f9ba89ef..0133a750a75ceb21816a75ee0f399f7d5a646575 100644
--- a/app/code/Magento/UrlRewrite/composer.json
+++ b/app/code/Magento/UrlRewrite/composer.json
@@ -12,7 +12,7 @@
"magento/module-cms-url-rewrite": "100.2.*"
},
"type": "magento2-module",
- "version": "101.0.1",
+ "version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/User/composer.json b/app/code/Magento/User/composer.json
index d792b68bfad9c610e16fda34180327435e7dcfd1..bb5f93197b17ca19239ffba60f8cb53a37225322 100644
--- a/app/code/Magento/User/composer.json
+++ b/app/code/Magento/User/composer.json
@@ -12,7 +12,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "101.0.0",
+ "version": "101.0.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Variable/composer.json b/app/code/Magento/Variable/composer.json
index bd5d7bc4bd8c08ef21815fc653dfd1767289aba9..ea4721096afca199f86c6918b6a772b2f221042a 100644
--- a/app/code/Magento/Variable/composer.json
+++ b/app/code/Magento/Variable/composer.json
@@ -9,7 +9,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Vault/composer.json b/app/code/Magento/Vault/composer.json
index 5c0719d2c4b624fbd1676368adfab2ae9954b54d..a956f0ea917dee85c5857434d73b3c02e675cc0c 100644
--- a/app/code/Magento/Vault/composer.json
+++ b/app/code/Magento/Vault/composer.json
@@ -12,7 +12,7 @@
"magento/module-quote": "101.0.*"
},
"type": "magento2-module",
- "version": "101.0.0",
+ "version": "101.0.1",
"license": [
"proprietary"
],
diff --git a/app/code/Magento/Webapi/composer.json b/app/code/Magento/Webapi/composer.json
index 15eaba22ea7d437c9c80e0ebed9fa2a9897ef694..1ee5eeb5fe9c64f514c8547e6881e884d0e42d0a 100644
--- a/app/code/Magento/Webapi/composer.json
+++ b/app/code/Magento/Webapi/composer.json
@@ -14,7 +14,7 @@
"magento/module-customer": "101.0.*"
},
"type": "magento2-module",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Widget/composer.json b/app/code/Magento/Widget/composer.json
index ac9c5788591f8d7725ca2ffe0b62b31a6b36acfa..cda529c4801ce59597ed741eaca3c984ed5953d7 100644
--- a/app/code/Magento/Widget/composer.json
+++ b/app/code/Magento/Widget/composer.json
@@ -16,7 +16,7 @@
"magento/module-widget-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "101.0.0",
+ "version": "101.0.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/Wishlist/composer.json b/app/code/Magento/Wishlist/composer.json
index ea85d595486451862ab831121a6723e94683c483..8e1e51364679133ff754faf0991c5705184dcd87 100644
--- a/app/code/Magento/Wishlist/composer.json
+++ b/app/code/Magento/Wishlist/composer.json
@@ -23,7 +23,7 @@
"magento/module-wishlist-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
- "version": "101.0.0",
+ "version": "101.0.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/code/Magento/WishlistAnalytics/composer.json b/app/code/Magento/WishlistAnalytics/composer.json
index 11bd71276427ca0d26950768a31a3d67b94242ac..6d3858acbe944273c633b4b4dda46e7ba1956188 100644
--- a/app/code/Magento/WishlistAnalytics/composer.json
+++ b/app/code/Magento/WishlistAnalytics/composer.json
@@ -3,8 +3,8 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
- "magento/framework": "100.2.*",
- "magento/module-wishlist": "100.2.*"
+ "magento/framework": "101.0.*",
+ "magento/module-wishlist": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0",
diff --git a/app/design/adminhtml/Magento/backend/composer.json b/app/design/adminhtml/Magento/backend/composer.json
index cd331a26ec525504bb3fe7cb8703d328242b8574..bb7d1587de8ab2f1da31cafbe87fcb33250aa4f7 100644
--- a/app/design/adminhtml/Magento/backend/composer.json
+++ b/app/design/adminhtml/Magento/backend/composer.json
@@ -6,7 +6,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-theme",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/design/frontend/Magento/blank/composer.json b/app/design/frontend/Magento/blank/composer.json
index c552dec3cd2f6d6f16add3a0eb5bd08545f38386..d21326bd339786f14acbdee6d64fa3c78336325b 100644
--- a/app/design/frontend/Magento/blank/composer.json
+++ b/app/design/frontend/Magento/blank/composer.json
@@ -6,7 +6,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-theme",
- "version": "100.2.0",
+ "version": "100.2.1",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/app/design/frontend/Magento/luma/composer.json b/app/design/frontend/Magento/luma/composer.json
index b5db1aa32b4a1252b1f09a5aeca9924504ce9d7c..481366949e8095abb77315cb28ede353b91cf8cf 100644
--- a/app/design/frontend/Magento/luma/composer.json
+++ b/app/design/frontend/Magento/luma/composer.json
@@ -7,7 +7,7 @@
"magento/framework": "101.0.*"
},
"type": "magento2-theme",
- "version": "100.2.1",
+ "version": "100.2.2",
"license": [
"OSL-3.0",
"AFL-3.0"
diff --git a/composer.json b/composer.json
index be9457595726163f6a84d21c6e0454298dd78cee..affd28d1fe133bdc01e8ceb0fdaecbb42440349b 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
"name": "magento/magento2ce",
"description": "Magento 2 (Open Source)",
"type": "project",
- "version": "2.2.2-dev",
+ "version": "2.2.4-dev",
"license": [
"OSL-3.0",
"AFL-3.0"
@@ -35,9 +35,9 @@
"zendframework/zend-captcha": "^2.7.1",
"zendframework/zend-session": "^2.7.3",
"magento/zendframework1": "~1.13.0",
- "colinmollenhour/credis": "1.9.1",
+ "colinmollenhour/credis": "1.8.2",
"colinmollenhour/php-redis-session-abstract": "1.3.4",
- "colinmollenhour/cache-backend-redis": "1.10.4",
+ "colinmollenhour/cache-backend-redis": "1.10.2",
"colinmollenhour/cache-backend-file": "1.4",
"composer/composer": "1.4.1",
"monolog/monolog": "^1.17",
@@ -83,123 +83,123 @@
},
"replace": {
"magento/module-marketplace": "100.2.0",
- "magento/module-admin-notification": "100.2.0",
+ "magento/module-admin-notification": "100.2.1",
"magento/module-advanced-pricing-import-export": "100.2.1",
"magento/module-analytics": "100.2.0",
"magento/module-authorization": "100.2.0",
"magento/module-authorizenet": "100.2.0",
- "magento/module-backend": "100.2.1",
- "magento/module-backup": "100.2.0",
- "magento/module-braintree": "100.2.1",
- "magento/module-bundle": "100.2.1",
+ "magento/module-backend": "100.2.2",
+ "magento/module-backup": "100.2.1",
+ "magento/module-braintree": "100.2.2",
+ "magento/module-bundle": "100.2.2",
"magento/module-bundle-import-export": "100.2.0",
"magento/module-cache-invalidate": "100.2.0",
"magento/module-captcha": "100.2.0",
- "magento/module-catalog": "102.0.1",
+ "magento/module-catalog": "102.0.2",
"magento/module-catalog-analytics": "100.2.0",
- "magento/module-catalog-import-export": "100.2.1",
- "magento/module-catalog-inventory": "100.2.1",
- "magento/module-catalog-rule": "101.0.1",
+ "magento/module-catalog-import-export": "100.2.2",
+ "magento/module-catalog-inventory": "100.2.2",
+ "magento/module-catalog-rule": "101.0.2",
"magento/module-catalog-rule-configurable": "100.2.0",
- "magento/module-catalog-search": "100.2.1",
- "magento/module-catalog-url-rewrite": "100.2.1",
+ "magento/module-catalog-search": "100.2.2",
+ "magento/module-catalog-url-rewrite": "100.2.2",
"magento/module-catalog-widget": "100.2.0",
- "magento/module-checkout": "100.2.1",
+ "magento/module-checkout": "100.2.2",
"magento/module-checkout-agreements": "100.2.0",
- "magento/module-cms": "102.0.1",
+ "magento/module-cms": "102.0.2",
"magento/module-cms-url-rewrite": "100.2.0",
- "magento/module-config": "101.0.1",
+ "magento/module-config": "101.0.2",
"magento/module-configurable-import-export": "100.2.0",
- "magento/module-configurable-product": "100.2.1",
+ "magento/module-configurable-product": "100.2.2",
"magento/module-configurable-product-sales": "100.2.0",
- "magento/module-contact": "100.2.0",
+ "magento/module-contact": "100.2.1",
"magento/module-cookie": "100.2.0",
- "magento/module-cron": "100.2.0",
+ "magento/module-cron": "100.2.1",
"magento/module-currency-symbol": "100.2.0",
- "magento/module-customer": "101.0.1",
+ "magento/module-customer": "101.0.2",
"magento/module-customer-analytics": "100.2.0",
- "magento/module-customer-import-export": "100.2.0",
- "magento/module-deploy": "100.2.1",
+ "magento/module-customer-import-export": "100.2.1",
+ "magento/module-deploy": "100.2.2",
"magento/module-developer": "100.2.1",
"magento/module-dhl": "100.2.0",
- "magento/module-directory": "100.2.0",
- "magento/module-downloadable": "100.2.0",
+ "magento/module-directory": "100.2.1",
+ "magento/module-downloadable": "100.2.1",
"magento/module-downloadable-import-export": "100.2.0",
- "magento/module-eav": "101.0.0",
- "magento/module-email": "100.2.0",
+ "magento/module-eav": "101.0.1",
+ "magento/module-email": "100.2.1",
"magento/module-encryption-key": "100.2.0",
"magento/module-fedex": "100.2.0",
"magento/module-gift-message": "100.2.0",
"magento/module-google-adwords": "100.2.0",
"magento/module-google-analytics": "100.2.1",
- "magento/module-google-optimizer": "100.2.0",
+ "magento/module-google-optimizer": "100.2.1",
"magento/module-grouped-import-export": "100.2.0",
- "magento/module-grouped-product": "100.2.0",
- "magento/module-import-export": "100.2.1",
- "magento/module-indexer": "100.2.0",
+ "magento/module-grouped-product": "100.2.1",
+ "magento/module-import-export": "100.2.2",
+ "magento/module-indexer": "100.2.1",
"magento/module-instant-purchase": "100.2.0",
- "magento/module-integration": "100.2.0",
+ "magento/module-integration": "100.2.1",
"magento/module-layered-navigation": "100.2.0",
"magento/module-media-storage": "100.2.0",
"magento/module-msrp": "100.2.0",
"magento/module-multishipping": "100.2.0",
- "magento/module-new-relic-reporting": "100.2.0",
- "magento/module-newsletter": "100.2.0",
+ "magento/module-new-relic-reporting": "100.2.1",
+ "magento/module-newsletter": "100.2.1",
"magento/module-offline-payments": "100.2.0",
- "magento/module-offline-shipping": "100.2.0",
- "magento/module-page-cache": "100.2.0",
- "magento/module-payment": "100.2.0",
- "magento/module-paypal": "100.2.0",
+ "magento/module-offline-shipping": "100.2.1",
+ "magento/module-page-cache": "100.2.1",
+ "magento/module-payment": "100.2.1",
+ "magento/module-paypal": "100.2.1",
"magento/module-persistent": "100.2.0",
"magento/module-product-alert": "100.2.0",
- "magento/module-product-video": "100.2.0",
- "magento/module-quote": "101.0.1",
+ "magento/module-product-video": "100.2.1",
+ "magento/module-quote": "101.0.2",
"magento/module-quote-analytics": "100.2.0",
"magento/module-release-notification": "100.2.0",
- "magento/module-reports": "100.2.1",
+ "magento/module-reports": "100.2.2",
"magento/module-require-js": "100.2.0",
- "magento/module-review": "100.2.1",
+ "magento/module-review": "100.2.2",
"magento/module-review-analytics": "100.2.0",
"magento/module-robots": "100.2.0",
"magento/module-rss": "100.2.0",
"magento/module-rule": "100.2.0",
- "magento/module-sales": "101.0.1",
+ "magento/module-sales": "101.0.2",
"magento/module-sales-analytics": "100.2.0",
"magento/module-sales-inventory": "100.2.0",
- "magento/module-sales-rule": "101.0.0",
+ "magento/module-sales-rule": "101.0.1",
"magento/module-sales-sequence": "100.2.0",
- "magento/module-sample-data": "100.2.0",
- "magento/module-search": "100.2.1",
+ "magento/module-sample-data": "100.2.1",
+ "magento/module-search": "100.2.2",
"magento/module-security": "100.2.0",
"magento/module-send-friend": "100.2.0",
- "magento/module-shipping": "100.2.1",
+ "magento/module-shipping": "100.2.2",
"magento/module-signifyd": "100.2.1",
- "magento/module-sitemap": "100.2.1",
- "magento/module-store": "100.2.1",
+ "magento/module-sitemap": "100.2.2",
+ "magento/module-store": "100.2.2",
"magento/module-swagger": "100.2.1",
- "magento/module-swatches": "100.2.0",
+ "magento/module-swatches": "100.2.1",
"magento/module-swatches-layered-navigation": "100.2.0",
- "magento/module-tax": "100.2.1",
+ "magento/module-tax": "100.2.2",
"magento/module-tax-import-export": "100.2.0",
- "magento/module-theme": "100.2.1",
- "magento/module-translation": "100.2.1",
- "magento/module-ui": "101.0.1",
- "magento/module-ups": "100.2.0",
- "magento/module-url-rewrite": "101.0.1",
- "magento/module-user": "101.0.0",
+ "magento/module-theme": "100.2.2",
+ "magento/module-translation": "100.2.2",
+ "magento/module-ui": "101.0.2",
+ "magento/module-ups": "100.2.1",
+ "magento/module-url-rewrite": "101.0.2",
+ "magento/module-user": "101.0.1",
"magento/module-usps": "100.2.0",
- "magento/module-variable": "100.2.0",
- "magento/module-vault": "101.0.0",
+ "magento/module-variable": "100.2.1",
+ "magento/module-vault": "101.0.1",
"magento/module-version": "100.2.0",
- "magento/module-webapi": "100.2.0",
+ "magento/module-webapi": "100.2.1",
"magento/module-webapi-security": "100.2.0",
"magento/module-weee": "100.2.0",
- "magento/module-widget": "101.0.0",
- "magento/module-wishlist": "101.0.0",
+ "magento/module-widget": "101.0.1",
+ "magento/module-wishlist": "101.0.1",
"magento/module-wishlist-analytics": "100.2.0",
- "magento/theme-adminhtml-backend": "100.2.0",
- "magento/theme-frontend-blank": "100.2.0",
- "magento/theme-frontend-luma": "100.2.1",
+ "magento/theme-adminhtml-backend": "100.2.1",
+ "magento/theme-frontend-blank": "100.2.1",
+ "magento/theme-frontend-luma": "100.2.2",
"magento/language-de_de": "100.2.0",
"magento/language-en_us": "100.2.0",
"magento/language-es_es": "100.2.0",
@@ -207,7 +207,7 @@
"magento/language-nl_nl": "100.2.0",
"magento/language-pt_br": "100.2.0",
"magento/language-zh_hans_cn": "100.2.0",
- "magento/framework": "101.0.1",
+ "magento/framework": "101.0.2",
"trentrichardson/jquery-timepicker-addon": "1.4.3",
"components/jquery": "1.11.0",
"blueimp/jquery-file-upload": "5.6.14",
diff --git a/composer.lock b/composer.lock
index c126da645a6defe360a25b31ddfddb133f99c1a2..0f16d512409c033227ab24d0550291a0d3258187 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "923fde043cfee16a442bb4e85cc032c6",
- "content-hash": "da93a2422778d99a80c69037a53d447a",
+ "content-hash": "a6f1ec648029ca7b40870c3356fa955c",
"packages": [
{
"name": "braintree/braintree_php",
@@ -52,7 +51,7 @@
}
],
"description": "Braintree PHP Client Library",
- "time": "2017-08-25 19:38:09"
+ "time": "2017-08-25T19:38:09+00:00"
},
{
"name": "colinmollenhour/cache-backend-file",
@@ -88,20 +87,20 @@
],
"description": "The stock Zend_Cache_Backend_File backend has extremely poor performance for cleaning by tags making it become unusable as the number of cached items increases. This backend makes many changes resulting in a huge performance boost, especially for tag cleaning.",
"homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_File",
- "time": "2016-05-02 16:24:47"
+ "time": "2016-05-02T16:24:47+00:00"
},
{
"name": "colinmollenhour/cache-backend-redis",
- "version": "1.10.4",
+ "version": "1.10.2",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis.git",
- "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972"
+ "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972",
- "reference": "6bf0a4b7a3f8dc4a6255fad5b6e42213253d9972",
+ "url": "https://api.github.com/repos/colinmollenhour/Cm_Cache_Backend_Redis/zipball/18b33e4b69cf15747ab98b4f2c98ab445da05abd",
+ "reference": "18b33e4b69cf15747ab98b4f2c98ab445da05abd",
"shasum": ""
},
"require": {
@@ -124,20 +123,20 @@
],
"description": "Zend_Cache backend using Redis with full support for tags.",
"homepage": "https://github.com/colinmollenhour/Cm_Cache_Backend_Redis",
- "time": "2017-10-05 20:50:44"
+ "time": "2017-03-25T04:54:24+00:00"
},
{
"name": "colinmollenhour/credis",
- "version": "1.9.1",
+ "version": "1.8.2",
"source": {
"type": "git",
"url": "https://github.com/colinmollenhour/credis.git",
- "reference": "049ccfb2c680e4dfa6adcfa97f2f29d086919abd"
+ "reference": "9c14b4bb0779127638a17dd8aab8f05f28c6df43"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/049ccfb2c680e4dfa6adcfa97f2f29d086919abd",
- "reference": "049ccfb2c680e4dfa6adcfa97f2f29d086919abd",
+ "url": "https://api.github.com/repos/colinmollenhour/credis/zipball/9c14b4bb0779127638a17dd8aab8f05f28c6df43",
+ "reference": "9c14b4bb0779127638a17dd8aab8f05f28c6df43",
"shasum": ""
},
"require": {
@@ -164,7 +163,7 @@
],
"description": "Credis is a lightweight interface to the Redis key-value store which wraps the phpredis library when available for better performance.",
"homepage": "https://github.com/colinmollenhour/credis",
- "time": "2017-10-05 20:28:58"
+ "time": "2017-07-05T15:32:38+00:00"
},
{
"name": "colinmollenhour/php-redis-session-abstract",
@@ -201,20 +200,20 @@
],
"description": "A Redis-based session handler with optimistic locking",
"homepage": "https://github.com/colinmollenhour/php-redis-session-abstract",
- "time": "2017-03-22 16:13:03"
+ "time": "2017-03-22T16:13:03+00:00"
},
{
"name": "composer/ca-bundle",
- "version": "1.0.8",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
- "reference": "9dd73a03951357922d8aee6cc084500de93e2343"
+ "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/ca-bundle/zipball/9dd73a03951357922d8aee6cc084500de93e2343",
- "reference": "9dd73a03951357922d8aee6cc084500de93e2343",
+ "url": "https://api.github.com/repos/composer/ca-bundle/zipball/943b2c4fcad1ef178d16a713c2468bf7e579c288",
+ "reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288",
"shasum": ""
},
"require": {
@@ -223,12 +222,9 @@
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5",
+ "phpunit/phpunit": "^4.8.35",
"psr/log": "^1.0",
- "symfony/process": "^2.5 || ^3.0"
- },
- "suggest": {
- "symfony/process": "This is necessary to reliably check whether openssl_x509_parse is vulnerable on older php versions, but can be ignored on PHP 5.5.6+"
+ "symfony/process": "^2.5 || ^3.0 || ^4.0"
},
"type": "library",
"extra": {
@@ -260,7 +256,7 @@
"ssl",
"tls"
],
- "time": "2017-09-11 07:24:36"
+ "time": "2017-11-29T09:37:33+00:00"
},
{
"name": "composer/composer",
@@ -337,7 +333,7 @@
"dependency",
"package"
],
- "time": "2017-03-10 08:29:45"
+ "time": "2017-03-10T08:29:45+00:00"
},
{
"name": "composer/semver",
@@ -399,7 +395,7 @@
"validation",
"versioning"
],
- "time": "2016-08-30 16:08:34"
+ "time": "2016-08-30T16:08:34+00:00"
},
{
"name": "composer/spdx-licenses",
@@ -460,7 +456,7 @@
"spdx",
"validator"
],
- "time": "2017-04-03 19:08:52"
+ "time": "2017-04-03T19:08:52+00:00"
},
{
"name": "container-interop/container-interop",
@@ -491,7 +487,7 @@
],
"description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
"homepage": "https://github.com/container-interop/container-interop",
- "time": "2017-02-14 19:40:03"
+ "time": "2017-02-14T19:40:03+00:00"
},
{
"name": "justinrainbow/json-schema",
@@ -557,7 +553,7 @@
"json",
"schema"
],
- "time": "2017-10-21 13:15:38"
+ "time": "2017-10-21T13:15:38+00:00"
},
{
"name": "league/climate",
@@ -606,7 +602,7 @@
"php",
"terminal"
],
- "time": "2015-01-18 14:31:58"
+ "time": "2015-01-18T14:31:58+00:00"
},
{
"name": "magento/composer",
@@ -642,7 +638,7 @@
"AFL-3.0"
],
"description": "Magento composer library helps to instantiate Composer application and run composer commands.",
- "time": "2017-04-24 09:57:02"
+ "time": "2017-04-24T09:57:02+00:00"
},
{
"name": "magento/magento-composer-installer",
@@ -721,7 +717,7 @@
"composer-installer",
"magento"
],
- "time": "2016-10-06 16:05:07"
+ "time": "2016-10-06T16:05:07+00:00"
},
{
"name": "magento/zendframework1",
@@ -768,7 +764,7 @@
"ZF1",
"framework"
],
- "time": "2017-06-21 14:56:23"
+ "time": "2017-06-21T14:56:23+00:00"
},
{
"name": "monolog/monolog",
@@ -846,7 +842,7 @@
"logging",
"psr-3"
],
- "time": "2017-06-19 01:22:40"
+ "time": "2017-06-19T01:22:40+00:00"
},
{
"name": "oyejorge/less.php",
@@ -908,7 +904,7 @@
"php",
"stylesheet"
],
- "time": "2017-03-28 22:19:25"
+ "time": "2017-03-28T22:19:25+00:00"
},
{
"name": "paragonie/random_compat",
@@ -956,7 +952,7 @@
"pseudorandom",
"random"
],
- "time": "2017-09-27 21:40:39"
+ "time": "2017-09-27T21:40:39+00:00"
},
{
"name": "pelago/emogrifier",
@@ -1016,20 +1012,20 @@
],
"description": "Converts CSS styles into inline style attributes in your HTML code",
"homepage": "http://www.pelagodesign.com/sidecar/emogrifier/",
- "time": "2017-03-02 12:51:48"
+ "time": "2017-03-02T12:51:48+00:00"
},
{
"name": "phpseclib/phpseclib",
- "version": "2.0.7",
+ "version": "2.0.9",
"source": {
"type": "git",
"url": "https://github.com/phpseclib/phpseclib.git",
- "reference": "f4b6a522dfa1fd1e477c9cfe5909d5b31f098c0b"
+ "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/f4b6a522dfa1fd1e477c9cfe5909d5b31f098c0b",
- "reference": "f4b6a522dfa1fd1e477c9cfe5909d5b31f098c0b",
+ "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c9a3fe35e20eb6eeaca716d6a23cde03f52d1558",
+ "reference": "c9a3fe35e20eb6eeaca716d6a23cde03f52d1558",
"shasum": ""
},
"require": {
@@ -1108,7 +1104,7 @@
"x.509",
"x509"
],
- "time": "2017-10-23 05:04:54"
+ "time": "2017-11-29T06:38:08+00:00"
},
{
"name": "psr/container",
@@ -1157,7 +1153,7 @@
"container-interop",
"psr"
],
- "time": "2017-02-14 16:28:37"
+ "time": "2017-02-14T16:28:37+00:00"
},
{
"name": "psr/http-message",
@@ -1207,7 +1203,7 @@
"request",
"response"
],
- "time": "2016-08-06 14:39:51"
+ "time": "2016-08-06T14:39:51+00:00"
},
{
"name": "psr/log",
@@ -1254,7 +1250,7 @@
"psr",
"psr-3"
],
- "time": "2016-10-10 12:19:37"
+ "time": "2016-10-10T12:19:37+00:00"
},
{
"name": "ramsey/uuid",
@@ -1336,7 +1332,7 @@
"identifier",
"uuid"
],
- "time": "2017-09-22 20:46:04"
+ "time": "2017-09-22T20:46:04+00:00"
},
{
"name": "seld/cli-prompt",
@@ -1384,20 +1380,20 @@
"input",
"prompt"
],
- "time": "2017-03-18 11:32:45"
+ "time": "2017-03-18T11:32:45+00:00"
},
{
"name": "seld/jsonlint",
- "version": "1.6.1",
+ "version": "1.6.2",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/jsonlint.git",
- "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77"
+ "reference": "7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77",
- "reference": "50d63f2858d87c4738d5b76a7dcbb99fa8cf7c77",
+ "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19",
+ "reference": "7a30649c67ee0d19faacfd9fa2cfb6cc032d9b19",
"shasum": ""
},
"require": {
@@ -1433,7 +1429,7 @@
"parser",
"validator"
],
- "time": "2017-06-18 15:11:04"
+ "time": "2017-11-30T15:34:22+00:00"
},
{
"name": "seld/phar-utils",
@@ -1477,7 +1473,7 @@
"keywords": [
"phra"
],
- "time": "2015-10-13 18:44:15"
+ "time": "2015-10-13T18:44:15+00:00"
},
{
"name": "sjparkinson/static-review",
@@ -1530,20 +1526,21 @@
}
],
"description": "An extendable framework for version control hooks.",
- "time": "2014-09-22 08:40:36"
+ "abandoned": "phpro/grumphp",
+ "time": "2014-09-22T08:40:36+00:00"
},
{
"name": "symfony/console",
- "version": "v2.8.29",
+ "version": "v2.8.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "89143ce2b463515a75b5f5e9650e6ecfb2684158"
+ "reference": "46270f1ca44f08ebc134ce120fd2c2baf5fd63de"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/89143ce2b463515a75b5f5e9650e6ecfb2684158",
- "reference": "89143ce2b463515a75b5f5e9650e6ecfb2684158",
+ "url": "https://api.github.com/repos/symfony/console/zipball/46270f1ca44f08ebc134ce120fd2c2baf5fd63de",
+ "reference": "46270f1ca44f08ebc134ce120fd2c2baf5fd63de",
"shasum": ""
},
"require": {
@@ -1591,7 +1588,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2017-11-07 14:08:47"
+ "time": "2017-11-29T09:33:18+00:00"
},
{
"name": "symfony/debug",
@@ -1648,11 +1645,11 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2016-07-30 07:22:48"
+ "time": "2016-07-30T07:22:48+00:00"
},
{
"name": "symfony/event-dispatcher",
- "version": "v2.8.29",
+ "version": "v2.8.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
@@ -1708,20 +1705,20 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2017-11-05 15:25:56"
+ "time": "2017-11-05T15:25:56+00:00"
},
{
"name": "symfony/filesystem",
- "version": "v3.3.11",
+ "version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "77db266766b54db3ee982fe51868328b887ce15c"
+ "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/77db266766b54db3ee982fe51868328b887ce15c",
- "reference": "77db266766b54db3ee982fe51868328b887ce15c",
+ "url": "https://api.github.com/repos/symfony/filesystem/zipball/de56eee71e0a128d8c54ccc1909cdefd574bad0f",
+ "reference": "de56eee71e0a128d8c54ccc1909cdefd574bad0f",
"shasum": ""
},
"require": {
@@ -1730,7 +1727,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -1757,20 +1754,20 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2017-11-07 14:12:55"
+ "time": "2017-11-19T18:59:05+00:00"
},
{
"name": "symfony/finder",
- "version": "v3.3.11",
+ "version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
- "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880"
+ "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/finder/zipball/138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
- "reference": "138af5ec075d4b1d1bd19de08c38a34bb2d7d880",
+ "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a",
+ "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a",
"shasum": ""
},
"require": {
@@ -1779,7 +1776,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -1806,7 +1803,7 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2017-11-05 15:47:03"
+ "time": "2017-11-05T16:10:10+00:00"
},
{
"name": "symfony/polyfill-mbstring",
@@ -1865,11 +1862,11 @@
"portable",
"shim"
],
- "time": "2017-10-11 12:05:26"
+ "time": "2017-10-11T12:05:26+00:00"
},
{
"name": "symfony/process",
- "version": "v2.8.29",
+ "version": "v2.8.32",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
@@ -1914,7 +1911,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
- "time": "2017-11-05 15:25:56"
+ "time": "2017-11-05T15:25:56+00:00"
},
{
"name": "tedivm/jshrink",
@@ -1960,7 +1957,7 @@
"javascript",
"minifier"
],
- "time": "2017-05-30 02:59:46"
+ "time": "2017-05-30T02:59:46+00:00"
},
{
"name": "tubalmartin/cssmin",
@@ -2013,7 +2010,7 @@
"minify",
"yui"
],
- "time": "2017-05-16 13:45:26"
+ "time": "2017-05-16T13:45:26+00:00"
},
{
"name": "zendframework/zend-captcha",
@@ -2070,7 +2067,7 @@
"captcha",
"zf2"
],
- "time": "2017-02-23 08:09:44"
+ "time": "2017-02-23T08:09:44+00:00"
},
{
"name": "zendframework/zend-code",
@@ -2123,7 +2120,7 @@
"code",
"zf2"
],
- "time": "2016-10-24 13:23:32"
+ "time": "2016-10-24T13:23:32+00:00"
},
{
"name": "zendframework/zend-config",
@@ -2179,7 +2176,7 @@
"config",
"zf2"
],
- "time": "2016-02-04 23:01:10"
+ "time": "2016-02-04T23:01:10+00:00"
},
{
"name": "zendframework/zend-console",
@@ -2231,7 +2228,7 @@
"console",
"zf2"
],
- "time": "2016-02-09 17:15:12"
+ "time": "2016-02-09T17:15:12+00:00"
},
{
"name": "zendframework/zend-crypt",
@@ -2281,29 +2278,29 @@
"crypt",
"zf2"
],
- "time": "2016-02-03 23:46:30"
+ "time": "2016-02-03T23:46:30+00:00"
},
{
"name": "zendframework/zend-db",
- "version": "2.8.2",
+ "version": "2.9.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-db.git",
- "reference": "5926a1a2e7e035546b690cb7d4c11a3c47db2c98"
+ "reference": "14c5f0b1fc0dfa1cdf9488ab7a57c13a6bef6ae3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-db/zipball/5926a1a2e7e035546b690cb7d4c11a3c47db2c98",
- "reference": "5926a1a2e7e035546b690cb7d4c11a3c47db2c98",
+ "url": "https://api.github.com/repos/zendframework/zend-db/zipball/14c5f0b1fc0dfa1cdf9488ab7a57c13a6bef6ae3",
+ "reference": "14c5f0b1fc0dfa1cdf9488ab7a57c13a6bef6ae3",
"shasum": ""
},
"require": {
- "php": "^5.5 || ^7.0",
+ "php": "^5.6 || ^7.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
"require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/phpunit": "~4.0",
+ "phpunit/phpunit": "^5.7.25 || ^6.4.4",
+ "zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
"zendframework/zend-hydrator": "^1.1 || ^2.1",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
@@ -2316,8 +2313,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev",
- "dev-develop": "2.9-dev"
+ "dev-master": "2.9-dev",
+ "dev-develop": "2.10-dev"
},
"zf": {
"component": "Zend\\Db",
@@ -2333,12 +2330,13 @@
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zend-db",
+ "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations",
"keywords": [
+ "ZendFramework",
"db",
- "zf2"
+ "zf"
],
- "time": "2016-08-09 19:28:55"
+ "time": "2017-12-07T15:52:37+00:00"
},
{
"name": "zendframework/zend-di",
@@ -2385,7 +2383,7 @@
"di",
"zf2"
],
- "time": "2016-04-25 20:58:11"
+ "time": "2016-04-25T20:58:11+00:00"
},
{
"name": "zendframework/zend-diactoros",
@@ -2437,7 +2435,7 @@
"psr",
"psr-7"
],
- "time": "2017-10-12 15:24:51"
+ "time": "2017-10-12T15:24:51+00:00"
},
{
"name": "zendframework/zend-escaper",
@@ -2481,7 +2479,7 @@
"escaper",
"zf2"
],
- "time": "2016-06-30 19:48:38"
+ "time": "2016-06-30T19:48:38+00:00"
},
{
"name": "zendframework/zend-eventmanager",
@@ -2528,7 +2526,7 @@
"eventmanager",
"zf2"
],
- "time": "2016-02-18 20:49:05"
+ "time": "2016-02-18T20:49:05+00:00"
},
{
"name": "zendframework/zend-filter",
@@ -2588,31 +2586,31 @@
"filter",
"zf2"
],
- "time": "2017-05-17 20:56:17"
+ "time": "2017-05-17T20:56:17+00:00"
},
{
"name": "zendframework/zend-form",
- "version": "2.10.2",
+ "version": "2.11.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-form.git",
- "reference": "252db729887844025772bb8045f8df605850ed9c"
+ "reference": "b68a9f07d93381613b68817091d0505ca94d3363"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-form/zipball/252db729887844025772bb8045f8df605850ed9c",
- "reference": "252db729887844025772bb8045f8df605850ed9c",
+ "url": "https://api.github.com/repos/zendframework/zend-form/zipball/b68a9f07d93381613b68817091d0505ca94d3363",
+ "reference": "b68a9f07d93381613b68817091d0505ca94d3363",
"shasum": ""
},
"require": {
- "php": "^7.0 || ^5.6",
+ "php": "^5.6 || ^7.0",
"zendframework/zend-hydrator": "^1.1 || ^2.1",
- "zendframework/zend-inputfilter": "^2.6",
+ "zendframework/zend-inputfilter": "^2.8",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
"require-dev": {
"doctrine/annotations": "~1.0",
- "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+ "phpunit/phpunit": "^5.7.23 || ^6.5.3",
"zendframework/zend-cache": "^2.6.1",
"zendframework/zend-captcha": "^2.7.1",
"zendframework/zend-code": "^2.6 || ^3.0",
@@ -2622,7 +2620,7 @@
"zendframework/zend-filter": "^2.6",
"zendframework/zend-i18n": "^2.6",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
- "zendframework/zend-session": "^2.6.2",
+ "zendframework/zend-session": "^2.8.1",
"zendframework/zend-text": "^2.6",
"zendframework/zend-validator": "^2.6",
"zendframework/zend-view": "^2.6.2",
@@ -2640,8 +2638,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.10-dev",
- "dev-develop": "2.11-dev"
+ "dev-master": "2.11.x-dev",
+ "dev-develop": "2.12.x-dev"
},
"zf": {
"component": "Zend\\Form",
@@ -2660,12 +2658,13 @@
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zend-form",
+ "description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
"keywords": [
+ "ZendFramework",
"form",
- "zf2"
+ "zf"
],
- "time": "2017-05-18 14:59:53"
+ "time": "2017-12-06T21:09:08+00:00"
},
{
"name": "zendframework/zend-http",
@@ -2718,7 +2717,7 @@
"zend",
"zf"
],
- "time": "2017-10-13 12:06:24"
+ "time": "2017-10-13T12:06:24+00:00"
},
{
"name": "zendframework/zend-hydrator",
@@ -2776,7 +2775,7 @@
"hydrator",
"zf2"
],
- "time": "2016-02-18 22:38:26"
+ "time": "2016-02-18T22:38:26+00:00"
},
{
"name": "zendframework/zend-i18n",
@@ -2843,30 +2842,30 @@
"i18n",
"zf2"
],
- "time": "2017-05-17 17:00:12"
+ "time": "2017-05-17T17:00:12+00:00"
},
{
"name": "zendframework/zend-inputfilter",
- "version": "2.7.5",
+ "version": "2.8.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-inputfilter.git",
- "reference": "02bbc6b5fc54991e43e7471e54e2173077708d7b"
+ "reference": "e7edd625f2fcdd72a719a7023114c5f4b4f38488"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/02bbc6b5fc54991e43e7471e54e2173077708d7b",
- "reference": "02bbc6b5fc54991e43e7471e54e2173077708d7b",
+ "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/e7edd625f2fcdd72a719a7023114c5f4b4f38488",
+ "reference": "e7edd625f2fcdd72a719a7023114c5f4b4f38488",
"shasum": ""
},
"require": {
- "php": "^7.0 || ^5.6",
+ "php": "^5.6 || ^7.0",
"zendframework/zend-filter": "^2.6",
"zendframework/zend-stdlib": "^2.7 || ^3.0",
- "zendframework/zend-validator": "^2.6"
+ "zendframework/zend-validator": "^2.10.1"
},
"require-dev": {
- "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+ "phpunit/phpunit": "^5.7.23 || ^6.4.3",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
},
@@ -2876,8 +2875,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.7-dev",
- "dev-develop": "2.8-dev"
+ "dev-master": "2.8-dev",
+ "dev-develop": "2.9-dev"
},
"zf": {
"component": "Zend\\InputFilter",
@@ -2893,12 +2892,13 @@
"license": [
"BSD-3-Clause"
],
- "homepage": "https://github.com/zendframework/zend-inputfilter",
+ "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files",
"keywords": [
+ "ZendFramework",
"inputfilter",
- "zf2"
+ "zf"
],
- "time": "2017-11-07 17:08:00"
+ "time": "2017-12-04T21:24:25+00:00"
},
{
"name": "zendframework/zend-json",
@@ -2953,7 +2953,7 @@
"json",
"zf2"
],
- "time": "2016-02-04 21:20:26"
+ "time": "2016-02-04T21:20:26+00:00"
},
{
"name": "zendframework/zend-loader",
@@ -2997,7 +2997,7 @@
"loader",
"zf2"
],
- "time": "2015-06-03 14:05:47"
+ "time": "2015-06-03T14:05:47+00:00"
},
{
"name": "zendframework/zend-log",
@@ -3068,7 +3068,7 @@
"logging",
"zf2"
],
- "time": "2017-05-17 16:03:26"
+ "time": "2017-05-17T16:03:26+00:00"
},
{
"name": "zendframework/zend-math",
@@ -3118,27 +3118,27 @@
"math",
"zf2"
],
- "time": "2016-04-07 16:29:53"
+ "time": "2016-04-07T16:29:53+00:00"
},
{
"name": "zendframework/zend-modulemanager",
- "version": "2.8.1",
+ "version": "2.8.2",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-modulemanager.git",
- "reference": "710c13353b1ff0975777dbeb39bbf1c85e3353a3"
+ "reference": "394df6e12248ac430a312d4693f793ee7120baa6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/710c13353b1ff0975777dbeb39bbf1c85e3353a3",
- "reference": "710c13353b1ff0975777dbeb39bbf1c85e3353a3",
+ "url": "https://api.github.com/repos/zendframework/zend-modulemanager/zipball/394df6e12248ac430a312d4693f793ee7120baa6",
+ "reference": "394df6e12248ac430a312d4693f793ee7120baa6",
"shasum": ""
},
"require": {
"php": "^5.6 || ^7.0",
"zendframework/zend-config": "^3.1 || ^2.6",
"zendframework/zend-eventmanager": "^3.2 || ^2.6.3",
- "zendframework/zend-stdlib": "^3.0 || ^2.7"
+ "zendframework/zend-stdlib": "^3.1 || ^2.7"
},
"require-dev": {
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
@@ -3146,7 +3146,7 @@
"zendframework/zend-console": "^2.6",
"zendframework/zend-di": "^2.6",
"zendframework/zend-loader": "^2.5",
- "zendframework/zend-mvc": "^2.7",
+ "zendframework/zend-mvc": "^3.0 || ^2.7",
"zendframework/zend-servicemanager": "^3.0.3 || ^2.7.5"
},
"suggest": {
@@ -3158,8 +3158,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.8-dev",
- "dev-develop": "2.9-dev"
+ "dev-master": "2.7-dev",
+ "dev-develop": "2.8-dev"
}
},
"autoload": {
@@ -3171,12 +3171,14 @@
"license": [
"BSD-3-Clause"
],
+ "description": "Modular application system for zend-mvc applications",
"homepage": "https://github.com/zendframework/zend-modulemanager",
"keywords": [
+ "ZendFramework",
"modulemanager",
- "zf2"
+ "zf"
],
- "time": "2017-11-01 18:30:41"
+ "time": "2017-12-02T06:11:18+00:00"
},
{
"name": "zendframework/zend-mvc",
@@ -3268,7 +3270,7 @@
"mvc",
"zf2"
],
- "time": "2017-04-27 15:44:01"
+ "time": "2017-04-27T15:44:01+00:00"
},
{
"name": "zendframework/zend-psr7bridge",
@@ -3317,20 +3319,20 @@
"psr",
"psr-7"
],
- "time": "2016-05-10 21:44:39"
+ "time": "2016-05-10T21:44:39+00:00"
},
{
"name": "zendframework/zend-serializer",
- "version": "2.8.0",
+ "version": "2.8.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-serializer.git",
- "reference": "ff74ea020f5f90866eb28365327e9bc765a61a6e"
+ "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/ff74ea020f5f90866eb28365327e9bc765a61a6e",
- "reference": "ff74ea020f5f90866eb28365327e9bc765a61a6e",
+ "url": "https://api.github.com/repos/zendframework/zend-serializer/zipball/7ac42b9a47e9cb23895173a3096bc3b3fb7ac580",
+ "reference": "7ac42b9a47e9cb23895173a3096bc3b3fb7ac580",
"shasum": ""
},
"require": {
@@ -3339,8 +3341,9 @@
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
"require-dev": {
- "phpunit/phpunit": "^4.5",
- "squizlabs/php_codesniffer": "^2.3.1",
+ "doctrine/instantiator": "1.0.*",
+ "phpunit/phpunit": "^5.5",
+ "zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-math": "^2.6",
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
},
@@ -3374,7 +3377,7 @@
"serializer",
"zf2"
],
- "time": "2016-06-21 17:01:55"
+ "time": "2017-11-20T22:21:04+00:00"
},
{
"name": "zendframework/zend-server",
@@ -3420,20 +3423,20 @@
"server",
"zf2"
],
- "time": "2016-06-20 22:27:55"
+ "time": "2016-06-20T22:27:55+00:00"
},
{
"name": "zendframework/zend-servicemanager",
- "version": "2.7.8",
+ "version": "2.7.10",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-servicemanager.git",
- "reference": "2ae3b6e4978ec2e9ff52352e661946714ed989f9"
+ "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/2ae3b6e4978ec2e9ff52352e661946714ed989f9",
- "reference": "2ae3b6e4978ec2e9ff52352e661946714ed989f9",
+ "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/ba7069c94c9af93122be9fa31cddd37f7707d5b4",
+ "reference": "ba7069c94c9af93122be9fa31cddd37f7707d5b4",
"shasum": ""
},
"require": {
@@ -3472,31 +3475,35 @@
"servicemanager",
"zf2"
],
- "time": "2016-12-19 19:14:29"
+ "time": "2017-12-05T16:27:36+00:00"
},
{
"name": "zendframework/zend-session",
- "version": "2.8.0",
+ "version": "2.8.3",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-session.git",
- "reference": "b1486c382decc241de8b1c7778eaf2f0a884f67d"
+ "reference": "c14be63df39b0caee784e53cd57c43eb48efefea"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-session/zipball/b1486c382decc241de8b1c7778eaf2f0a884f67d",
- "reference": "b1486c382decc241de8b1c7778eaf2f0a884f67d",
+ "url": "https://api.github.com/repos/zendframework/zend-session/zipball/c14be63df39b0caee784e53cd57c43eb48efefea",
+ "reference": "c14be63df39b0caee784e53cd57c43eb48efefea",
"shasum": ""
},
"require": {
- "php": "^7.0 || ^5.6",
+ "php": "^5.6 || ^7.0",
"zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
+ "conflict": {
+ "phpunit/phpunit": ">=6.5.0"
+ },
"require-dev": {
"container-interop/container-interop": "^1.1",
"mongodb/mongodb": "^1.0.1",
- "phpunit/phpunit": "^6.0.8 || ^5.7.15",
+ "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
+ "phpunit/phpunit": "^5.7.5 || ^6.0.13",
"zendframework/zend-cache": "^2.6.1",
"zendframework/zend-coding-standard": "~1.0.0",
"zendframework/zend-db": "^2.7",
@@ -3533,12 +3540,12 @@
"BSD-3-Clause"
],
"description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client",
- "homepage": "https://github.com/zendframework/zend-session",
"keywords": [
+ "ZendFramework",
"session",
- "zf2"
+ "zf"
],
- "time": "2017-06-19 21:31:39"
+ "time": "2017-12-01T17:35:04+00:00"
},
{
"name": "zendframework/zend-soap",
@@ -3590,7 +3597,7 @@
"soap",
"zf2"
],
- "time": "2016-04-21 16:06:27"
+ "time": "2016-04-21T16:06:27+00:00"
},
{
"name": "zendframework/zend-stdlib",
@@ -3649,7 +3656,7 @@
"stdlib",
"zf2"
],
- "time": "2016-04-12 21:17:31"
+ "time": "2016-04-12T21:17:31+00:00"
},
{
"name": "zendframework/zend-text",
@@ -3696,7 +3703,7 @@
"text",
"zf2"
],
- "time": "2016-02-08 19:03:52"
+ "time": "2016-02-08T19:03:52+00:00"
},
{
"name": "zendframework/zend-uri",
@@ -3743,7 +3750,7 @@
"uri",
"zf2"
],
- "time": "2016-02-17 22:38:51"
+ "time": "2016-02-17T22:38:51+00:00"
},
{
"name": "zendframework/zend-validator",
@@ -3814,7 +3821,7 @@
"validator",
"zf2"
],
- "time": "2017-08-22 14:19:23"
+ "time": "2017-08-22T14:19:23+00:00"
},
{
"name": "zendframework/zend-view",
@@ -3901,7 +3908,7 @@
"view",
"zf2"
],
- "time": "2017-03-21 15:05:56"
+ "time": "2017-03-21T15:05:56+00:00"
}
],
"packages-dev": [
@@ -3971,7 +3978,7 @@
"docblock",
"parser"
],
- "time": "2017-02-24 16:22:25"
+ "time": "2017-02-24T16:22:25+00:00"
},
{
"name": "doctrine/instantiator",
@@ -4025,7 +4032,7 @@
"constructor",
"instantiate"
],
- "time": "2015-06-14 21:17:01"
+ "time": "2015-06-14T21:17:01+00:00"
},
{
"name": "doctrine/lexer",
@@ -4079,20 +4086,20 @@
"lexer",
"parser"
],
- "time": "2014-09-09 13:34:57"
+ "time": "2014-09-09T13:34:57+00:00"
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v2.2.10",
+ "version": "v2.2.13",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
- "reference": "b0e0f1d3d0b36a728768f9c44b074b22eb4b4c64"
+ "reference": "669e2327a17b94e47454c3d2e00c6f96203646f0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/b0e0f1d3d0b36a728768f9c44b074b22eb4b4c64",
- "reference": "b0e0f1d3d0b36a728768f9c44b074b22eb4b4c64",
+ "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/669e2327a17b94e47454c3d2e00c6f96203646f0",
+ "reference": "669e2327a17b94e47454c3d2e00c6f96203646f0",
"shasum": ""
},
"require": {
@@ -4121,6 +4128,7 @@
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.0.1",
"justinrainbow/json-schema": "^5.0",
+ "mikey179/vfsstream": "^1.6",
"php-coveralls/php-coveralls": "^1.0.2",
"phpunit/phpunit": "^4.8.35 || ^5.4.3",
"symfony/phpunit-bridge": "^3.2.2 || ^4.0"
@@ -4164,7 +4172,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
- "time": "2017-11-09 13:20:53"
+ "time": "2017-12-08T15:17:14+00:00"
},
{
"name": "gecko-packages/gecko-php-unit",
@@ -4208,7 +4216,7 @@
"filesystem",
"phpunit"
],
- "time": "2017-08-23 07:39:54"
+ "time": "2017-08-23T07:39:54+00:00"
},
{
"name": "ircmaxell/password-compat",
@@ -4250,7 +4258,7 @@
"hashing",
"password"
],
- "time": "2014-11-20 16:49:30"
+ "time": "2014-11-20T16:49:30+00:00"
},
{
"name": "lusitanian/oauth",
@@ -4317,7 +4325,7 @@
"oauth",
"security"
],
- "time": "2016-07-12 22:15:40"
+ "time": "2016-07-12T22:15:40+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -4362,7 +4370,7 @@
"object",
"object graph"
],
- "time": "2017-10-19 19:58:43"
+ "time": "2017-10-19T19:58:43+00:00"
},
{
"name": "pdepend/pdepend",
@@ -4402,7 +4410,7 @@
"BSD-3-Clause"
],
"description": "Official version of pdepend to be handled with Composer",
- "time": "2017-01-19 14:23:36"
+ "time": "2017-01-19T14:23:36+00:00"
},
{
"name": "phar-io/manifest",
@@ -4457,7 +4465,7 @@
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
- "time": "2017-03-05 18:14:27"
+ "time": "2017-03-05T18:14:27+00:00"
},
{
"name": "phar-io/version",
@@ -4504,7 +4512,7 @@
}
],
"description": "Library for handling version information and constraints",
- "time": "2017-03-05 17:38:23"
+ "time": "2017-03-05T17:38:23+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -4558,33 +4566,39 @@
"reflection",
"static analysis"
],
- "time": "2017-09-11 18:02:19"
+ "time": "2017-09-11T18:02:19+00:00"
},
{
"name": "phpdocumentor/reflection-docblock",
- "version": "4.1.1",
+ "version": "4.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
- "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
+ "reference": "66465776cfc249844bde6d117abff1d22e06c2da"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
- "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
+ "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da",
+ "reference": "66465776cfc249844bde6d117abff1d22e06c2da",
"shasum": ""
},
"require": {
"php": "^7.0",
- "phpdocumentor/reflection-common": "^1.0@dev",
+ "phpdocumentor/reflection-common": "^1.0.0",
"phpdocumentor/type-resolver": "^0.4.0",
"webmozart/assert": "^1.0"
},
"require-dev": {
- "mockery/mockery": "^0.9.4",
- "phpunit/phpunit": "^4.4"
+ "doctrine/instantiator": "~1.0.5",
+ "mockery/mockery": "^1.0",
+ "phpunit/phpunit": "^6.4"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "4.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
"phpDocumentor\\Reflection\\": [
@@ -4603,7 +4617,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2017-08-30 18:51:59"
+ "time": "2017-11-27T17:38:31+00:00"
},
{
"name": "phpdocumentor/type-resolver",
@@ -4650,7 +4664,7 @@
"email": "me@mikevanriel.com"
}
],
- "time": "2017-07-14 14:27:02"
+ "time": "2017-07-14T14:27:02+00:00"
},
{
"name": "phpmd/phpmd",
@@ -4716,20 +4730,20 @@
"phpmd",
"pmd"
],
- "time": "2017-01-20 14:41:10"
+ "time": "2017-01-20T14:41:10+00:00"
},
{
"name": "phpspec/prophecy",
- "version": "v1.7.2",
+ "version": "1.7.3",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
+ "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
- "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
+ "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
"shasum": ""
},
"require": {
@@ -4741,7 +4755,7 @@
},
"require-dev": {
"phpspec/phpspec": "^2.5|^3.2",
- "phpunit/phpunit": "^4.8 || ^5.6.5"
+ "phpunit/phpunit": "^4.8.35 || ^5.7"
},
"type": "library",
"extra": {
@@ -4779,20 +4793,20 @@
"spy",
"stub"
],
- "time": "2017-09-04 11:05:03"
+ "time": "2017-11-24T13:59:53+00:00"
},
{
"name": "phpunit/php-code-coverage",
- "version": "5.2.3",
+ "version": "5.3.0",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d"
+ "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
- "reference": "8e1d2397d8adf59a3f12b2878a3aaa66d1ab189d",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1",
+ "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1",
"shasum": ""
},
"require": {
@@ -4801,14 +4815,13 @@
"php": "^7.0",
"phpunit/php-file-iterator": "^1.4.2",
"phpunit/php-text-template": "^1.2.1",
- "phpunit/php-token-stream": "^2.0",
+ "phpunit/php-token-stream": "^2.0.1",
"sebastian/code-unit-reverse-lookup": "^1.0.1",
"sebastian/environment": "^3.0",
"sebastian/version": "^2.0.1",
"theseer/tokenizer": "^1.1"
},
"require-dev": {
- "ext-xdebug": "^2.5",
"phpunit/phpunit": "^6.0"
},
"suggest": {
@@ -4817,7 +4830,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "5.2.x-dev"
+ "dev-master": "5.3.x-dev"
}
},
"autoload": {
@@ -4832,7 +4845,7 @@
"authors": [
{
"name": "Sebastian Bergmann",
- "email": "sb@sebastian-bergmann.de",
+ "email": "sebastian@phpunit.de",
"role": "lead"
}
],
@@ -4843,20 +4856,20 @@
"testing",
"xunit"
],
- "time": "2017-11-03 13:47:33"
+ "time": "2017-12-06T09:29:45+00:00"
},
{
"name": "phpunit/php-file-iterator",
- "version": "1.4.2",
+ "version": "1.4.5",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-file-iterator.git",
- "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5"
+ "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
- "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
+ "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
"shasum": ""
},
"require": {
@@ -4890,7 +4903,7 @@
"filesystem",
"iterator"
],
- "time": "2016-10-03 07:40:28"
+ "time": "2017-11-27T13:52:08+00:00"
},
{
"name": "phpunit/php-text-template",
@@ -4931,7 +4944,7 @@
"keywords": [
"template"
],
- "time": "2015-06-21 13:50:34"
+ "time": "2015-06-21T13:50:34+00:00"
},
{
"name": "phpunit/php-timer",
@@ -4980,20 +4993,20 @@
"keywords": [
"timer"
],
- "time": "2017-02-26 11:10:40"
+ "time": "2017-02-26T11:10:40+00:00"
},
{
"name": "phpunit/php-token-stream",
- "version": "2.0.1",
+ "version": "2.0.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-token-stream.git",
- "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0"
+ "reference": "791198a2c6254db10131eecfe8c06670700904db"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0",
- "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db",
+ "reference": "791198a2c6254db10131eecfe8c06670700904db",
"shasum": ""
},
"require": {
@@ -5029,7 +5042,7 @@
"keywords": [
"tokenizer"
],
- "time": "2017-08-20 05:47:52"
+ "time": "2017-11-27T05:48:46+00:00"
},
{
"name": "phpunit/phpunit",
@@ -5113,7 +5126,7 @@
"testing",
"xunit"
],
- "time": "2017-08-03 13:59:28"
+ "time": "2017-08-03T13:59:28+00:00"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -5172,7 +5185,7 @@
"mock",
"xunit"
],
- "time": "2017-08-03 14:08:16"
+ "time": "2017-08-03T14:08:16+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -5217,7 +5230,7 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2017-03-04 06:30:41"
+ "time": "2017-03-04T06:30:41+00:00"
},
{
"name": "sebastian/comparator",
@@ -5281,7 +5294,7 @@
"compare",
"equality"
],
- "time": "2017-03-03 06:26:08"
+ "time": "2017-03-03T06:26:08+00:00"
},
{
"name": "sebastian/diff",
@@ -5333,7 +5346,7 @@
"keywords": [
"diff"
],
- "time": "2017-05-22 07:24:03"
+ "time": "2017-05-22T07:24:03+00:00"
},
{
"name": "sebastian/environment",
@@ -5383,7 +5396,7 @@
"environment",
"hhvm"
],
- "time": "2017-07-01 08:51:00"
+ "time": "2017-07-01T08:51:00+00:00"
},
{
"name": "sebastian/exporter",
@@ -5450,24 +5463,24 @@
"export",
"exporter"
],
- "time": "2017-04-03 13:19:02"
+ "time": "2017-04-03T13:19:02+00:00"
},
{
"name": "sebastian/finder-facade",
- "version": "1.2.1",
+ "version": "1.2.2",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/finder-facade.git",
- "reference": "2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9"
+ "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9",
- "reference": "2a6f7f57efc0aa2d23297d9fd9e2a03111a8c0b9",
+ "url": "https://api.github.com/repos/sebastianbergmann/finder-facade/zipball/4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
+ "reference": "4a3174709c2dc565fe5fb26fcf827f6a1fc7b09f",
"shasum": ""
},
"require": {
- "symfony/finder": "~2.3|~3.0",
+ "symfony/finder": "~2.3|~3.0|~4.0",
"theseer/fdomdocument": "~1.3"
},
"type": "library",
@@ -5489,7 +5502,7 @@
],
"description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
"homepage": "https://github.com/sebastianbergmann/finder-facade",
- "time": "2016-02-17 07:02:23"
+ "time": "2017-11-18T17:31:49+00:00"
},
{
"name": "sebastian/global-state",
@@ -5540,7 +5553,7 @@
"keywords": [
"global state"
],
- "time": "2017-04-27 15:39:26"
+ "time": "2017-04-27T15:39:26+00:00"
},
{
"name": "sebastian/object-enumerator",
@@ -5587,7 +5600,7 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2017-08-03 12:35:26"
+ "time": "2017-08-03T12:35:26+00:00"
},
{
"name": "sebastian/object-reflector",
@@ -5632,7 +5645,7 @@
],
"description": "Allows reflection of object attributes, including inherited and non-public ones",
"homepage": "https://github.com/sebastianbergmann/object-reflector/",
- "time": "2017-03-29 09:07:27"
+ "time": "2017-03-29T09:07:27+00:00"
},
{
"name": "sebastian/phpcpd",
@@ -5683,7 +5696,7 @@
],
"description": "Copy/Paste Detector (CPD) for PHP code.",
"homepage": "https://github.com/sebastianbergmann/phpcpd",
- "time": "2016-04-17 19:32:49"
+ "time": "2016-04-17T19:32:49+00:00"
},
{
"name": "sebastian/recursion-context",
@@ -5736,7 +5749,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2017-03-03 06:23:57"
+ "time": "2017-03-03T06:23:57+00:00"
},
{
"name": "sebastian/resource-operations",
@@ -5778,7 +5791,7 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2015-07-28 20:34:47"
+ "time": "2015-07-28T20:34:47+00:00"
},
{
"name": "sebastian/version",
@@ -5821,7 +5834,7 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-10-03 07:35:21"
+ "time": "2016-10-03T07:35:21+00:00"
},
{
"name": "squizlabs/php_codesniffer",
@@ -5872,34 +5885,34 @@
"phpcs",
"standards"
],
- "time": "2017-10-16 22:40:25"
+ "time": "2017-10-16T22:40:25+00:00"
},
{
"name": "symfony/config",
- "version": "v3.3.11",
+ "version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "8d2649077dc54dfbaf521d31f217383d82303c5f"
+ "reference": "1de51a6c76359897ab32c309934b93d036bccb60"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/config/zipball/8d2649077dc54dfbaf521d31f217383d82303c5f",
- "reference": "8d2649077dc54dfbaf521d31f217383d82303c5f",
+ "url": "https://api.github.com/repos/symfony/config/zipball/1de51a6c76359897ab32c309934b93d036bccb60",
+ "reference": "1de51a6c76359897ab32c309934b93d036bccb60",
"shasum": ""
},
"require": {
"php": "^5.5.9|>=7.0.8",
- "symfony/filesystem": "~2.8|~3.0"
+ "symfony/filesystem": "~2.8|~3.0|~4.0"
},
"conflict": {
"symfony/dependency-injection": "<3.3",
"symfony/finder": "<3.3"
},
"require-dev": {
- "symfony/dependency-injection": "~3.3",
- "symfony/finder": "~3.3",
- "symfony/yaml": "~3.0"
+ "symfony/dependency-injection": "~3.3|~4.0",
+ "symfony/finder": "~3.3|~4.0",
+ "symfony/yaml": "~3.0|~4.0"
},
"suggest": {
"symfony/yaml": "To use the yaml reference dumper"
@@ -5907,7 +5920,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -5934,20 +5947,20 @@
],
"description": "Symfony Config Component",
"homepage": "https://symfony.com",
- "time": "2017-11-07 14:16:22"
+ "time": "2017-11-19T20:09:36+00:00"
},
{
"name": "symfony/dependency-injection",
- "version": "v3.3.11",
+ "version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "50cdc753c61a4268608226647b0ce72e33a4a2b1"
+ "reference": "27810742895ad89e706ba5028e4f8fe425792b50"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/50cdc753c61a4268608226647b0ce72e33a4a2b1",
- "reference": "50cdc753c61a4268608226647b0ce72e33a4a2b1",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/27810742895ad89e706ba5028e4f8fe425792b50",
+ "reference": "27810742895ad89e706ba5028e4f8fe425792b50",
"shasum": ""
},
"require": {
@@ -5957,15 +5970,16 @@
"conflict": {
"symfony/config": "<3.3.1",
"symfony/finder": "<3.3",
- "symfony/yaml": "<3.3"
+ "symfony/proxy-manager-bridge": "<3.4",
+ "symfony/yaml": "<3.4"
},
"provide": {
"psr/container-implementation": "1.0"
},
"require-dev": {
- "symfony/config": "~3.3",
- "symfony/expression-language": "~2.8|~3.0",
- "symfony/yaml": "~3.3"
+ "symfony/config": "~3.3|~4.0",
+ "symfony/expression-language": "~2.8|~3.0|~4.0",
+ "symfony/yaml": "~3.4|~4.0"
},
"suggest": {
"symfony/config": "",
@@ -5977,7 +5991,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -6004,20 +6018,20 @@
],
"description": "Symfony DependencyInjection Component",
"homepage": "https://symfony.com",
- "time": "2017-11-07 14:12:55"
+ "time": "2017-12-04T19:20:32+00:00"
},
{
"name": "symfony/options-resolver",
- "version": "v3.3.11",
+ "version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/options-resolver.git",
- "reference": "623d9c210a137205f7e6e98166105625402cbb2f"
+ "reference": "08748edfe6982f4d878cc42b8325b19a276fb1cf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/options-resolver/zipball/623d9c210a137205f7e6e98166105625402cbb2f",
- "reference": "623d9c210a137205f7e6e98166105625402cbb2f",
+ "url": "https://api.github.com/repos/symfony/options-resolver/zipball/08748edfe6982f4d878cc42b8325b19a276fb1cf",
+ "reference": "08748edfe6982f4d878cc42b8325b19a276fb1cf",
"shasum": ""
},
"require": {
@@ -6026,7 +6040,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -6058,7 +6072,7 @@
"configuration",
"options"
],
- "time": "2017-11-05 15:47:03"
+ "time": "2017-11-05T16:10:10+00:00"
},
{
"name": "symfony/polyfill-php54",
@@ -6116,7 +6130,7 @@
"portable",
"shim"
],
- "time": "2017-10-11 12:05:26"
+ "time": "2017-10-11T12:05:26+00:00"
},
{
"name": "symfony/polyfill-php55",
@@ -6172,7 +6186,7 @@
"portable",
"shim"
],
- "time": "2017-10-11 12:05:26"
+ "time": "2017-10-11T12:05:26+00:00"
},
{
"name": "symfony/polyfill-php70",
@@ -6231,7 +6245,7 @@
"portable",
"shim"
],
- "time": "2017-10-11 12:05:26"
+ "time": "2017-10-11T12:05:26+00:00"
},
{
"name": "symfony/polyfill-php72",
@@ -6286,20 +6300,20 @@
"portable",
"shim"
],
- "time": "2017-10-11 12:05:26"
+ "time": "2017-10-11T12:05:26+00:00"
},
{
"name": "symfony/stopwatch",
- "version": "v3.3.11",
+ "version": "v3.4.1",
"source": {
"type": "git",
"url": "https://github.com/symfony/stopwatch.git",
- "reference": "1e93c3139ef6c799831fe03efd0fb1c7aecb3365"
+ "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/stopwatch/zipball/1e93c3139ef6c799831fe03efd0fb1c7aecb3365",
- "reference": "1e93c3139ef6c799831fe03efd0fb1c7aecb3365",
+ "url": "https://api.github.com/repos/symfony/stopwatch/zipball/52510fe1aefdc1c5d2076ac6030421d387e689d1",
+ "reference": "52510fe1aefdc1c5d2076ac6030421d387e689d1",
"shasum": ""
},
"require": {
@@ -6308,7 +6322,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3-dev"
+ "dev-master": "3.4-dev"
}
},
"autoload": {
@@ -6335,7 +6349,7 @@
],
"description": "Symfony Stopwatch Component",
"homepage": "https://symfony.com",
- "time": "2017-11-10 19:02:53"
+ "time": "2017-11-07T14:28:09+00:00"
},
{
"name": "theseer/fdomdocument",
@@ -6375,7 +6389,7 @@
],
"description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
"homepage": "https://github.com/theseer/fDOMDocument",
- "time": "2017-06-30 11:53:12"
+ "time": "2017-06-30T11:53:12+00:00"
},
{
"name": "theseer/tokenizer",
@@ -6415,7 +6429,7 @@
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
- "time": "2017-04-07 12:08:54"
+ "time": "2017-04-07T12:08:54+00:00"
},
{
"name": "webmozart/assert",
@@ -6465,7 +6479,7 @@
"check",
"validate"
],
- "time": "2016-11-23 20:04:58"
+ "time": "2016-11-23T20:04:58+00:00"
}
],
"aliases": [],
diff --git a/dev/tests/functional/etc/events.xml b/dev/tests/functional/etc/events.xml
index 5f6a771237a8155f9ccb81f5c1be8159eac2fb5f..83e7b5ad4e6fa60f0f935f84d30db6bad07459eb 100644
--- a/dev/tests/functional/etc/events.xml
+++ b/dev/tests/functional/etc/events.xml
@@ -48,4 +48,37 @@
<tag name="webapi_failed" />
</observer>
</preset>
+ <preset name="debug" extends="base">
+ <observer class="Magento\Mtf\System\Observer\Screenshot">
+ <tag name="exception"/>
+ <tag name="failure"/>
+ <tag name="click_after"/>
+ <tag name="accept_alert_after"/>
+ <tag name="dismiss_alert_after"/>
+ <tag name="open_after"/>
+ <tag name="forward"/>
+ <tag name="back"/>
+ </observer>
+ <observer class="Magento\Mtf\System\Observer\SourceCode">
+ <tag name="exception"/>
+ <tag name="failure"/>
+ <tag name="click_after"/>
+ <tag name="accept_alert_after"/>
+ <tag name="dismiss_alert_after"/>
+ <tag name="open_after"/>
+ <tag name="forward"/>
+ <tag name="back"/>
+ </observer>
+ <observer class="Magento\Mtf\System\Observer\Log">
+ <tag name="exception"/>
+ <tag name="failure"/>
+ <tag name="click_before"/>
+ <tag name="click_after"/>
+ <tag name="accept_alert_after"/>
+ <tag name="dismiss_alert_after"/>
+ <tag name="open_after"/>
+ <tag name="forward"/>
+ <tag name="back"/>
+ </observer>
+ </preset>
</config>
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
index 453a7b5940e1dbd7b4213869f85a75399de0a352..d48c5f474f26a46b1b5c0ce8977ef7a6a30303e2 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php
@@ -192,6 +192,14 @@ class Readiness extends Block
return $this->_rootElement->find($this->dependencyCheck, Locator::SELECTOR_CSS)->getText();
}
+ /**
+ * @return bool
+ */
+ public function isPhpVersionCheckVisible()
+ {
+ return $this->_rootElement->find($this->phpVersionCheck)->isVisible();
+ }
+
/**
* Get PHP Version check result.
*
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
index ea6355d574549bc18635b42ed63b1f896b7ef2a5..586df2f90d9f743fa8f9e5995ecc8cca837be4aa 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php
@@ -10,6 +10,7 @@ use Magento\Mtf\Block\Form;
use Magento\Mtf\Client\Element\SimpleElement;
use Magento\Mtf\Client\Locator;
use Magento\Mtf\Fixture\FixtureInterface;
+use Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid;
/**
* Select version block.
@@ -37,6 +38,13 @@ class SelectVersion extends Form
*/
private $showAllVersions = '#showUnstable';
+ /**
+ * CSS selector for Other Components Grid Block.
+ *
+ * @var string
+ */
+ private $otherComponentsGrid = '.admin__data-grid-wrap[ng-show="componentsProcessed"]';
+
/**
* Click on 'Next' button.
*
@@ -76,13 +84,28 @@ class SelectVersion extends Form
}
/**
- * Choose 'yes' for upgrade option called 'Other components'
+ * Choose 'yes' for upgrade option called 'Other components'.
*
+ * @param array $packages
* @return void
*/
- public function chooseUpgradeOtherComponents()
+ public function chooseUpgradeOtherComponents(array $packages)
+ {
+ $this->_rootElement->find("[for=yesUpdateComponents]")->click();
+ $this->waitForElementNotVisible("[ng-show=\"!componentsProcessed\"");
+ $this->getOtherComponentsGrid()->setVersions($packages);
+ }
+
+ /**
+ * Get grid block for other components.
+ *
+ * @return OtherComponentsGrid
+ */
+ private function getOtherComponentsGrid()
{
- $this->_rootElement->find("[for=yesUpdateComponents]", Locator::SELECTOR_CSS)->click();
- $this->waitForElementVisible("[ng-show='componentsProcessed']");
+ return $this->blockFactory->create(
+ OtherComponentsGrid::class,
+ ['element' => $this->_rootElement->find($this->otherComponentsGrid)]
+ );
}
}
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php
new file mode 100644
index 0000000000000000000000000000000000000000..5ed619696f17d76587b50c708191ba7bdf138ff6
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Test\Block\SelectVersion;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+use Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid\Item;
+
+class OtherComponentsGrid extends Block
+{
+ /**
+ * @var string
+ */
+ private $itemComponent = '//tr[contains(@ng-repeat,"component") and //td[contains(.,"%s")]]';
+
+ /**
+ * @param $packages
+ */
+ public function setVersions(array $packages)
+ {
+ foreach ($packages as $package) {
+ $this->getComponentRow($package['name'])->setVersion($package['version']);
+ }
+ }
+
+ /**
+ * @param string $componentName
+ * @return Item
+ */
+ private function getComponentRow($componentName)
+ {
+ $selector = sprintf($this->itemComponent, $componentName);
+ return $this->blockFactory->create(
+ Item::class,
+ ['element' => $this->_rootElement->find($selector, Locator::SELECTOR_XPATH)]
+ );
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d09e558438027f6b180e8b9bdc505a233c33764
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid;
+
+use Magento\Mtf\Block\Block;
+use Magento\Mtf\Client\Locator;
+
+/**
+ * Block for each component.
+ */
+class Item extends Block
+{
+ /**
+ * CSS selector for version element.
+ *
+ * @var string
+ */
+ private $version = '[ng-change*="setComponentVersion"]';
+
+ /**
+ * Set version for particular component.
+ *
+ * @param string $version
+ */
+ public function setVersion($version)
+ {
+ $this->_rootElement->find($this->version, Locator::SELECTOR_CSS, 'select')->setValue($version);
+ }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php
index 5425af367ca3bd2fe2b41e0c5ff0a913bde10064..329320e93c7972538207ac5add282902aed9a248 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertSuccessfulReadinessCheck.php
@@ -67,11 +67,14 @@ class AssertSuccessfulReadinessCheck extends AbstractConstraint
$setupWizard->getReadiness()->getDependencyCheck(),
'Dependency check is incorrect.'
);
- \PHPUnit_Framework_Assert::assertContains(
- self::PHP_VERSION_MESSAGE,
- $setupWizard->getReadiness()->getPhpVersionCheck(),
- 'PHP version is incorrect.'
- );
+ if ($setupWizard->getReadiness()->isPhpVersionCheckVisible()) {
+ \PHPUnit_Framework_Assert::assertContains(
+ self::PHP_VERSION_MESSAGE,
+ $setupWizard->getReadiness()->getPhpVersionCheck(),
+ 'PHP version is incorrect.'
+ );
+ }
+
\PHPUnit_Framework_Assert::assertContains(
self::PHP_SETTING_REGEXP,
$setupWizard->getReadiness()->getSettingsCheck(),
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
index 639bcb2c13e0f50da653951c1fd36195df04d4ba..6175f9f771ef66473ba6bb9c2615218c57955618 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php
@@ -18,17 +18,24 @@ class AssertVersionAndEditionCheck extends AbstractConstraint
* Assert that package and version is correct
*
* @param SetupWizard $setupWizard
- * @param string $package
- * @param string $version
+ * @param array $upgrade
* @return void
*/
- public function processAssert(SetupWizard $setupWizard, $package, $version)
+ public function processAssert(SetupWizard $setupWizard, array $upgrade)
{
- $message = "We're ready to upgrade $package to $version";
+ $message = "We're ready to upgrade {$upgrade['package']} to {$upgrade['version']}.";
+ if (isset($upgrade['otherComponentsList'])) {
+ foreach ($upgrade['otherComponentsList'] as $item) {
+ $message .= "\nWe're ready to upgrade {$item['name']} to {$item['version']}.";
+ }
+ }
+ $actualMessage = $setupWizard->getSystemUpgrade()->getUpgradeMessage();
\PHPUnit_Framework_Assert::assertContains(
$message,
- $setupWizard->getSystemUpgrade()->getUpgradeMessage(),
- 'Updater application check is incorrect.'
+ $actualMessage,
+ "Updater application check is incorrect: \n"
+ . "Expected: '$message' \n"
+ . "Actual: '$actualMessage'"
);
}
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
index 53c36e0a1e1b0a90cec432f129d54db772531bcb..d2e036f398cc5870b79aef3298b6c3a6aff77b2d 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.php
@@ -31,23 +31,18 @@ class UpgradeSystemTest extends Injectable
protected $adminDashboard;
/**
- * @var \Magento\Mtf\Util\Iterator\ApplicationState
- */
- private $applicationStateIterator;
-
- /**
+ * Injection data.
+ *
* @param Dashboard $adminDashboard
* @param SetupWizard $setupWizard
- * @param \Magento\Mtf\Util\Iterator\ApplicationState $applicationStateIterator
+ * @return void
*/
public function __inject(
Dashboard $adminDashboard,
- SetupWizard $setupWizard,
- \Magento\Mtf\Util\Iterator\ApplicationState $applicationStateIterator
+ SetupWizard $setupWizard
) {
$this->adminDashboard = $adminDashboard;
$this->setupWizard = $setupWizard;
- $this->applicationStateIterator = $applicationStateIterator;
}
/**
@@ -114,7 +109,7 @@ class UpgradeSystemTest extends Injectable
$this->setupWizard->getSetupHome()->clickSystemUpgrade();
$this->setupWizard->getSelectVersion()->fill($upgradeFixture);
if ($upgrade['otherComponents'] === 'Yes') {
- $this->setupWizard->getSelectVersion()->chooseUpgradeOtherComponents();
+ $this->setupWizard->getSelectVersion()->chooseUpgradeOtherComponents($upgrade['otherComponentsList']);
}
$this->setupWizard->getSelectVersion()->clickNext();
@@ -128,7 +123,8 @@ class UpgradeSystemTest extends Injectable
$this->setupWizard->getCreateBackup()->clickNext();
// Check info and press 'Upgrade' button
- $assertVersionAndEdition->processAssert($this->setupWizard, $upgrade['package'], $version);
+ $upgrade['version'] = $version;
+ $assertVersionAndEdition->processAssert($this->setupWizard, $upgrade);
$this->setupWizard->getSystemUpgrade()->clickSystemUpgrade();
$assertSuccessMessage->processAssert($this->setupWizard, $upgrade['package']);
diff --git a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
index b092fe18122015013799ee164df14374982b8994..a63ad0f4ec3cba7ff11120dc4a943b6d57a265f2 100644
--- a/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
+++ b/dev/tests/functional/tests/app/Magento/Setup/Test/TestCase/UpgradeSystemTest.xml
@@ -18,6 +18,12 @@
<data name="upgrade/optionsMedia" xsi:type="string">No</data>
<data name="upgrade/optionsDb" xsi:type="string">No</data>
<data name="upgrade/otherComponents" xsi:type="string">{otherComponents}</data>
+ <data name="upgrade/otherComponentsList" xsi:type="array">
+ <item name="0" xsi:type="array">
+ <item name="name" xsi:type="string">{package_0_name}</item>
+ <item name="version" xsi:type="string">{package_0_version}</item>
+ </item>
+ </data>
</variation>
</testCase>
</config>
diff --git a/dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php b/dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php
index 4e31ea1f18a3a927624a99ff5fbbefdcbada3151..7b64eb36050f60060e58901eea1b5258d52fadf8 100644
--- a/dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cron/Model/ScheduleTest.php
@@ -54,6 +54,27 @@ class ScheduleTest extends \PHPUnit\Framework\TestCase
$this->assertFalse($schedule->tryLockJob());
}
+ /**
+ * If the job is already locked but lock time less than 1 day ago, attempting to lock it again should fail
+ */
+ public function testTryLockJobAlreadyLockedSucceeds()
+ {
+ $offsetInThePast = 2*24*60*60;
+
+ $oldSchedule = $this->scheduleFactory->create()
+ ->setCronExpr("* * * * *")
+ ->setJobCode("test_job")
+ ->setStatus(Schedule::STATUS_RUNNING)
+ ->setCreatedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp() - $offsetInThePast))
+ ->setScheduledAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 60))
+ ->setExecutedAt(strftime('%Y-%m-%d %H:%M', $this->dateTime->gmtTimestamp() - $offsetInThePast + 61));
+ $oldSchedule->save();
+
+ $schedule = $this->createSchedule("test_job", Schedule::STATUS_PENDING);
+
+ $this->assertTrue($schedule->tryLockJob());
+ }
+
/**
* If there's a job already locked, should not be able to lock another job
*/
diff --git a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
index b3e8605b5479245cce486e7fd6e5178b471c3a86..0b0071beb5133313da7b7ba15ff13d2004ea0c24 100644
--- a/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
+++ b/dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php
@@ -8,18 +8,22 @@ namespace Magento\Quote\Model;
use Magento\Catalog\Model\Product\Type;
use Magento\TestFramework\Helper\Bootstrap;
+/**
+ * Class for testing QuoteManagement model
+ */
class QuoteManagementTest extends \PHPUnit\Framework\TestCase
{
/**
* Create order with product that has child items
*
+ * @magentoAppIsolation enabled
* @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
*/
public function testSubmit()
{
/**
* Preconditions:
- * Load quote with Bundle product that has at least to child products
+ * Load quote with Bundle product that has at least two child products
*/
$objectManager = Bootstrap::getObjectManager();
/** @var \Magento\Quote\Model\Quote $quote */
@@ -28,8 +32,11 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
/** Execute SUT */
/** @var \Magento\Quote\Api\CartManagementInterface $model */
- $model = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
- $order = $model->submit($quote);
+ $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
+ /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
+ $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+ $orderId = $cartManagement->placeOrder($quote->getId());
+ $order = $orderRepository->get($orderId);
/** Check if SUT caused expected effects */
$orderItems = $order->getItems();
@@ -41,4 +48,45 @@ class QuoteManagementTest extends \PHPUnit\Framework\TestCase
}
}
}
+
+ /**
+ * Create order with product that has child items and one of them was deleted
+ *
+ * @magentoAppArea adminhtml
+ * @magentoAppIsolation enabled
+ * @magentoDataFixture Magento/Sales/_files/quote_with_bundle.php
+ */
+ public function testSubmitWithDeletedItem()
+ {
+ /**
+ * Preconditions:
+ * Load quote with Bundle product that have at least to child products
+ */
+ $objectManager = Bootstrap::getObjectManager();
+ /** @var \Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+ $productRepository = $objectManager->get(\Magento\Catalog\Api\ProductRepositoryInterface::class);
+ $product = $productRepository->get('simple-2');
+ $productRepository->delete($product);
+ /** @var \Magento\Quote\Model\Quote $quote */
+ $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
+ $quote->load('test01', 'reserved_order_id');
+
+ /** Execute SUT */
+ /** @var \Magento\Quote\Api\CartManagementInterface $model */
+ $cartManagement = $objectManager->create(\Magento\Quote\Api\CartManagementInterface::class);
+ /** @var \Magento\Sales\Api\OrderRepositoryInterface $orderRepository */
+ $orderRepository = $objectManager->create(\Magento\Sales\Api\OrderRepositoryInterface::class);
+ $orderId = $cartManagement->placeOrder($quote->getId());
+ $order = $orderRepository->get($orderId);
+
+ /** Check if SUT caused expected effects */
+ $orderItems = $order->getItems();
+ $this->assertCount(2, $orderItems);
+ foreach ($orderItems as $orderItem) {
+ if ($orderItem->getProductType() == Type::TYPE_SIMPLE) {
+ $this->assertNotEmpty($orderItem->getParentItem(), 'Parent is not set for child product');
+ $this->assertNotEmpty($orderItem->getParentItemId(), 'Parent is not set for child product');
+ }
+ }
+ }
}
diff --git a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php
index 5a63a813caa963d3eac2aec066e0470f01da070e..c45e0aa4d9dc5f9689c642f5dba52a84ba0511b0 100644
--- a/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php
+++ b/dev/tests/integration/testsuite/Magento/Sales/_files/quote_with_bundle_rollback.php
@@ -4,25 +4,29 @@
* See COPYING.txt for license details.
*/
+$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
/** @var \Magento\Framework\Registry $registry */
-$registry = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get(\Magento\Framework\Registry::class);
+$registry = $objectManager->get(\Magento\Framework\Registry::class);
$registry->unregister('isSecureArea');
$registry->register('isSecureArea', true);
+// Delete quote
/** @var $quote \Magento\Quote\Model\Quote */
-$quote = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Quote\Model\Quote::class);
+$quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
$quote->load('test01', 'reserved_order_id');
if ($quote->getId()) {
$quote->delete();
}
-
-/** @var $product \Magento\Catalog\Model\Product */
-$productIds = [1, 2, 3];
-$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Catalog\Model\Product::class);
-foreach ($productIds as $productId) {
- $product->load($productId);
- if ($product->getId()) {
- $product->delete();
+// Delete products
+$productSkus = ['simple-1', 'simple-2', 'bundle-product'];
+/** @var Magento\Catalog\Api\ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(Magento\Catalog\Api\ProductRepositoryInterface::class);
+foreach ($productSkus as $sku) {
+ try {
+ $product = $productRepository->get($sku, false, null, true);
+ $productRepository->delete($product);
+ } catch (\Magento\Framework\Exception\NoSuchEntityException $e) {
+ //Product already removed
}
}
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
new file mode 100644
index 0000000000000000000000000000000000000000..979e0dd351ee6cc9e150e153889c84f6d9738ec0
--- /dev/null
+++ b/dev/tests/js/jasmine/tests/app/code/Magento/InstantPurchase/frontend/web/js/view/instant-purchase.test.js
@@ -0,0 +1,102 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+ 'squire',
+ 'ko',
+ 'jquery',
+ 'mage/validation'
+], function (Squire, ko, $) {
+ 'use strict';
+
+ var injector = new Squire(),
+ customerDataMock = ko.observable({}),
+ mocks = {
+ 'Magento_Customer/js/customer-data': {
+ /**
+ * Return customer data mock.
+ * @return {*}
+ */
+ get: function () {
+ return customerDataMock;
+ }
+ },
+ 'Magento_Ui/js/modal/confirm': jasmine.createSpy()
+ },
+ obj;
+
+ describe('Magento_InstantPurchase/js/view/instant-purchase', function () {
+ beforeEach(function (done) {
+ injector.mock(mocks);
+ injector.require(['Magento_InstantPurchase/js/view/instant-purchase'], function (Constr) {
+ obj = Constr({
+ index: 'purchase'
+ });
+ done();
+ });
+ $('body').append('<div id="product_addtocart_form"></div>');
+ });
+
+ afterEach(function () {
+ $('#product_addtocart_form').remove();
+ });
+
+ it('Check initialized data.', function () {
+ expect(obj.showButton()).toBeFalsy();
+ expect(obj.paymentToken()).toBeFalsy();
+ expect(obj.shippingAddress()).toBeFalsy();
+ expect(obj.billingAddress()).toBeFalsy();
+ expect(obj.shippingMethod()).toBeFalsy();
+ });
+
+ it('Check when customer data exists.', function () {
+ var dataStub = {
+ available: true,
+ paymentToken: 'paymentToken',
+ shippingAddress: 'shippingAddress',
+ billingAddress: 'billingAddress',
+ shippingMethod: 'shippingMethod'
+ };
+
+ customerDataMock(dataStub);
+
+ expect(obj.showButton()).toBe(dataStub.available);
+ expect(obj.paymentToken()).toBe(dataStub.paymentToken);
+ expect(obj.shippingAddress()).toBe(dataStub.shippingAddress);
+ expect(obj.billingAddress()).toBe(dataStub.billingAddress);
+ expect(obj.shippingMethod()).toBe(dataStub.shippingMethod);
+ });
+
+ it('Check "setPurchaseData".', function () {
+ var dataStub = {
+ available: true,
+ paymentToken: 'paymentToken',
+ shippingAddress: 'shippingAddress',
+ billingAddress: 'billingAddress',
+ shippingMethod: 'shippingMethod'
+ };
+
+ obj.setPurchaseData(dataStub);
+
+ expect(obj.showButton()).toBe(dataStub.available);
+ expect(obj.paymentToken()).toBe(dataStub.paymentToken);
+ expect(obj.shippingAddress()).toBe(dataStub.shippingAddress);
+ expect(obj.billingAddress()).toBe(dataStub.billingAddress);
+ expect(obj.shippingMethod()).toBe(dataStub.shippingMethod);
+ });
+
+ it('Check "instantPurchase" with failed validation.', function () {
+ spyOn(jQuery.fn, 'valid').and.returnValue(false);
+ expect(obj.instantPurchase()).toBeUndefined();
+ expect(mocks['Magento_Ui/js/modal/confirm']).not.toHaveBeenCalled();
+ });
+
+ it('Check "instantPurchase" with success validation.', function () {
+ spyOn(jQuery.fn, 'valid').and.returnValue(true);
+ expect(obj.instantPurchase()).toBeUndefined();
+ expect(mocks['Magento_Ui/js/modal/confirm']).toHaveBeenCalled();
+ });
+ });
+});
diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
index 1bb42aa5649119bb2de0f1f6ee83aed91f9acfaa..dfe43224e75300c9f032cb9cd42faf8ad1a86024 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/ComposerTest.php
@@ -5,6 +5,7 @@
*/
namespace Magento\Test\Integrity;
+use Composer\Semver\VersionParser;
use Magento\Framework\App\Bootstrap;
use Magento\Framework\Component\ComponentRegistrar;
use Magento\Framework\Composer\MagentoComponent;
@@ -20,6 +21,11 @@ class ComposerTest extends \PHPUnit\Framework\TestCase
*/
private static $root;
+ /**
+ * @var array
+ */
+ private static $mainComposerModules;
+
/**
* @var \stdClass
*/
@@ -39,6 +45,11 @@ class ComposerTest extends \PHPUnit\Framework\TestCase
{
self::$root = BP;
self::$rootJson = json_decode(file_get_contents(self::$root . '/composer.json'), true);
+ $availableSections = ['require', 'require-dev', 'replace'];
+ self::$mainComposerModules = [];
+ foreach ($availableSections as $availableSection) {
+ self::$mainComposerModules = array_merge(self::$mainComposerModules, self::$rootJson[$availableSection]);
+ }
self::$dependencies = [];
self::$objectManager = Bootstrap::create(BP, $_SERVER)->getObjectManager();
}
@@ -174,6 +185,8 @@ class ComposerTest extends \PHPUnit\Framework\TestCase
default:
throw new \InvalidArgumentException("Unknown package type {$packageType}");
}
+
+ $this->assertPackageVersions($json);
}
/**
@@ -290,11 +303,11 @@ class ComposerTest extends \PHPUnit\Framework\TestCase
// Magento Composer Installer is not needed for already existing components
continue;
}
- if (!isset(self::$rootJson['require-dev'][$depName]) && !isset(self::$rootJson['require'][$depName])
- && !isset(self::$rootJson['replace'][$depName])) {
+ if (!isset(self::$mainComposerModules[$depName])) {
$errors[] = "'$name' depends on '$depName'";
}
}
+
if (!empty($errors)) {
$this->fail(
"The following dependencies are missing in root 'composer.json',"
@@ -308,6 +321,52 @@ class ComposerTest extends \PHPUnit\Framework\TestCase
}
}
+ /**
+ *
+ *
+ * @param \StdClass $json
+ */
+ private function assertPackageVersions(\StdClass $json)
+ {
+ $name = $json->name;
+ if (preg_match('/magento\/project-*/', self::$rootJson['name']) == 1) {
+ return;
+ }
+ if (isset($json->require)) {
+ $errors = [];
+ $errorTemplate = "root composer.json has dependency '%s:%s' BUT '%s' composer.json has dependency '%s:%s'";
+ foreach (array_keys((array)$json->require) as $depName) {
+ if ($this->checkDiscrepancy($json, $depName)) {
+ $errors[] = sprintf(
+ $errorTemplate,
+ $depName,
+ self::$mainComposerModules[$depName],
+ $name,
+ $depName,
+ $json->require->$depName
+ );
+ }
+ }
+
+ if (!empty($errors)) {
+ $this->fail(join("\n", $errors));
+ }
+ }
+ }
+
+ /**
+ * @param $componentConfig
+ * @param $packageName
+ * @return bool
+ */
+ private function checkDiscrepancy($componentConfig, $packageName)
+ {
+ $rootConstraint = (new VersionParser())->parseConstraints(self::$mainComposerModules[$packageName]);
+ $componentConstraint = (new VersionParser())->parseConstraints($componentConfig->require->$packageName);
+
+ return !$rootConstraint->matches($componentConstraint);
+ }
+
/**
* Convert a fully qualified module name to a composer package name according to conventions
*
diff --git a/dev/tests/unit/phpunit.xml.dist b/dev/tests/unit/phpunit.xml.dist
index 8b07d1fc3975496b87d43cfc572ad0eed08e1e46..b35b53a68b78053a4745e73b0c60d1cc1ad9dc73 100644
--- a/dev/tests/unit/phpunit.xml.dist
+++ b/dev/tests/unit/phpunit.xml.dist
@@ -19,7 +19,7 @@
<directory suffix="Test.php">../../../vendor/*/module-*/Test/Unit</directory>
<directory suffix="Test.php">../../../vendor/*/framework/Test/Unit</directory>
<directory suffix="Test.php">../../../vendor/*/framework/*/Test/Unit</directory>
- <directory suffix="Test.php">../../tests/unit/*/Test/Unit</directory>
+ <directory suffix="Test.php">./*/*/Test/Unit</directory>
</testsuite>
<php>
<ini name="date.timezone" value="America/Los_Angeles"/>
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index d8a7c96c639150f9c365457ac4362ab334512a9c..b9b607a0f763126b459de7a9ebefe5606886dc74 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -464,7 +464,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
*
* @throws \Magento\Framework\Exception\LocalizedException
* @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- * @deprecated because resource models should be used directly
+ * @deprecated 101.0.0 because resource models should be used directly
*/
protected function _getResource()
{
@@ -493,7 +493,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
* @TODO MAGETWO-23541: Incorrect dependencies between Model\AbstractModel and Data\Collection\Db from Framework
* @throws \Magento\Framework\Exception\LocalizedException
* @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
- * @deprecated because collections should be used directly via factory
+ * @deprecated 101.0.0 because collections should be used directly via factory
*/
public function getResourceCollection()
{
@@ -514,7 +514,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
*
* @TODO MAGETWO-23541: Incorrect dependencies between Model\AbstractModel and Data\Collection\Db from Framework
* @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
- * @deprecated because collections should be used directly via factory
+ * @deprecated 101.0.0 because collections should be used directly via factory
*/
public function getCollection()
{
@@ -885,7 +885,7 @@ abstract class AbstractModel extends \Magento\Framework\DataObject
* Retrieve model resource
*
* @return \Magento\Framework\Model\ResourceModel\Db\AbstractDb
- * @deprecated because resource models should be used directly
+ * @deprecated 101.0.0 because resource models should be used directly
*/
public function getResource()
{
diff --git a/lib/internal/Magento/Framework/Session/SessionManager.php b/lib/internal/Magento/Framework/Session/SessionManager.php
index 2cea02fa3b36123902b279b46fc65307980e7dfd..272d3d923c8a582cd5c07bdeb94726ea538f2e32 100644
--- a/lib/internal/Magento/Framework/Session/SessionManager.php
+++ b/lib/internal/Magento/Framework/Session/SessionManager.php
@@ -504,18 +504,8 @@ class SessionManager implements SessionManagerInterface
return $this;
}
- //@see http://php.net/manual/en/function.session-regenerate-id.php#53480 workaround
if ($this->isSessionExists()) {
- $oldSessionId = session_id();
- session_regenerate_id();
- $newSessionId = session_id();
- session_id($oldSessionId);
- session_destroy();
-
- $oldSession = $_SESSION;
- session_id($newSessionId);
- session_start();
- $_SESSION = $oldSession;
+ session_regenerate_id(true);
} else {
session_start();
}
diff --git a/lib/internal/Magento/Framework/composer.json b/lib/internal/Magento/Framework/composer.json
index aee3e0442c2592d00979bff9206972d3650996f2..17669bd78bd698c3f035091f5d180a4ed03146d2 100644
--- a/lib/internal/Magento/Framework/composer.json
+++ b/lib/internal/Magento/Framework/composer.json
@@ -2,7 +2,7 @@
"name": "magento/framework",
"description": "N/A",
"type": "magento2-library",
- "version": "101.0.1",
+ "version": "101.0.2",
"license": [
"OSL-3.0",
"AFL-3.0"
@@ -26,10 +26,10 @@
"monolog/monolog": "^1.17",
"oyejorge/less.php": "~1.7.0",
"symfony/console": "~2.3, !=2.7.0",
- "tedivm/jshrink": "~1.1.0",
- "zendframework/zend-code": "^3.1.0",
+ "tedivm/jshrink": "~1.2.0",
+ "zendframework/zend-code": "~3.1.0",
"zendframework/zend-crypt": "^2.6.0",
- "zendframework/zend-mvc": "~2.6.3",
+ "zendframework/zend-mvc": "~2.7.12",
"zendframework/zend-uri": "^2.5.1",
"zendframework/zend-validator": "^2.6.0",
"zendframework/zend-stdlib": "^2.7.7",