Skip to content

Commit d577626

Browse files
author
Dale Sikkema
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-31495-core-app
Conflicts: app/code/Magento/Customer/Controller/Account/EditPost.php app/code/Magento/Review/composer.json
2 parents d7c3bc9 + 9a7c0a4 commit d577626

File tree

820 files changed

+19577
-3942
lines changed

Some content is hidden

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

820 files changed

+19577
-3942
lines changed

‎.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.4
43
- 5.5
54
- 5.6
65
env:
@@ -11,10 +10,6 @@ env:
1110
- TEST_SUITE=static_annotation
1211
matrix:
1312
exclude:
14-
- php: 5.4
15-
env: TEST_SUITE=static_phpcs
16-
- php: 5.4
17-
env: TEST_SUITE=static_annotation
1813
- php: 5.6
1914
env: TEST_SUITE=static_phpcs
2015
- php: 5.6

‎app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
umask(0);
1313

1414
/* PHP version validation */
15-
if (version_compare(phpversion(), '5.4.11', '<') === true) {
15+
if (version_compare(phpversion(), '5.5.0', '<') === true) {
1616
if (PHP_SAPI == 'cli') {
17-
echo 'Magento supports PHP 5.4.11 or later. ' .
17+
echo 'Magento supports PHP 5.5.0 or later. ' .
1818
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1919
} else {
2020
echo <<<HTML
2121
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
22-
<p>Magento supports PHP 5.4.11 or later. Please read
22+
<p>Magento supports PHP 5.5.0 or later. Please read
2323
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
2424
Magento System Requirements</a>.
2525
</div>

‎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.6.0",
5+
"php": "~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta6",
77
"magento/module-core": "0.42.0-beta6",
88
"magento/module-backend": "0.42.0-beta6",

‎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.6.0",
5+
"php": "~5.5.0|~5.6.0",
66
"magento/module-backend": "0.42.0-beta6",
77
"magento/framework": "0.42.0-beta6",
88
"magento/magento-composer-installer": "*"

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

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

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -554,33 +554,6 @@
554554
<label>Default No-route URL</label>
555555
</field>
556556
</group>
557-
<group id="cookie" translate="label" type="text" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1">
558-
<label>Default Cookie Settings</label>
559-
<field id="cookie_lifetime" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
560-
<label>Cookie Lifetime</label>
561-
<backend_model>Magento\Backend\Model\Config\Backend\Cookie\Lifetime</backend_model>
562-
</field>
563-
<field id="cookie_path" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
564-
<label>Cookie Path</label>
565-
<backend_model>Magento\Backend\Model\Config\Backend\Cookie\Path</backend_model>
566-
</field>
567-
<field id="cookie_domain" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
568-
<label>Cookie Domain</label>
569-
<backend_model>Magento\Backend\Model\Config\Backend\Cookie\Domain</backend_model>
570-
</field>
571-
<field id="cookie_httponly" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
572-
<label>Use HTTP Only</label>
573-
<comment>
574-
<![CDATA[<strong style="color:red">Warning</strong>: Do not set to "No". User security could be compromised.]]>
575-
</comment>
576-
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
577-
</field>
578-
<field id="cookie_restriction" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="0">
579-
<label>Cookie Restriction Mode</label>
580-
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
581-
<backend_model>Magento\Backend\Model\Config\Backend\Cookie</backend_model>
582-
</field>
583-
</group>
584557
<group id="session" translate="label" type="text" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="0">
585558
<label>Session Validation Settings</label>
586559
<field id="use_remote_addr" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="0" showInStore="0">

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

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

‎app/code/Magento/Bundle/Model/Source/Option/Type.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace Magento\Bundle\Model\Source\Option;
1010

11-
use Magento\Framework\Api\AttributeDataBuilder;
11+
use Magento\Framework\Api\AttributeValueFactory;
1212
use Magento\Framework\Api\MetadataServiceInterface;
1313

1414
class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
@@ -24,7 +24,7 @@ class Type extends \Magento\Framework\Model\AbstractExtensibleModel implements
2424
* @param \Magento\Framework\Model\Context $context
2525
* @param \Magento\Framework\Registry $registry
2626
* @param MetadataServiceInterface $metadataService
27-
* @param AttributeDataBuilder $customAttributeBuilder
27+
* @param AttributeValueFactory $customAttributeFactory
2828
* @param array $options
2929
* @param \Magento\Framework\Model\Resource\AbstractResource $resource
3030
* @param \Magento\Framework\Data\Collection\Db $resourceCollection
@@ -34,7 +34,7 @@ public function __construct(
3434
\Magento\Framework\Model\Context $context,
3535
\Magento\Framework\Registry $registry,
3636
MetadataServiceInterface $metadataService,
37-
AttributeDataBuilder $customAttributeBuilder,
37+
AttributeValueFactory $customAttributeFactory,
3838
array $options,
3939
\Magento\Framework\Model\Resource\AbstractResource $resource = null,
4040
\Magento\Framework\Data\Collection\Db $resourceCollection = null,
@@ -45,7 +45,7 @@ public function __construct(
4545
$context,
4646
$registry,
4747
$metadataService,
48-
$customAttributeBuilder,
48+
$customAttributeFactory,
4949
$resource,
5050
$resourceCollection,
5151
$data

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

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

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

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

0 commit comments

Comments
 (0)