File tree Expand file tree Collapse file tree 11 files changed +27
-28
lines changed
dev/tests/integration/testsuite/Magento/Eav/Model
lib/internal/Magento/Framework/Webapi Expand file tree Collapse file tree 11 files changed +27
-28
lines changed Original file line number Diff line number Diff line change 7
7
namespace Magento \Eav \Model ;
8
8
9
9
use Magento \Framework \Reflection \TypeProcessor ;
10
- use Magento \Framework \Webapi \CustomAttribute \ TypeLocatorInterface ;
10
+ use Magento \Framework \Webapi \CustomAttributeTypeLocatorInterface ;
11
11
12
12
/**
13
13
* Class to locate types for Eav custom attributes
14
14
*/
15
- class TypeLocator implements TypeLocatorInterface
15
+ class TypeLocator implements CustomAttributeTypeLocatorInterface
16
16
{
17
17
/**
18
- * @var \Magento\Framework\Webapi\CustomAttribute\TypeLocatorInterface []
18
+ * @var \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface []
19
19
*/
20
20
private $ typeLocators ;
21
21
22
22
/**
23
- * Initialize CustomAttributeTypeLocator
23
+ * Initialize TypeLocator
24
24
*
25
- * @param \Magento\Framework\Webapi\CustomAttribute\TypeLocatorInterface [] $typeLocators
25
+ * @param \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface [] $typeLocators
26
26
*/
27
27
public function __construct (
28
28
array $ typeLocators = []
Original file line number Diff line number Diff line change 9
9
use Magento \Eav \Api \AttributeRepositoryInterface ;
10
10
use Magento \Framework \Stdlib \StringUtils ;
11
11
use Magento \Framework \Reflection \TypeProcessor ;
12
- use Magento \Framework \Webapi \CustomAttribute \ TypeLocatorInterface ;
12
+ use Magento \Framework \Webapi \CustomAttributeTypeLocatorInterface ;
13
13
use Magento \Framework \Webapi \CustomAttribute \ServiceTypeListInterface ;
14
14
use Magento \Framework \Exception \NoSuchEntityException ;
15
15
16
16
/**
17
17
* Class to locate complex types for EAV custom attributes
18
18
*/
19
- class ComplexType implements ServiceTypeListInterface, TypeLocatorInterface
19
+ class ComplexType implements ServiceTypeListInterface, CustomAttributeTypeLocatorInterface
20
20
{
21
21
/**
22
22
* @var StringUtils
Original file line number Diff line number Diff line change 9
9
use Magento \Framework \Exception \NoSuchEntityException ;
10
10
use Magento \Framework \Reflection \TypeProcessor ;
11
11
use Magento \Eav \Api \AttributeRepositoryInterface ;
12
- use Magento \Framework \Webapi \CustomAttribute \ TypeLocatorInterface ;
12
+ use Magento \Framework \Webapi \CustomAttributeTypeLocatorInterface ;
13
13
14
14
/**
15
15
* Class to locate simple types for Eav custom attributes
16
16
*/
17
- class SimpleType implements TypeLocatorInterface
17
+ class SimpleType implements CustomAttributeTypeLocatorInterface
18
18
{
19
19
/**
20
20
* @var AttributeRepositoryInterface
Original file line number Diff line number Diff line change 13
13
use Magento \Framework \TestFramework \Unit \Helper \ObjectManager ;
14
14
15
15
/**
16
- * Unit test class for \Magento\Eav\Model\CustomAttributeTypeLocator
16
+ * Unit test class for \Magento\Eav\Model\TypeLocator
17
17
*/
18
- class CustomAttributeTypeLocatorTest extends \PHPUnit \Framework \TestCase
18
+ class TypeLocatorTest extends \PHPUnit \Framework \TestCase
19
19
{
20
20
/**
21
21
* @var TypeLocator
Original file line number Diff line number Diff line change 24
24
<preference for =" Magento\Eav\Api\Data\AttributeSearchResultsInterface" type =" Magento\Framework\Api\SearchResults" />
25
25
<preference for =" Magento\Eav\Api\Data\AttributeSetSearchResultsInterface" type =" Magento\Framework\Api\SearchResults" />
26
26
<preference for =" Magento\Eav\Api\Data\AttributeGroupSearchResultsInterface" type =" Magento\Framework\Api\SearchResults" />
27
- <preference for =" Magento\Framework\Webapi\CustomAttribute\TypeLocatorInterface " type =" Magento\Eav\Model\TypeLocator" />
27
+ <preference for =" Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface " type =" Magento\Eav\Model\TypeLocator" />
28
28
29
29
<type name =" Magento\Eav\Model\Entity\Attribute\Config" >
30
30
<arguments >
Original file line number Diff line number Diff line change 8
8
9
9
use Magento \Framework \Exception \LocalizedException ;
10
10
use Magento \Framework \Reflection \TypeProcessor ;
11
- use Magento \Framework \Webapi \CustomAttribute \ TypeLocatorInterface ;
11
+ use Magento \Framework \Webapi \CustomAttributeTypeLocatorInterface ;
12
12
use Magento \Framework \GraphQl \Exception \GraphQlInputException ;
13
13
use Magento \Framework \GraphQl \ArgumentInterface ;
14
14
use Magento \GraphQl \Model \ResolverInterface ;
20
20
class CustomAttributeMetadata implements ResolverInterface
21
21
{
22
22
/**
23
- * @var TypeLocatorInterface
23
+ * @var CustomAttributeTypeLocatorInterface
24
24
*/
25
25
private $ typeLocator ;
26
26
@@ -30,11 +30,11 @@ class CustomAttributeMetadata implements ResolverInterface
30
30
private $ typeProcessor ;
31
31
32
32
/**
33
- * @param TypeLocatorInterface $typeLocator
33
+ * @param CustomAttributeTypeLocatorInterface $typeLocator
34
34
* @param TypeProcessor $typeProcessor
35
35
*/
36
36
public function __construct (
37
- TypeLocatorInterface $ typeLocator ,
37
+ CustomAttributeTypeLocatorInterface $ typeLocator ,
38
38
TypeProcessor $ typeProcessor
39
39
) {
40
40
$ this ->typeLocator = $ typeLocator ;
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
30
30
protected $ typeProcessorMock ;
31
31
32
32
/**
33
- * @var \Magento\Framework\Webapi\CustomAttribute\TypeLocatorInterface |\PHPUnit_Framework_MockObject_MockObject
33
+ * @var \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface |\PHPUnit_Framework_MockObject_MockObject
34
34
*/
35
35
protected $ customAttributeTypeLocatorMock ;
36
36
@@ -74,7 +74,7 @@ protected function setUp()
74
74
->will ($ this ->returnValue (self ::OPERATION_NAME ));
75
75
76
76
$ this ->customAttributeTypeLocatorMock = $ this ->getMockBuilder (
77
- \Magento \Framework \Webapi \CustomAttribute \TypeLocatorInterface ::class
77
+ \Magento \Framework \Webapi \CustomAttributeTypeLocatorInterface ::class
78
78
)->disableOriginalConstructor ()
79
79
->getMock ();
80
80
$ this ->customAttributeTypeLocatorMock ->expects ($ this ->any ())
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ class GeneratorTest extends \PHPUnit\Framework\TestCase
17
17
protected $ _wsdlGenerator ;
18
18
19
19
/**
20
- * @var \Magento\Framework\Webapi\CustomAttribute\TypeLocatorInterface |\PHPUnit_Framework_MockObject_MockObject
20
+ * @var \Magento\Framework\Webapi\CustomAttributeTypeLocatorInterface |\PHPUnit_Framework_MockObject_MockObject
21
21
*/
22
22
protected $ customAttributeTypeLocator = null ;
23
23
Original file line number Diff line number Diff line change 8
8
9
9
use Magento \TestFramework \Helper \Bootstrap ;
10
10
11
- class CustomAttributeTypeLocatorTest extends \PHPUnit \Framework \TestCase
11
+ class TypeLocatorTest extends \PHPUnit \Framework \TestCase
12
12
{
13
13
/**
14
14
* @var TypeLocator
Original file line number Diff line number Diff line change 4
4
* See COPYING.txt for license details.
5
5
*/
6
6
7
- namespace Magento \Framework \Webapi \ CustomAttribute ;
7
+ namespace Magento \Framework \Webapi ;
8
8
9
9
/**
10
10
* Interface to locate types for custom attributes
11
11
*/
12
- interface TypeLocatorInterface
12
+ interface CustomAttributeTypeLocatorInterface
13
13
{
14
14
/**
15
15
* Get Data Interface type for a given custom attribute code
You can’t perform that action at this time.
0 commit comments