Skip to content

Commit e7d670d

Browse files
author
Mariana Lashch
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into port-0412
2 parents b4f184c + cf69967 commit e7d670d

File tree

43 files changed

+178
-116
lines changed

Some content is hidden

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

43 files changed

+178
-116
lines changed

‎app/autoload.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
/* 'composer install' validation */
2929
if (file_exists($vendorAutoload)) {
3030
$composerAutoloader = include $vendorAutoload;
31+
} else if (file_exists("{$vendorDir}/autoload.php")) {
32+
$vendorAutoload = "{$vendorDir}/autoload.php";
33+
$composerAutoloader = include $vendorAutoload;
3134
} else {
3235
throw new \Exception(
3336
'Vendor autoload is not found. Please run \'composer install\' under application root directory.'

‎app/bootstrap.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
#ini_set('display_errors', 1);
1212

1313
/* PHP version validation */
14-
if (!defined('PHP_VERSION_ID') || !(PHP_VERSION_ID === 70002 || PHP_VERSION_ID === 70004 || PHP_VERSION_ID >= 70006)) {
14+
if (!defined('PHP_VERSION_ID') || PHP_VERSION_ID < 70103) {
1515
if (PHP_SAPI == 'cli') {
16-
echo 'Magento supports 7.0.2, 7.0.4, and 7.0.6 or later. ' .
17-
'Please read http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html';
16+
echo 'Magento supports PHP 7.1.3 or later. ' .
17+
'Please read https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html';
1818
} else {
1919
echo <<<HTML
2020
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<p>Magento supports PHP 7.0.2, 7.0.4, and 7.0.6 or later. Please read
22-
<a target="_blank" href="http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements.html">
21+
<p>Magento supports PHP 7.1.3 or later. Please read
22+
<a target="_blank" href="https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements-tech.html">
2323
Magento System Requirements</a>.
2424
</div>
2525
HTML;

‎app/code/Magento/Customer/Model/Customer/DataProvider.php

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@
2525
use Magento\Framework\Session\SessionManagerInterface;
2626
use Magento\Framework\View\Element\UiComponent\ContextInterface;
2727
use Magento\Framework\View\Element\UiComponent\DataProvider\FilterPool;
28+
use Magento\Ui\Component\Form\Element\Multiline;
2829
use Magento\Ui\Component\Form\Field;
2930
use Magento\Ui\DataProvider\EavValidationRules;
3031

3132
/**
33+
* Supplies the data for the customer UI component
34+
*
3235
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
3336
*
3437
* @api
@@ -155,10 +158,11 @@ class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider
155158
* @param Config $eavConfig
156159
* @param FilterPool $filterPool
157160
* @param FileProcessorFactory $fileProcessorFactory
158-
* @param ContextInterface $context
159161
* @param array $meta
160162
* @param array $data
163+
* @param ContextInterface $context
161164
* @param bool $allowToShowHiddenAttributes
165+
* @throws \Magento\Framework\Exception\LocalizedException
162166
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
163167
*/
164168
public function __construct(
@@ -596,8 +600,14 @@ protected function prepareAddressData($addressId, array &$addresses, array $cust
596600
) {
597601
$addresses[$addressId]['default_shipping'] = $customer['default_shipping'];
598602
}
599-
if (isset($addresses[$addressId]['street']) && !is_array($addresses[$addressId]['street'])) {
600-
$addresses[$addressId]['street'] = explode("\n", $addresses[$addressId]['street']);
603+
604+
foreach ($this->meta['address']['children'] as $attributeName => $attributeMeta) {
605+
if ($attributeMeta['arguments']['data']['config']['dataType'] === Multiline::NAME
606+
&& isset($addresses[$addressId][$attributeName])
607+
&& !is_array($addresses[$addressId][$attributeName])
608+
) {
609+
$addresses[$addressId][$attributeName] = explode("\n", $addresses[$addressId][$attributeName]);
610+
}
601611
}
602612
}
603613

‎app/code/Magento/Customer/Test/Unit/Model/Customer/DataProviderTest.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -649,10 +649,8 @@ public function testGetData()
649649
2 => [
650650
'firstname' => 'firstname',
651651
'lastname' => 'lastname',
652-
'street' => [
653-
'street',
654-
'street',
655-
],
652+
// Won't be an array because it isn't defined as a multiline field in this test
653+
'street' => "street\nstreet",
656654
'default_billing' => 2,
657655
'default_shipping' => 2,
658656
]

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,39 +11,39 @@
1111
<label>Newsletter</label>
1212
<tab>customer</tab>
1313
<resource>Magento_Newsletter::newsletter</resource>
14-
<group id="subscription" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1">
14+
<group id="subscription" translate="label" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
1515
<label>Subscription Options</label>
16-
<field id="allow_guest_subscribe" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
16+
<field id="allow_guest_subscribe" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
1717
<label>Allow Guest Subscription</label>
1818
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
1919
</field>
20-
<field id="confirm" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
20+
<field id="confirm" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2121
<label>Need to Confirm</label>
2222
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
2323
</field>
24-
<field id="confirm_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
24+
<field id="confirm_email_identity" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2525
<label>Confirmation Email Sender</label>
2626
<source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
2727
</field>
28-
<field id="confirm_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
28+
<field id="confirm_email_template" translate="label comment" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
2929
<label>Confirmation Email Template</label>
3030
<comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
3131
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
3232
</field>
33-
<field id="success_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
33+
<field id="success_email_identity" translate="label" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
3434
<label>Success Email Sender</label>
3535
<source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
3636
</field>
37-
<field id="success_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
37+
<field id="success_email_template" translate="label comment" type="select" sortOrder="60" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
3838
<label>Success Email Template</label>
3939
<comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
4040
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>
4141
</field>
42-
<field id="un_email_identity" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
42+
<field id="un_email_identity" translate="label" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
4343
<label>Unsubscription Email Sender</label>
4444
<source_model>Magento\Config\Model\Config\Source\Email\Identity</source_model>
4545
</field>
46-
<field id="un_email_template" translate="label comment" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
46+
<field id="un_email_template" translate="label comment" type="select" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
4747
<label>Unsubscription Email Template</label>
4848
<comment>Email template chosen based on theme fallback when "Default" option is selected.</comment>
4949
<source_model>Magento\Config\Model\Config\Source\Email\Template</source_model>

‎lib/internal/Magento/Framework/Acl/Loader/ResourceLoader.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
use Magento\Framework\Acl\AclResource\ProviderInterface;
1313
use Magento\Framework\Acl\AclResourceFactory;
1414

15+
/**
16+
* ACL Loader
17+
*/
1518
class ResourceLoader implements \Magento\Framework\Acl\LoaderInterface
1619
{
1720
/**
1821
* Acl resource config
1922
*
20-
* @var ProviderInterface $resourceProvider
23+
* @var ProviderInterface
2124
*/
2225
protected $_resourceProvider;
2326

‎lib/internal/Magento/Framework/Amqp/Queue.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class Queue implements QueueInterface
3737
private $envelopeFactory;
3838

3939
/**
40-
* @var LoggerInterface $logger
40+
* @var LoggerInterface
4141
*/
4242
private $logger;
4343

@@ -63,7 +63,7 @@ public function __construct(
6363
}
6464

6565
/**
66-
* {@inheritdoc}
66+
* @inheritdoc
6767
* @since 100.0.0
6868
*/
6969
public function dequeue()
@@ -98,7 +98,7 @@ public function dequeue()
9898
}
9999

100100
/**
101-
* {@inheritdoc}
101+
* @inheritdoc
102102
* @since 100.0.0
103103
*/
104104
public function acknowledge(EnvelopeInterface $envelope)
@@ -119,7 +119,7 @@ public function acknowledge(EnvelopeInterface $envelope)
119119
}
120120

121121
/**
122-
* {@inheritdoc}
122+
* @inheritdoc
123123
* @since 100.0.0
124124
*/
125125
public function subscribe($callback)
@@ -153,7 +153,7 @@ public function subscribe($callback)
153153
}
154154

155155
/**
156-
* (@inheritdoc)
156+
* @inheritdoc
157157
* @since 100.0.0
158158
*/
159159
public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionMessage = null)
@@ -172,7 +172,7 @@ public function reject(EnvelopeInterface $envelope, $requeue = true, $rejectionM
172172
}
173173

174174
/**
175-
* (@inheritdoc)
175+
* @inheritdoc
176176
* @since 100.0.0
177177
*/
178178
public function push(EnvelopeInterface $envelope)

‎lib/internal/Magento/Framework/Api/SearchCriteria/CollectionProcessor/JoinProcessor.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
use Magento\Framework\Api\SearchCriteriaInterface;
1111
use Magento\Framework\Data\Collection\AbstractDb;
1212

13+
/**
14+
* Search criteria join processor
15+
*/
1316
class JoinProcessor implements CollectionProcessorInterface
1417
{
1518
/**
@@ -28,7 +31,7 @@ class JoinProcessor implements CollectionProcessorInterface
2831
private $appliedFields = [];
2932

3033
/**
31-
* @param CustomJoinInterface[] $customFilters
34+
* @param CustomJoinInterface[] $customJoins
3235
* @param array $fieldMapping
3336
*/
3437
public function __construct(

‎lib/internal/Magento/Framework/Api/Test/Unit/ExtensionAttribute/Config/SchemaLocatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class SchemaLocatorTest extends \PHPUnit\Framework\TestCase
1515
*/
1616
protected $model;
1717

18-
/** @var \Magento\Framework\Config\Dom\UrnResolver $urnResolverMock */
18+
/** @var \Magento\Framework\Config\Dom\UrnResolver */
1919
protected $urnResolver;
2020

2121
protected function setUp()

‎lib/internal/Magento/Framework/App/ResourceConnection.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111

1212
/**
1313
* Application provides ability to configure multiple connections to persistent storage.
14+
*
1415
* This class provides access to all these connections.
16+
*
1517
* @api
1618
*/
1719
class ResourceConnection
@@ -53,7 +55,7 @@ class ResourceConnection
5355
protected $connectionFactory;
5456

5557
/**
56-
* @var DeploymentConfig $deploymentConfig
58+
* @var DeploymentConfig
5759
*/
5860
private $deploymentConfig;
5961

0 commit comments

Comments
 (0)