Skip to content

Commit 8acf126

Browse files
committed
MAGETWO-36095: Remove Banners API annotation
1 parent 163477d commit 8acf126

File tree

7 files changed

+14
-10
lines changed

7 files changed

+14
-10
lines changed

app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ protected function _toHtml()
7979
/**
8080
* Returns captcha model
8181
*
82-
* @return \Magento\Captcha\Model\ModelInterface
82+
* @return \Magento\Captcha\Model\CaptchaInterface
8383
*/
8484
public function getCaptchaModel()
8585
{

app/code/Magento/Captcha/Helper/Data.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public function __construct(
8181
* Get Captcha
8282
*
8383
* @param string $formId
84-
* @return \Magento\Captcha\Model\ModelInterface
84+
* @return \Magento\Captcha\Model\CaptchaInterface
8585
*/
8686
public function getCaptcha($formId)
8787
{

app/code/Magento/Captcha/Model/CaptchaFactory.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,17 @@ public function __construct(\Magento\Framework\ObjectManagerInterface $objectMan
2727
*
2828
* @param string $captchaType
2929
* @param string $formId
30-
* @return \Magento\Captcha\Model\ModelInterface
30+
* @return \Magento\Captcha\Model\CaptchaInterface
3131
* @throws \InvalidArgumentException
3232
*/
3333
public function create($captchaType, $formId)
3434
{
3535
$className = 'Magento\Captcha\Model\\' . ucfirst($captchaType);
3636

3737
$instance = $this->_objectManager->create($className, ['formId' => $formId]);
38-
if (!$instance instanceof \Magento\Captcha\Model\ModelInterface) {
38+
if (!$instance instanceof \Magento\Captcha\Model\CaptchaInterface) {
3939
throw new \InvalidArgumentException(
40-
$className . ' does not implement \Magento\Captcha\Model\ModelInterface'
40+
$className . ' does not implement \Magento\Captcha\Model\CaptchaInterface'
4141
);
4242
}
4343
return $instance;

app/code/Magento/Captcha/Model/ModelInterface.php renamed to app/code/Magento/Captcha/Model/CaptchaInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
*
1313
* @api
1414
*/
15-
interface ModelInterface
15+
interface CaptchaInterface
1616
{
1717
/**
1818
* Generates captcha

app/code/Magento/Captcha/Model/DefaultModel.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
* @author Magento Core Team <core@magentocommerce.com>
1212
*/
13-
class DefaultModel extends \Zend_Captcha_Image implements \Magento\Captcha\Model\ModelInterface
13+
class DefaultModel extends \Zend_Captcha_Image implements \Magento\Captcha\Model\CaptchaInterface
1414
{
1515
/**
1616
* Key in session for captcha code

app/code/Magento/Captcha/Test/Unit/Model/CaptchaFactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function testCreateNegative()
5858
'InvalidArgumentException',
5959
'Magento\Captcha\Model\\' . ucfirst(
6060
$captchaType
61-
) . ' does not implement \Magento\Captcha\Model\ModelInterface'
61+
) . ' does not implement \Magento\Captcha\Model\CaptchaInterface'
6262
);
6363

6464
$this->assertEquals($defaultCaptchaMock, $this->_model->create($captchaType, 'form_id'));

app/code/Magento/Widget/Model/Widget.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Widget model for different purposes
13-
*
14-
* @api
1513
*/
1614
class Widget
1715
{
@@ -86,6 +84,7 @@ public function __construct(
8684
*
8785
* @param string $type Widget type
8886
* @return null|array
87+
* @api
8988
*/
9089
public function getWidgetByClassType($type)
9190
{
@@ -108,6 +107,7 @@ public function getWidgetByClassType($type)
108107
*
109108
* @param string $type Widget type
110109
* @return null|\Magento\Framework\Simplexml\Element
110+
* @api
111111
*/
112112
public function getConfigAsXml($type)
113113
{
@@ -121,6 +121,7 @@ public function getConfigAsXml($type)
121121
* @return \Magento\Framework\Object
122122
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
123123
* @SuppressWarnings(PHPMD.NPathComplexity)
124+
* @api
124125
*/
125126
public function getConfigAsObject($type)
126127
{
@@ -185,6 +186,7 @@ public function getConfigAsObject($type)
185186
*
186187
* @param array $filters Key-value array of filters for widget node properties
187188
* @return array
189+
* @api
188190
*/
189191
public function getWidgets($filters = [])
190192
{
@@ -215,6 +217,7 @@ public function getWidgets($filters = [])
215217
*
216218
* @param array $filters Key-value array of filters for widget node properties
217219
* @return array
220+
* @api
218221
*/
219222
public function getWidgetsArray($filters = [])
220223
{
@@ -241,6 +244,7 @@ public function getWidgetsArray($filters = [])
241244
* @param array $params Pre-configured Widget Params
242245
* @param bool $asIs Return result as widget directive(true) or as placeholder image(false)
243246
* @return string Widget directive ready to parse
247+
* @api
244248
*/
245249
public function getWidgetDeclaration($type, $params = [], $asIs = true)
246250
{

0 commit comments

Comments
 (0)