Merge branch 'develop' into FearlessKiwis-MAGETWO-28256-bundle-integration

Conflicts:
	app/code/Magento/Bundle/Model/LinkManagement.php
	app/code/Magento/Bundle/Model/OptionRepository.php
	app/code/Magento/Bundle/Model/Plugin/BundleSaveOptions.php
	app/code/Magento/Bundle/Model/Product/LinksList.php
	app/code/Magento/Bundle/Test/Unit/Model/LinkManagementTest.php
	app/code/Magento/Bundle/Test/Unit/Model/Plugin/BundleSaveOptionsTest.php
	app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php
	dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php

Author: Yu Tang

.gitignore

@@ -20,6 +20,7 @@ atlassian*
 /lib/internal/flex/varien/.project
 /lib/internal/flex/varien/.settings
 /node_modules
+/.grunt
 
 /pub/media/*.*
 !/pub/media/.htaccess

.htaccess

@@ -170,12 +170,6 @@
 
 </IfModule>
 
-############################################
-## By default allow all access
-
-    Order allow,deny
-    Allow from all
-
 ###########################################
 ## Deny access to release notes to prevent disclosure of the installed Magento version
 

.htaccess.sample

@@ -167,12 +167,6 @@
 
 </IfModule>
 
-############################################
-## By default allow all access
-
-    Order allow,deny
-    Allow from all
-
 ###########################################
 ## Deny access to release notes to prevent disclosure of the installed Magento version
 

.php_cs

@@ -15,7 +15,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create()
     ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
-    ->exclude('lib/internal/Apache')
     ->exclude('lib/internal/CardinalCommerce')
     ->exclude('lib/internal/Cm')
     ->exclude('lib/internal/Credis')

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-  - 5.4
   - 5.5
   - 5.6
 env:
@@ -11,10 +10,6 @@ env:
   - TEST_SUITE=static_annotation
 matrix:
   exclude:
-    - php: 5.4
-      env: TEST_SUITE=static_phpcs
-    - php: 5.4
-      env: TEST_SUITE=static_annotation
     - php: 5.6
       env: TEST_SUITE=static_phpcs
     - php: 5.6

CHANGELOG.md

@@ -1,172 +1,111 @@
-// # Globbing
-// for performance reasons we're only matching one level down:
-// 'test/spec/{,*/}*.js'
-// If you want to recursively match all subfolders, use:
-// 'test/spec/**/*.js'
-
-'use strict';
+/**
+ * @copyright Copyright (c) 2015 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
 
+// For performance use one level down: 'name/{,*/}*.js'
+// If you want to recursively match all subfolders, use: 'name/**/*.js'
 module.exports = function (grunt) {
+    'use strict';
 
-    // Require
-    // --------------------------------------
+    var _ = require('underscore'),
+        path = require('path');
 
-    // Time how long tasks take. Can help when optimizing build times
+    require('./dev/tools/grunt/tasks/mage-minify')(grunt);
     require('time-grunt')(grunt);
 
-    // Load grunt tasks automatically
-    require('load-grunt-tasks')(grunt);
-
-    // Configurable paths and file names
-    // --------------------------------------
-
-    var config = {
-        path: {
-            pub: 'pub',
-            var: 'var',
-            css: {
-                blank: 'pub/static/frontend/Magento/blank/en_US/css',
-                luma: 'pub/static/frontend/Magento/luma/en_US/css'
-            },
-            less: {
-                lib: 'lib/web/css/',
-                blank: 'app/design/frontend/Magento/blank',
-                luma: 'app/design/frontend/luma'
-            },
-            doc: 'lib/web/css/docs'
-        },
-        doc: {
-            styleName: 'docs'
+    require('load-grunt-config')(grunt, {
+        configPath: path.join(process.cwd(), 'dev/tools/grunt/configs'),
+        init: true,
+        loadGruntTasks: {
+            pattern: [
+                'grunt-*',
+                '!grunt-template-jasmine-requirejs'
+            ]
         }
-    };
-
-    // Define the configuration for all the tasks
-    // --------------------------------------
-
-    grunt.initConfig({
-
-        // Project settings
-        config: config,
+    });
 
-        // Watches files for changes and runs tasks based on the changed files
-        watch: {
-            less: {
-                files: [
-                    '<%= config.path.less.lib %>/{,*/}*.less',
-                    '<%= config.path.less.blank %>/{,*/,*/*/,*/*/*/,*/*/*/*/}*.less', // ToDo UI: find out how to do it recursive
-                    '<%= config.path.less.luma %>/{,*/,*/*/,*/*/*/,*/*/*/*/}*.less'
-                ],
-                tasks: ['styles']
-            }
+    _.each({
+        /**
+         * Assembling tasks.
+         * ToDo UI: define default tasks.
+         */
+        default: function () {
+            grunt.log.subhead('I\'m default task and at the moment I\'m empty, sorry :/');
         },
 
-        // Empties folders to start fresh
-        clean: {
-            var: {
-                files: [{
-                    dot: true,
-                    src: [
-                        '<%= config.path.var %>/cache/*',
-                        '<%= config.path.var %>/generation/*',
-                        '<%= config.path.var %>/log/*',
-                        '<%= config.path.var %>/maps/*',
-                        '<%= config.path.var %>/page_cache/*',
-                        '<%= config.path.var %>/tmp/*',
-                        '<%= config.path.var %>/view/*',
-                        '<%= config.path.var %>/view_preprocessed/*'
-                    ]
-                }]
-            },
-            pub: {
-                files: [{
-                    dot: true,
-                    src: [
-                        '<%= config.path.pub %>/static/frontend/*',
-                        '<%= config.path.pub %>/static/adminhtml/*'
-                    ]
-                }]
+        /**
+         * Production preparation task.
+         */
+        prod: function (component) {
+            if (component === 'setup') {
+                grunt.task.run([
+                    'less:' + component,
+                    'autoprefixer:' + component,
+                    'cssmin:' + component,
+                    'usebanner:' + component
+                ]);
             }
-        },
 
-        // Compiles Less to CSS and generates necessary files if requested
-        less: {
-            options: {
-                sourceMap: true,
-                sourceMapRootpath: '/',
-                dumpLineNumbers: false, // use 'comments' instead false to output line comments for source
-                ieCompat: false
-            },
-            blank: {
-                files: {
-                    '<%= config.path.css.blank %>/styles-m.css': '<%= config.path.css.blank %>/styles-m.less',
-                    '<%= config.path.css.blank %>/styles-l.css': '<%= config.path.css.blank %>/styles-l.less'
-                }
-            },
-            luma: {
-                files: {
-                    '<%= config.path.css.luma %>/styles-m.css': '<%= config.path.css.luma %>/styles-m.less',
-                    '<%= config.path.css.luma %>/styles-l.css': '<%= config.path.css.luma %>/styles-l.less'
-                }
-            },
-            documentation: {
-                files: {
-                    '<%= config.path.doc %>/<%= config.doc.styleName %>.css': "<%= config.path.doc %>/source/<%= config.doc.styleName %>.less"
-                }
+            if (typeof component === 'undefined') {
+                grunt.log.subhead('Tip: Please make sure that u specify prod subtask. By default prod task do nothing');
             }
         },
 
-        styledocco: {
-            documentation: {
-                options: {
-                    name: 'Magento UI Library',
-                    verbose: true,
-                    include: [
-                        '<%= config.path.doc %>/<%= config.doc.styleName %>.css'
-                        //'lib/web/jquery/jquery.min.js',
-                        //'lib/web/jquery/jquery-ui.min',
-                        //'<%= config.path.doc %>/source/js/dropdown.js'
-                    ]
-                },
-                files: {
-                    '<%= config.path.doc %>': '<%= config.path.doc %>/source' // Todo UI: Check out JS for Styledocco
-                }
-            }
-        }
-
+        /**
+         * Refresh magento frontend & backend.
+         */
+        refresh: [
+            'exec:all',
+            'less:blank',
+            'less:luma',
+            'less:backend'
+        ],
+        /**
+         * Styles for backend theme
+         */
+        backend: [
+            'less:backend',
+            'replace:escapeCalc',
+            'less:override'
+        ],
+        /**
+         * Documentation
+         */
+        documentation: [
+            'less:documentation',
+            'styledocco:documentation',
+            'clean:var',
+            'clean:pub'
+        ],
+
+        spec: [
+            'specRunner:lib',
+            'specRunner:backend',
+            'specRunner:frontend'
+        ],
+
+        unit: [
+            'jasmine:lib-unit',
+            'jasmine:backend-unit',
+            'jasmine:frontend-unit'
+        ],
+
+        integration: [
+            'jasmine:lib-integration',
+            'jasmine:backend-integration',
+            'jasmine:frontend-integration'
+        ],
+
+        'legacy-build': [
+            'mage-minify:legacy'
+        ],
+
+        'documentation-banners': [
+            'usebanner:documentationCss',
+            'usebanner:documentationLess',
+            'usebanner:documentationHtml'
+        ]
+    }, function (task, name) {
+        grunt.registerTask(name, task);
     });
-
-    // Default task
-    // --------------------------------------
-    grunt.registerTask('default', []); // ToDo UI: define default tasks
-
-    // Clean var & pub folders
-    grunt.registerTask('cleanup', [
-        'clean:var',
-        'clean:pub'
-    ]);
-
-    // Compile all styles
-    // --------------------------------------
-    grunt.registerTask('styles', [
-        'less:blank',
-        'less:luma'
-    ]);
-
-    // Compile blank styles
-    grunt.registerTask('styles blank', [
-        'less:blank'
-    ]);
-
-    // Compile luma styles
-    grunt.registerTask('styles luma', [
-        'less:luma'
-    ]);
-
-    // Documentation
-    // --------------------------------------
-    grunt.registerTask('documentation', [
-        'less:documentation',
-        'styledocco:documentation',
-        'cleanup'
-    ]);
 };

Gruntfile.js

@@ -32,7 +32,7 @@ Use the following table to verify you have the correct prerequisites to install
 		<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
 	</tr>
 	<tr>
-		<td>PHP 5.4.x (where x = 11 or later) or 5.5.x</td>
+		<td>PHP 5.5.x or 5.6.x</td>
 		<td><code>php -v</code></td>
 		<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
 	</tr>

README.md

@@ -12,14 +12,14 @@
 umask(0);
 
 /* PHP version validation */
-if (version_compare(phpversion(), '5.4.11', '<') === true) {
+if (version_compare(phpversion(), '5.5.0', '<') === true) {
     if (PHP_SAPI == 'cli') {
-        echo 'Magento supports PHP 5.4.11 or later. ' .
+        echo 'Magento supports PHP 5.5.0 or later. ' .
             'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
     } else {
         echo <<<HTML
 <div style="font:12px/1.35em arial, helvetica, sans-serif;">
-    <p>Magento supports PHP 5.4.11 or later. Please read
+    <p>Magento supports PHP 5.5.0 or later. Please read
     <a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
     Magento System Requirements</a>.
 </div>
@@ -35,5 +35,5 @@
     \Magento\Framework\Profiler::applyConfig($_SERVER['MAGE_PROFILER'], BP, !empty($_REQUEST['isAjax']));
 }
 if (ini_get('date.timezone') == '') {
-    date_default_timezone_set(\Magento\Framework\Stdlib\DateTime\TimezoneInterface::DEFAULT_TIMEZONE);
+    date_default_timezone_set('UTC');
 }

app/bootstrap.php

@@ -13,18 +13,18 @@
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * @var \Magento\Core\Helper\Url
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $_urlHelper;
 
     /**
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Core\Helper\Url $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Core\Helper\Url $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         array $data = []
     ) {
         $this->_urlHelper = $urlHelper;