Skip to content

Commit 980f658

Browse files
author
Paliarush, Alexander(apaliarush)
committed
Merge pull request #617 from magento-api/API-Sprint-57-PR
[API] Sprint 57
2 parents 4df90a4 + 34e0ff4 commit 980f658

File tree

10 files changed

+491
-16
lines changed

10 files changed

+491
-16
lines changed

app/code/Magento/Customer/Model/AccountManagement.php

100644100755
File mode changed.

app/code/Magento/Customer/Model/Resource/CustomerRepository.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,8 +340,7 @@ private function validate(\Magento\Customer\Api\Data\CustomerInterface $customer
340340

341341
$isEmailAddress = \Zend_Validate::is(
342342
$customer->getEmail(),
343-
'EmailAddress',
344-
['allow' => ['allow' => \Zend_Validate_Hostname::ALLOW_ALL, 'tld' => false]]
343+
'EmailAddress'
345344
);
346345

347346
if (!$isEmailAddress) {

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

100644100755
File mode changed.

app/code/Magento/Store/etc/cache.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
<label>Collections Data</label>
2323
<description>Collection data files.</description>
2424
</type>
25+
<type name="reflection" translate="label,description" instance="Magento\Framework\App\Cache\Type\Reflection">
26+
<label>Reflection Data</label>
27+
<description>API interfaces reflection data.</description>
28+
</type>
2529
<type name="db_ddl" translate="label,description" instance="Magento\Framework\DB\Adapter\DdlCache">
2630
<label>Database DDL operations</label>
2731
<description>Results of DDL queries, such as describing tables or indexes.</description>

app/code/Magento/Store/etc/di.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,11 @@
225225
</argument>
226226
</arguments>
227227
</type>
228+
<type name="Magento\Framework\Reflection\MethodsMap">
229+
<arguments>
230+
<argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Reflection</argument>
231+
</arguments>
232+
</type>
228233
<type name="Magento\Framework\Url">
229234
<arguments>
230235
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>

app/code/Magento/User/Model/Resource/User.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,8 +522,8 @@ public function lock($userIds, $exceptId, $lifetime)
522522
* Increment failures count along with updating lock expire and first failure dates
523523
*
524524
* @param ModelUser $user
525-
* @param int|false $setLockExpires
526-
* @param int|false $setFirstFailure
525+
* @param int|bool $setLockExpires
526+
* @param int|bool $setFirstFailure
527527
* @return void
528528
*/
529529
public function updateFailure($user, $setLockExpires = false, $setFirstFailure = false)

app/code/Magento/User/Test/Unit/Model/Resource/UserTest.php

Lines changed: 442 additions & 0 deletions
Large diffs are not rendered by default.

app/code/Magento/Webapi/etc/di.xml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,6 @@
2121
<type name="Magento\Framework\Xml\Generator" shared="false" />
2222
<type name="Magento\Framework\Xml\Parser" shared="false" />
2323
<type name="Magento\Framework\Code\Scanner\DirectoryScanner" shared="false" />
24-
<type name="Magento\Server\Reflection" shared="false" />
25-
<type name="Magento\Framework\Reflection\MethodsMap">
26-
<arguments>
27-
<argument name="cache" xsi:type="object">Magento\Framework\App\Cache\Type\Webapi</argument>
28-
</arguments>
29-
</type>
30-
<type name="Magento\Framework\Reflection\DataObjectProcessor">
31-
<arguments>
32-
<argument name="extensionAttributesProcessor" xsi:type="object">Magento\Framework\Reflection\ExtensionAttributesProcessor\Proxy</argument>
33-
<argument name="customAttributesProcessor" xsi:type="object">Magento\Framework\Reflection\CustomAttributesProcessor\Proxy</argument>
34-
</arguments>
35-
</type>
3624
<type name="Magento\Integration\Model\ConfigBasedIntegrationManager">
3725
<plugin name="webapiSetup" type="Magento\Webapi\Model\Plugin\Manager" />
3826
</type>

app/etc/di.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1048,6 +1048,13 @@
10481048
</argument>
10491049
</arguments>
10501050
</type>
1051+
<type name="Magento\Server\Reflection" shared="false" />
1052+
<type name="Magento\Framework\Reflection\DataObjectProcessor">
1053+
<arguments>
1054+
<argument name="extensionAttributesProcessor" xsi:type="object">Magento\Framework\Reflection\ExtensionAttributesProcessor\Proxy</argument>
1055+
<argument name="customAttributesProcessor" xsi:type="object">Magento\Framework\Reflection\CustomAttributesProcessor\Proxy</argument>
1056+
</arguments>
1057+
</type>
10511058
<type name="Magento\Framework\Url\Decoder">
10521059
<arguments>
10531060
<argument name="urlBuilder" xsi:type="object">Magento\Framework\UrlInterface</argument>
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Framework\App\Cache\Type;
7+
8+
/**
9+
* System / Cache Management / Cache type "Reflection Data"
10+
*/
11+
class Reflection extends \Magento\Framework\Cache\Frontend\Decorator\TagScope
12+
{
13+
/**
14+
* Cache type code unique among all cache types
15+
*/
16+
const TYPE_IDENTIFIER = 'reflection';
17+
18+
/**
19+
* Cache tag used to distinguish the cache type from all other cache
20+
*/
21+
const CACHE_TAG = 'REFLECTION';
22+
23+
/**
24+
* @param \Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool
25+
*/
26+
public function __construct(\Magento\Framework\App\Cache\Type\FrontendPool $cacheFrontendPool)
27+
{
28+
parent::__construct($cacheFrontendPool->get(self::TYPE_IDENTIFIER), self::CACHE_TAG);
29+
}
30+
}

0 commit comments

Comments
 (0)