Merge remote-tracking branch 'upstream/develop' into develop

Author: Igloczek

.gitignore

@@ -28,6 +28,7 @@ atlassian*
 
 /pub/media/*.*
 !/pub/media/.htaccess
+/pub/media/analytics/*
 /pub/media/catalog/*
 !/pub/media/catalog/.htaccess
 /pub/media/customer/*
@@ -51,3 +52,5 @@ atlassian*
 !/var/.htaccess
 /vendor/*
 !/vendor/.htaccess
+/generated/*
+!/generated/.htaccess

.travis.yml

@@ -9,7 +9,7 @@ addons:
     - postfix
 language: php
 php:
-  - 5.6
+  - 5.6.29
   - 7.0
 env:
   global:
@@ -26,12 +26,11 @@ cache:
   directories: $HOME/.composer/cache
 matrix:
   exclude:
-    - php: 7.0
+    - php: 5.6.29
       env: TEST_SUITE=static
 before_install: ./dev/travis/before_install.sh
 install: composer install --no-interaction --prefer-dist
 before_script: ./dev/travis/before_script.sh
-script: 
-  - cd dev/tests/$TEST_SUITE
+script:
   - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
-  - phpunit $TEST_FILTER
+  - phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+<!--- Provide a general summary of the Pull Request in the Title above -->
+
+### Description
+<!--- Provide a description of the changes proposed in the pull request -->
+
+### Fixed Issues (if relevant)
+<!--- Provide a list of fixed issues in the format magento/magetno2#<issue_number>, if relevant  -->
+1. magento/magetno2#<issue_number>: Issue title
+2. ...
+
+### Manual testing scenarios
+<!--- Provide a set of unambiguous steps to test the proposed code change -->
+1. ...
+2. ...
+
+### Contribution checklist
+ - [ ] Pull request has a meaningful description of its purpose
+ - [ ] All commits are accompanied by meaningful commit messages
+ - [ ] All new or changed code is covered with unit/integration tests (if applicable)
+ - [ ] All automated tests passed successfully (all builds on Travis CI are green)

README.md

@@ -3,61 +3,14 @@
 <h2>Welcome</h2>
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting edge, feature-rich eCommerce solution that gets results.
 
-The installation instructions that used to be here are now published on our GitHub site. Use the information on this page to get started or go directly to the <a href="http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html" target="_blank">guide</a>.
+## Magento system requirements
+[Magento system requirements](http://devdocs.magento.com/magento-system-requirements.html)
 
-<h2>New to Magento? Need some help?</h2>
-If you're not sure about the following, you probably need a little help before you start installing the Magento software:
+## Install Magento
+To install Magento, see either:
 
-*	Is the Magento software <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_magento-installed.html">installed already</a>?
-*	What's a <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">terminal, command prompt, or Secure Shell (ssh)</a>?
-*	Where's my <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_login.html">Magento server</a> and how do I access it?
-*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">PHP</a>?
-*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">Apache</a>?
-*	What's <a href="http://devdocs.magento.com/guides/v2.0/install-gde/basics/basics_software.html">MySQL</a>?
-
-<h2>Step 1: Verify your prerequisites</h2>
-
-Use the following table to verify you have the correct prerequisites to install the Magento software.
-
-<table>
-	<tbody>
-		<tr>
-			<th>Prerequisite</th>
-			<th>How to check</th>
-			<th>For more information</th>
-		</tr>
-	<tr>
-		<td>Apache 2.2 or 2.4</td>
-		<td>Ubuntu: <code>apache2 -v</code><br>
-		CentOS: <code>httpd -v</code></td>
-		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/apache.html">Apache</a></td>
-	</tr>
-	<tr>
-		<td>PHP 5.6.x, 7.0.2 or 7.0.6</td>
-		<td><code>php -v</code></td>
-		<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
-	</tr>
-	<tr><td>MySQL 5.6.x</td>
-	<td><code>mysql -u [root user name] -p</code></td>
-	<td><a href="http://devdocs.magento.com/guides/v2.0/install-gde/prereq/mysql.html">MySQL</a></td>
-	</tr>
-</tbody>
-</table>
-
-<h2>Step 2: Prepare to install</h2>
-
-After verifying your prerequisites, perform the following tasks in order to prepare to install the Magento software.
-
-1.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-install">Install Composer</a>
-2.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/composer-clone.html#instgde-prereq-compose-clone">Clone the Magento repository</a>
-
-<h2>Step 3: Install and verify the installation</h2>
-
-1.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/prepare-install.html">Update installation dependencies</a>
-2.	Install Magento:
-	*	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-web.html">Install Magento software using the web interface</a>
-	*	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/install-cli.html">Install Magento software using the command line</a>
-2.	<a href="http://devdocs.magento.com/guides/v2.0/install-gde/install/verify.html">Verify the installation</a>
+*	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
+*	[Installation guide](http://devdocs.magento.com/guides/v2.0/install-gde/bk-install-guide.html)
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.

app/bootstrap.php

@@ -58,3 +58,7 @@
 }
 
 date_default_timezone_set('UTC');
+
+/*  Adjustment of precision value for several versions of PHP */
+ini_set('precision', 17);
+ini_set('serialize_precision', 17);

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

@@ -9,7 +9,7 @@
 use Magento\Store\Model\Store;
 
 /**
- * @deprecated 
+ * @deprecated
  */
 class Baseurl implements \Magento\Framework\Notification\MessageInterface
 {

app/code/Magento/AdminNotification/Setup/InstallSchema.php

@@ -120,6 +120,5 @@ public function install(SchemaSetupInterface $setup, ModuleContextInterface $con
         $installer->getConnection()->createTable($table);
 
         $installer->endSetup();
-
     }
 }

app/code/Magento/AdminNotification/view/adminhtml/web/system/notification.js

@@ -2,6 +2,7 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
     'jquery',
     'mage/template',
@@ -15,20 +16,22 @@ define([
             modalClass: 'modal-system-messages',
             systemMessageTemplate:
                 '<% _.each(data.items, function(item) { %>' +
-                    '<li class="message message-warning <% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
+                    '<li class="message message-warning' +
+                        '<% if (item.severity == 1) { %>error<% } else { %>warning<% } %>">' +
                         '<%= item.text %>' +
                     '</li>' +
                 '<% }); %>'
         },
 
-        _create: function() {
+        /** @inheritdoc */
+        _create: function () {
             this.options.title = $('#message-system-all').attr('title');
             this._super();
         },
 
+        /** @inheritdoc */
         openModal: function (severity) {
             var superMethod = $.proxy(this._super, this);
-            //this.modal.options
 
             $.ajax({
                 url: this.options.ajaxUrl,
@@ -56,6 +59,8 @@ define([
 
             return this;
         },
+
+        /** @inheritdoc */
         closeModal: function () {
             this._super();
         }

app/code/Magento/AdminNotification/view/adminhtml/web/toolbar_entry.js

@@ -2,16 +2,22 @@
  * Copyright © 2013-2017 Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 define([
-    "jquery",
-    "jquery/ui",
-    "domReady!"
+    'jquery',
+    'jquery/ui',
+    'domReady!'
 ], function ($) {
     'use strict';
 
-    // Mark notification as read via AJAX call
+    /**
+     * Mark notification as read via AJAX call.
+     *
+     * @param {String} notificationId
+     */
     var markNotificationAsRead = function (notificationId) {
             var requestUrl = $('.notifications-wrapper .admin__action-dropdown-menu').attr('data-mark-as-read-url');
+
             $.ajax({
                 url: requestUrl,
                 type: 'POST',
@@ -22,19 +28,24 @@ define([
                 showLoader: false
             });
         },
-
         notificationCount = $('.notifications-wrapper').attr('data-notification-count'),
 
-        // Remove notification from the list
+        /**
+         * Remove notification from the list.
+         *
+         * @param {jQuery} notificationEntry
+         */
         removeNotificationFromList = function (notificationEntry) {
+            var notificationIcon, actionElement;
+
             notificationEntry.remove();
             notificationCount--;
             $('.notifications-wrapper').attr('data-notification-count', notificationCount);
 
-            if (notificationCount == 0) {
+            if (notificationCount == 0) {// eslint-disable-line eqeqeq
                 // Change appearance of the bubble and its behavior when the last notification is removed
                 $('.notifications-wrapper .admin__action-dropdown-menu').remove();
-                var notificationIcon = $('.notifications-wrapper .notifications-icon');
+                notificationIcon = $('.notifications-wrapper .notifications-icon');
                 notificationIcon.removeAttr('data-toggle');
                 notificationIcon.off('click.dropdown');
                 $('.notifications-action .notifications-counter').text('').hide();
@@ -45,12 +56,16 @@ define([
                 }
                 $('.notifications-entry-last .notifications-counter').text(notificationCount);
                 // Modify caption of the 'See All' link
-                var actionElement = $('.notifications-wrapper .admin__action-dropdown-menu .last .action-more');
+                actionElement = $('.notifications-wrapper .admin__action-dropdown-menu .last .action-more');
                 actionElement.text(actionElement.text().replace(/\d+/, notificationCount));
             }
         },
 
-        // Show notification details
+        /**
+         * Show notification details.
+         *
+         * @param {jQuery} notificationEntry
+         */
         showNotificationDetails = function (notificationEntry) {
             var notificationDescription = notificationEntry.find('.notifications-entry-description'),
                 notificationDescriptionEnd = notificationEntry.find('.notifications-entry-description-end');
@@ -59,20 +74,22 @@ define([
                 notificationDescriptionEnd.addClass('_show');
             }
 
-            if(notificationDescription.hasClass('_cutted')) {
+            if (notificationDescription.hasClass('_cutted')) {
                 notificationDescription.removeClass('_cutted');
             }
         };
 
     // Show notification description when corresponding item is clicked
-    $('.notifications-wrapper .admin__action-dropdown-menu .notifications-entry').on('click.showNotification', function (event) {
-        // hide notification dropdown
-        $('.notifications-wrapper .notifications-icon').trigger('click.dropdown');
+    $('.notifications-wrapper .admin__action-dropdown-menu .notifications-entry').on(
+        'click.showNotification',
+        function (event) {
+            // hide notification dropdown
+            $('.notifications-wrapper .notifications-icon').trigger('click.dropdown');
 
-        showNotificationDetails($(this));
-        event.stopPropagation();
-
-    });
+            showNotificationDetails($(this));
+            event.stopPropagation();
+        }
+    );
 
     // Remove corresponding notification from the list and mark it as read
     $('.notifications-close').on('click.removeNotification', function (event) {
@@ -83,19 +100,19 @@ define([
         removeNotificationFromList(notificationEntry);
 
         // Checking for last unread notification to hide dropdown
-        if (notificationCount == 0) {
+        if (notificationCount == 0) {// eslint-disable-line eqeqeq
             $('.notifications-wrapper').removeClass('active')
-                                       .find('.notifications-action').removeAttr('data-toggle')
-                                                                     .off('click.dropdown');
+                .find('.notifications-action')
+                .removeAttr('data-toggle')
+                .off('click.dropdown');
         }
         event.stopPropagation();
     });
 
     // Hide notifications bubble
-    if (notificationCount == 0) {
+    if (notificationCount == 0) {// eslint-disable-line eqeqeq
         $('.notifications-action .notifications-counter').hide();
     } else {
         $('.notifications-action .notifications-counter').show();
     }
-
 });

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

@@ -13,7 +13,7 @@ class WebsiteTest extends \PHPUnit_Framework_TestCase
     /**
      * @var \Magento\Store\Model\WebSite|\PHPUnit_Framework_MockObject_MockObject
      */
-     protected $webSiteModel;
+    protected $webSiteModel;
 
     /**
      * @var \Magento\CatalogImportExport\Model\Import\Product\StoreResolver|\PHPUnit_Framework_MockObject_MockObject