Merge branch 'develop' of https://github.corp.magento.com/magento2/magento2ce into MAGETWO-52338

Author: Oleksandr Karpenko

.gitignore

@@ -6,6 +6,7 @@
 atlassian*
 /nbproject
 /sitemap
+/sitemap.xml
 /.idea
 /.gitattributes
 /app/config_sandbox

.htaccess.sample

@@ -1,12 +1,11 @@
 ############################################
-## overrides deployment configuration mode value
-## use command bin/magento deploy:mode:set to switch modes
-
-#   SetEnv MAGE_MODE developer
+## Optional override of deployment mode. We recommend you use the
+## command bin/magento deploy:mode:set to switch modes instead
+#   SetEnv MAGE_MODE default # or production or developer
 
 ############################################
-## uncomment these lines for CGI mode
-## make sure to specify the correct cgi php binary file name
+## Uncomment these lines for CGI mode.
+## Make sure to specify the correct cgi php binary file name
 ## it might be /cgi-bin/php-cgi
 
 #    Action php5-cgi /cgi-bin/php5-cgi
@@ -17,42 +16,42 @@
 
 #   Options -MultiViews
 
-## you might also need to add this line to php.ini
+## You might also need to add this line to php.ini
 ##     cgi.fix_pathinfo = 1
-## if it still doesn't work, rename php.ini to php5.ini
+## If it still doesn't work, rename php.ini to php5.ini
 
 ############################################
-## this line is specific for 1and1 hosting
+## This line is specific for 1and1 hosting
 
     #AddType x-mapp-php5 .php
     #AddHandler x-mapp-php5 .php
 
 ############################################
-## default index file
+## Default index file
 
     DirectoryIndex index.php
 
 <IfModule mod_php5.c>
 
 ############################################
-## adjust memory limit
+## Adjust memory limit
 
     php_value memory_limit 768M
     php_value max_execution_time 18000
 
 ############################################
-## disable automatic session start
+## Disable automatic session start
 ## before autoload was initialized
 
     php_flag session.auto_start off
 
 ############################################
-## enable resulting html compression
+## Enable resulting html compression
 
     #php_flag zlib.output_compression on
 
 ###########################################
-## disable user agent verification to not break multiple image upload
+## Disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
 
@@ -61,32 +60,32 @@
 <IfModule mod_php7.c>
 
 ############################################
-## adjust memory limit
+## Adjust memory limit
 
     php_value memory_limit 768M
     php_value max_execution_time 18000
 
 ############################################
-## disable automatic session start
+## Disable automatic session start
 ## before autoload was initialized
 
     php_flag session.auto_start off
 
 ############################################
-## enable resulting html compression
+## Enable resulting html compression
 
     #php_flag zlib.output_compression on
 
 ###########################################
-## disable user agent verification to not break multiple image upload
+## Disable user agent verification to not break multiple image upload
 
     php_flag suhosin.session.cryptua off
 
 </IfModule>
 
 <IfModule mod_security.c>
 ###########################################
-## disable POST processing to not break multiple image upload
+## Disable POST processing to not break multiple image upload
 
     SecFilterEngine Off
     SecFilterScanPOST Off
@@ -95,7 +94,7 @@
 <IfModule mod_deflate.c>
 
 ############################################
-## enable apache served files compression
+## Enable apache served files compression
 ## http://developer.yahoo.com/performance/rules.html#gzip
 
     # Insert filter on all content
@@ -123,14 +122,14 @@
 <IfModule mod_ssl.c>
 
 ############################################
-## make HTTPS env vars available for CGI mode
+## Make HTTPS env vars available for CGI mode
 
     SSLOptions StdEnvVars
 
 </IfModule>
 
 ############################################
-## workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
+## Workaround for Apache 2.4.6 CentOS build when working via ProxyPassMatch with HHVM (or any other)
 ## Please, set it on virtual host configuration level
 
 ##    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
@@ -139,19 +138,19 @@
 <IfModule mod_rewrite.c>
 
 ############################################
-## enable rewrites
+## Enable rewrites
 
     Options +FollowSymLinks
     RewriteEngine on
 
 ############################################
-## you can put here your magento root folder
+## You can put here your magento root folder
 ## path relative to web root
 
     #RewriteBase /magento/
 
 ############################################
-## workaround for HTTP authorization
+## Workaround for HTTP authorization
 ## in CGI environment
 
     RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
@@ -163,21 +162,21 @@
     RewriteRule .* - [L,R=405]
 
 ############################################
-## redirect for mobile user agents
+## Redirect for mobile user agents
 
     #RewriteCond %{REQUEST_URI} !^/mobiledirectoryhere/.*$
     #RewriteCond %{HTTP_USER_AGENT} "android|blackberry|ipad|iphone|ipod|iemobile|opera mobile|palmos|webos|googlebot-mobile" [NC]
     #RewriteRule ^(.*)$ /mobiledirectoryhere/ [L,R=302]
 
 ############################################
-## never rewrite for existing files, directories and links
+## Never rewrite for existing files, directories and links
 
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
     RewriteCond %{REQUEST_FILENAME} !-l
 
 ############################################
-## rewrite everything else to index.php
+## Rewrite everything else to index.php
 
     RewriteRule .* index.php [L]
 

.travis.yml

@@ -1,70 +1,39 @@
 sudo: required
 dist: trusty
-
+addons:
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6
+    - postfix
 language: php
 php:
   - 5.5
   - 5.6
   - 7.0
 env:
-  - TEST_SUITE=unit
-  - TEST_SUITE=integration_part_1
-  - TEST_SUITE=integration_part_2
-  - TEST_SUITE=integration_integrity
-  - TEST_SUITE=static
+  global:
+    - COMPOSER_BIN_DIR=~/bin
+    - INTEGRATION_SETS=2
+  matrix:
+    - TEST_SUITE=unit
+    - TEST_SUITE=integration INTEGRATION_INDEX=1
+    - TEST_SUITE=integration INTEGRATION_INDEX=2
+    - TEST_SUITE=static
 cache:
   apt: true
-  directories:
-    - $HOME/.composer/cache
-    - $HOME/.cache/bin
+  directories: $HOME/.composer/cache
 matrix:
   exclude:
     - php: 5.6
       env: TEST_SUITE=static
     - php: 7.0
       env: TEST_SUITE=static
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -y -qq postfix
-  - sh -c 'if [ "$CASHER_DIR" ]; then
-         if [ -x $HOME/.cache/bin/composer ]; then
-           $HOME/.cache/bin/composer self-update; echo '';
-         else
-           mkdir -p $HOME/.cache/bin;
-           curl --connect-timeout 30 -sS https://getcomposer.org/installer
-           | php -- --install-dir $HOME/.cache/bin/ --filename composer;
-         fi
-       fi'
-  - export PATH="$HOME/.cache/bin:$PATH"
-before_script:
-  # Mock mail
-  - sudo service postfix stop
-  - smtp-sink -d "%d.%H.%M.%S" localhost:2500 1000 &
-  - echo 'sendmail_path = "/usr/sbin/sendmail -t -i "' > $(php --ini|grep -m 1 "ini files in:"|cut -d ":" -f 2)/sendmail.ini
-  # Disable xDebug
-  - echo '' > ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini
-  # Install MySQL 5.6, create DB for integration tests
-  - >
-      sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ] || [ '$TEST_SUITE' = 'integration_integrity' ]; then
-      sudo apt-get remove -y -qq --purge mysql-common mysql-server-5.5 mysql-server-core-5.5 mysql-client-5.5 mysql-client-core-5.5;
-      sudo apt-get -y -qq autoremove;
-      sudo apt-get -y -qq autoclean;
-      sudo apt-get install -y -qq mysql-server-5.6 mysql-client-5.6;
-      mysql -uroot -e 'SET @@global.sql_mode = NO_ENGINE_SUBSTITUTION; CREATE DATABASE magento_integration_tests;';
-      mv dev/tests/integration/etc/install-config-mysql.travis.php.dist dev/tests/integration/etc/install-config-mysql.php;
-      fi"
-  # Change memory_limit for travis
-  - echo 'memory_limit = -1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
-  - phpenv rehash;
-  - composer install --no-interaction --prefer-dist
-script:
-  # Unit tests
-  - sh -c "if [ '$TEST_SUITE' = 'unit' ]; then ./vendor/bin/phpunit -c dev/tests/unit/phpunit.xml.dist; fi"
-  # Integration tests
-  - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ] || [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; bash IntegationTestsForTravis.sh 2; fi"
-  - sh -c "if [ '$TEST_SUITE' = 'integration_part_1' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis1; fi"
-  - sh -c "if [ '$TEST_SUITE' = 'integration_part_2' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.travis2; fi"
-  # Integration integrity tests
-  - sh -c "if [ '$TEST_SUITE' = 'integration_integrity' ]; then cd dev/tests/integration/; ./../../../vendor/bin/phpunit -c phpunit.xml.dist testsuite/Magento/Test/Integrity; fi"
-  # Static tests [Code Style]
-  - sh -c "if [ '$TEST_SUITE' = 'static' ]; then cd dev/tests/static/; php get_github_changes.php --output-file='$TRAVIS_BUILD_DIR/dev/tests/static/testsuite/Magento/Test/_files/changed_files_ce.txt' --base-path='$TRAVIS_BUILD_DIR' --repo='https://github.com/magento/magento2.git' --branch='develop'; ./../../../vendor/bin/phpunit -c phpunit.xml.dist --filter 'Magento\\\\Test\\\\Php\\\\LiveCodeTest'; fi"
+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
+  - test $TEST_SUITE = "static" && TEST_FILTER='--filter "Magento\\Test\\Php\\LiveCodeTest"' || true
+  - phpunit $TEST_FILTER

Gruntfile.js.sample

@@ -12,16 +12,11 @@ module.exports = function (grunt) {
         path = require('path'),
         themes = require('./dev/tools/grunt/configs/themes'),
         configDir = './dev/tools/grunt/configs',
-        taskDir = './dev/tools/grunt/tasks';
+        tasks = grunt.file.expand('./dev/tools/grunt/tasks/*');
 
-    [
-        taskDir + '/mage-minify',
-        taskDir + '/deploy',
-        taskDir + '/black-list-generator',
-        taskDir + '/clean-black-list',
-        taskDir + '/static',
-        'time-grunt'
-    ].forEach(function (task) {
+    tasks = _.map(tasks, function(task){ return task.replace('.js', '') });
+    tasks.push('time-grunt');
+    tasks.forEach(function (task) {
         require(task)(grunt);
     });
 

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

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