Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix type hints and add undefined property in Webapi [2.3-develop] #16135

Merged
merged 3 commits into from
Jun 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions app/code/Magento/Webapi/Controller/Soap.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ class Soap implements \Magento\Framework\App\FrontControllerInterface
*/
protected $_errorProcessor;

/**
* @var \Magento\Framework\App\State
*/
protected $_appState;

/**
* @var \Magento\Framework\Locale\ResolverInterface
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public function __construct(
*
* @param string $operation
* @param array $arguments
* @return \stdClass|null
* @return array
* @throws WebapiException
* @throws \LogicException
* @throws AuthorizationException
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class GuestAuthorization
* Check if resource for which access is needed has anonymous permissions defined in webapi config.
*
* @param \Magento\Framework\Authorization $subject
* @param callable $proceed
* @param \Closure $proceed
* @param string $resource
* @param string $privilege
* @return bool true If resource permission is anonymous,
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Webapi/Model/Soap/Server.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class Server
const REQUEST_PARAM_LIST_WSDL = 'wsdl_list';

/**
* @var \Magento\Framework\App\AreaLIst
* @var \Magento\Framework\App\AreaList
*/
protected $_areaList;

Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Webapi/Test/Unit/Model/Soap/FaultTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function testToXmlDeveloperModeOff()
public function testToXmlDeveloperModeOn()
{
$this->_appStateMock->expects($this->any())->method('getMode')->will($this->returnValue('developer'));
$actualXml = $this->_soapFault->toXml(true);
$actualXml = $this->_soapFault->toXml();
$this->assertContains('<m:Trace>', $actualXml, 'Exception trace is not found in XML.');
}

Expand Down