Skip to content

Commit b5eefe5

Browse files
author
Joan He
committed
Merge remote-tracking branch 'engcom/libs-upgrade' into fix-calls-count
2 parents 05e2da8 + 9d53562 commit b5eefe5

File tree

4 files changed

+59
-59
lines changed

4 files changed

+59
-59
lines changed

app/code/Magento/SwaggerWebapi/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
8+
"php": "~7.1.3||~7.2.0",
99
"magento/framework": "100.3.*",
1010
"magento/module-swagger": "100.3.*"
1111
},

app/code/Magento/SwaggerWebapiAsync/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"sort-packages": true
66
},
77
"require": {
8+
"php": "~7.1.3||~7.2.0",
89
"magento/framework": "100.3.*",
9-
"magento/module-swagger": "100.3.*",
10-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0"
10+
"magento/module-swagger": "100.3.*"
1111
},
1212
"suggest": {
1313
"magento/module-config": "100.3.*"

app/code/Magento/WebapiAsync/Test/Unit/Controller/RestTest.php

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ protected function setUp()
104104
$this->requestMock->expects($this->any())->method('getHttpHost')->willReturn('testHostName.com');
105105
$this->responseMock = $this->getResponseMock();
106106
$routerMock = $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router::class)->setMethods(['match'])
107-
->disableOriginalConstructor()->getMock();
107+
->disableOriginalConstructor()->getMock();
108108

109109
$this->routeMock = $this->getRouteMock();
110110
$this->serviceMock = $this->getMockBuilder(self::SERVICE_ID)->setMethods([self::SERVICE_METHOD])
111-
->disableOriginalConstructor()->getMock();
111+
->disableOriginalConstructor()->getMock();
112112

113113
$this->oauthServiceMock = $this->getMockBuilder(\Magento\Framework\Oauth\OauthInterface::class)
114-
->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass();
114+
->setMethods(['validateAccessTokenRequest'])->getMockForAbstractClass();
115115
$this->authorizationMock = $this->getMockBuilder(\Magento\Framework\Webapi\Authorization::class)
116116
->disableOriginalConstructor()->getMock();
117117

@@ -125,7 +125,7 @@ protected function setUp()
125125
->getMockForAbstractClass();
126126

127127
$layoutMock = $this->getMockBuilder(\Magento\Framework\View\LayoutInterface::class)
128-
->disableOriginalConstructor()->getMock();
128+
->disableOriginalConstructor()->getMock();
129129

130130
$errorProcessorMock = $this->createMock(\Magento\Framework\Webapi\ErrorProcessor::class);
131131
$errorProcessorMock->expects($this->any())->method('maskException')->will($this->returnArgument(0));
@@ -166,14 +166,14 @@ protected function setUp()
166166

167167
$this->routeMock->expects($this->any())->method('getServiceClass')->will($this->returnValue(self::SERVICE_ID));
168168
$this->routeMock->expects($this->any())->method('getServiceMethod')
169-
->will($this->returnValue(self::SERVICE_METHOD));
169+
->will($this->returnValue(self::SERVICE_METHOD));
170170

171171
$routerMock->expects($this->any())->method('match')->will($this->returnValue($this->routeMock));
172172

173173
$objectManagerMock->expects($this->any())->method('get')->will($this->returnValue($this->serviceMock));
174174
$this->responseMock->expects($this->any())->method('prepareResponse')->will($this->returnValue([]));
175175
$this->serviceMock->expects($this->any())->method(self::SERVICE_METHOD)->will($this->returnValue(null));
176-
176+
177177
$dataObjectProcessorMock->expects($this->any())->method('getMethodReturnType')
178178
->with(self::SERVICE_ID, self::SERVICE_METHOD)
179179
->will($this->returnValue('null'));
@@ -189,12 +189,12 @@ public function testDispatchSchemaRequest()
189189
\Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'foo',
190190
];
191191
$this->requestMock->expects($this->any())
192-
->method('getPathInfo')
193-
->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH);
192+
->method('getPathInfo')
193+
->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH);
194194

195195
$this->requestMock->expects($this->any())
196-
->method('getParams')
197-
->will($this->returnValue($params));
196+
->method('getParams')
197+
->will($this->returnValue($params));
198198

199199
$schema = 'Some REST schema content';
200200
$this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
@@ -209,25 +209,25 @@ public function testDispatchAllSchemaRequest()
209209
\Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES => 'all',
210210
];
211211
$this->requestMock->expects($this->any())
212-
->method('getPathInfo')
213-
->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH);
212+
->method('getPathInfo')
213+
->willReturn(AsynchronousSchemaRequestProcessor::PROCESSOR_PATH);
214214
$this->requestMock->expects($this->any())
215-
->method('getParam')
216-
->will(
217-
$this->returnValueMap([
218-
[
219-
\Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES,
220-
null,
221-
'all',
222-
],
223-
])
224-
);
215+
->method('getParam')
216+
->will(
217+
$this->returnValueMap([
218+
[
219+
\Magento\Framework\Webapi\Request::REQUEST_PARAM_SERVICES,
220+
null,
221+
'all',
222+
],
223+
])
224+
);
225225
$this->requestMock->expects($this->any())
226-
->method('getParams')
227-
->will($this->returnValue($params));
226+
->method('getParams')
227+
->will($this->returnValue($params));
228228
$this->requestMock->expects($this->any())
229-
->method('getRequestedServices')
230-
->will($this->returnValue('all'));
229+
->method('getRequestedServices')
230+
->will($this->returnValue('all'));
231231

232232
$schema = 'Some REST schema content';
233233
$this->swaggerGeneratorMock->expects($this->any())->method('generate')->willReturn($schema);
@@ -244,9 +244,9 @@ private function getRequestProccessotPoolMock()
244244
$objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this);
245245

246246
$this->swaggerGeneratorMock = $this->getMockBuilder(\Magento\Webapi\Model\Rest\Swagger\Generator::class)
247-
->disableOriginalConstructor()
248-
->setMethods(['generate', 'getListOfServices'])
249-
->getMockForAbstractClass();
247+
->disableOriginalConstructor()
248+
->setMethods(['generate', 'getListOfServices'])
249+
->getMockForAbstractClass();
250250

251251
$this->asyncSchemaRequestProcessor = $objectManager->getObject(
252252
\Magento\WebapiAsync\Controller\Rest\AsynchronousSchemaRequestProcessor::class,
@@ -258,9 +258,9 @@ private function getRequestProccessotPoolMock()
258258

259259
$this->asyncRequestProcessor =
260260
$this->getMockBuilder(\Magento\WebapiAsync\Controller\Rest\AsynchronousRequestProcessor::class)
261-
->setMethods(['process'])
262-
->disableOriginalConstructor()
263-
->getMock();
261+
->setMethods(['process'])
262+
->disableOriginalConstructor()
263+
->getMock();
264264

265265
return $objectManager->getObject(
266266
\Magento\Webapi\Controller\Rest\RequestProcessorPool::class,
@@ -279,14 +279,14 @@ private function getRequestProccessotPoolMock()
279279
private function getRouteMock()
280280
{
281281
return $this->getMockBuilder(\Magento\Webapi\Controller\Rest\Router\Route::class)
282-
->setMethods([
283-
'isSecure',
284-
'getServiceMethod',
285-
'getServiceClass',
286-
'getAclResources',
287-
'getParameters',
288-
])
289-
->disableOriginalConstructor()->getMock();
282+
->setMethods([
283+
'isSecure',
284+
'getServiceMethod',
285+
'getServiceClass',
286+
'getAclResources',
287+
'getParameters',
288+
])
289+
->disableOriginalConstructor()->getMock();
290290
}
291291

292292
/**
@@ -295,18 +295,18 @@ private function getRouteMock()
295295
private function getRequestMock()
296296
{
297297
return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Request::class)
298-
->setMethods(
299-
[
300-
'isSecure',
301-
'getRequestData',
302-
'getParams',
303-
'getParam',
304-
'getRequestedServices',
305-
'getPathInfo',
306-
'getHttpHost',
307-
'getMethod',
308-
]
309-
)->disableOriginalConstructor()->getMock();
298+
->setMethods(
299+
[
300+
'isSecure',
301+
'getRequestData',
302+
'getParams',
303+
'getParam',
304+
'getRequestedServices',
305+
'getPathInfo',
306+
'getHttpHost',
307+
'getMethod',
308+
]
309+
)->disableOriginalConstructor()->getMock();
310310
}
311311

312312
/**
@@ -315,8 +315,8 @@ private function getRequestMock()
315315
private function getResponseMock()
316316
{
317317
return $this->getMockBuilder(\Magento\Framework\Webapi\Rest\Response::class)
318-
->setMethods(['sendResponse', 'prepareResponse', 'setHeader'])
319-
->disableOriginalConstructor()
320-
->getMock();
318+
->setMethods(['sendResponse', 'prepareResponse', 'setHeader'])
319+
->disableOriginalConstructor()
320+
->getMock();
321321
}
322322
}

app/code/Magento/WebapiAsync/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
8+
"php": "~7.1.3||~7.2.0",
99
"magento/framework": "100.3.*",
1010
"magento/module-webapi": "100.3.*",
1111
"magento/module-asynchronous-operations": "100.3.*"

0 commit comments

Comments
 (0)