Skip to content

Commit 680a68f

Browse files
guz-antonguz-anton
committed
Merge branch 'develop' into MAGETWO-32485
2 parents 47dab93 + d33f01d commit 680a68f

File tree

1,444 files changed

+14010
-14853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,444 files changed

+14010
-14853
lines changed

‎.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: php
22
php:
33
- 5.4
44
- 5.5
5+
- 5.6
56
env:
67
- TEST_SUITE=unit
78
- TEST_SUITE=integration
@@ -14,6 +15,10 @@ matrix:
1415
env: TEST_SUITE=static_phpcs
1516
- php: 5.4
1617
env: TEST_SUITE=static_annotation
18+
- php: 5.6
19+
env: TEST_SUITE=static_phpcs
20+
- php: 5.6
21+
env: TEST_SUITE=static_annotation
1722
before_install:
1823
- sudo apt-get update -qq
1924
- sudo apt-get install -y -qq postfix

‎app/bootstrap.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
/* PHP version validation */
1515
if (version_compare(phpversion(), '5.4.11', '<') === true) {
1616
if (PHP_SAPI == 'cli') {
17-
echo 'Magento supports PHP 5.4.11 or newer. Please read http://www.magento.com/install.';
17+
echo 'Magento supports PHP 5.4.11 or later. ' .
18+
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1819
} else {
1920
echo <<<HTML
2021
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
22-
<h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
23-
Whoops, it looks like you have an invalid PHP version.</h3>
24-
</div>
25-
<p>Magento supports PHP 5.4.11 or newer.
22+
<p>Magento supports PHP 5.4.11 or later. Please read
23+
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
24+
Magento System Requirements</a>.
2625
</div>
2726
HTML;
2827
}

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-core": "0.42.0-beta3",
88
"magento/module-backend": "0.42.0-beta3",

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<?php endforeach;?>
1515
</ul>
1616
</div>
17-
<script type="text/javascript">
17+
<script>
1818
require([
1919
"jquery",
2020
"jquery/ui"

‎app/code/Magento/Authorization/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-backend": "0.42.0-beta3",
77
"magento/framework": "0.42.0-beta3",
88
"magento/magento-composer-installer": "*"

‎app/code/Magento/Authorization/sql/authorization_setup/install-2.0.0.php

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,7 @@
99

1010
$installer->startSetup();
1111

12-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_role'))) {
13-
/**
14-
* Rename existing 'admin_role' table into 'authorization_role' (to avoid forcing Magento re-installation)
15-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
16-
*/
17-
$installer->getConnection()->renameTable(
18-
$installer->getTable('admin_role'),
19-
$installer->getTable('authorization_role')
20-
);
21-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
12+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
2213
/**
2314
* Create table 'authorization_role'
2415
*/
@@ -84,16 +75,7 @@
8475
$installer->getConnection()->createTable($table);
8576
}
8677

87-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_rule'))) {
88-
/**
89-
* Rename existing 'admin_rule' table into 'authorization_rule' (to avoid forcing Magento re-installation)
90-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
91-
*/
92-
$installer->getConnection()->renameTable(
93-
$installer->getTable('admin_rule'),
94-
$installer->getTable('authorization_rule')
95-
);
96-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
78+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
9779
/**
9880
* Create table 'authorization_rule'
9981
*/

‎app/code/Magento/Backend/Block/Widget/Form/Container.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public function getFormHtml()
178178
public function getFormInitScripts()
179179
{
180180
if (!empty($this->_formInitScripts) && is_array($this->_formInitScripts)) {
181-
return '<script type="text/javascript">' . implode("\n", $this->_formInitScripts) . '</script>';
181+
return '<script>' . implode("\n", $this->_formInitScripts) . '</script>';
182182
}
183183
return '';
184184
}
@@ -189,7 +189,7 @@ public function getFormInitScripts()
189189
public function getFormScripts()
190190
{
191191
if (!empty($this->_formScripts) && is_array($this->_formScripts)) {
192-
return '<script type="text/javascript">' . implode("\n", $this->_formScripts) . '</script>';
192+
return '<script>' . implode("\n", $this->_formScripts) . '</script>';
193193
}
194194
return '';
195195
}

‎app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected function _toHtml()
120120
if (!$this->_depends) {
121121
return '';
122122
}
123-
return '<script type="text/javascript">
123+
return '<script>
124124
require(["mage/adminhtml/form"], function(){
125125
new FormElementDependenceController(' .
126126
$this->_getDependsJson() .

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public function getHtml()
8686
' value="' .
8787
$this->_localeResolver->getLocaleCode() .
8888
'"/>';
89-
$html .= '<script type="text/javascript">
89+
$html .= '<script>
9090
require(["jquery", "mage/calendar"], function($){
9191
$("#' .
9292
$htmlId .

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Datetime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public function getHtml()
130130
) . '/>' . '</div></div>';
131131
$html .= '<input type="hidden" name="' . $this->_getHtmlName() . '[locale]"' . ' value="'
132132
. $this->_localeResolver->getLocaleCode() . '"/>';
133-
$html .= '<script type="text/javascript">
133+
$html .= '<script>
134134
require(["jquery", "mage/calendar"],function($){
135135
$("#' . $htmlId . '_range").dateRange({
136136
dateFormat: "' . $format . '",

0 commit comments

Comments
 (0)