Skip to content

Commit 8d64c71

Browse files
authored
Merge pull request #1036 from magento-jackalopes/okopylova-api
MAGETWO-65670: Add @api Annotation in CmsUrlRewrite Module
2 parents 1a45542 + 065a4d0 commit 8d64c71

File tree

122 files changed

+297
-174
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+297
-174
lines changed

app/code/Magento/CatalogWidget/Model/Rule.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
use Magento\Framework\Api\ExtensionAttributesFactory;
1010

1111
/**
12-
* Class Rule
12+
* Rule for catalog widget
13+
*
14+
* @api
1315
*/
1416
class Rule extends \Magento\Rule\Model\AbstractModel
1517
{

app/code/Magento/CatalogWidget/Model/Rule/Condition/Combine.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
namespace Magento\CatalogWidget\Model\Rule\Condition;
67

78
/**
8-
* CatalogWidget Rule Combine Condition data model
9+
* Combination of product conditions
910
*/
10-
namespace Magento\CatalogWidget\Model\Rule\Condition;
11-
1211
class Combine extends \Magento\Rule\Model\Condition\Combine
1312
{
1413
/**
@@ -54,7 +53,7 @@ public function getNewChildSelectOptions()
5453
foreach ($productAttributes as $code => $label) {
5554
if (!in_array($code, $this->excludedAttributes)) {
5655
$attributes[] = [
57-
'value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|' . $code,
56+
'value' => Product::class . '|' . $code,
5857
'label' => $label,
5958
];
6059
}

app/code/Magento/Cms/Model/Wysiwyg/Config.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
/**
1313
* Wysiwyg Config for Editor HTML Element
14+
*
15+
* @api
1416
*/
1517
class Config extends \Magento\Framework\DataObject implements ConfigInterface
1618
{

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
* @SuppressWarnings(PHPMD.LongVariable)
1515
* @SuppressWarnings(PHPMD.TooManyFields)
1616
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
17+
*
18+
* @api
1719
*/
1820
class Storage extends \Magento\Framework\DataObject
1921
{

app/code/Magento/Cms/Model/Wysiwyg/Images/Storage/Collection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212

1313
/**
1414
* Wysiwyg Images storage collection
15+
*
16+
* @api
1517
*/
1618
class Collection extends \Magento\Framework\Data\Collection\Filesystem
1719
{

app/code/Magento/CmsUrlRewrite/Model/CmsPageUrlPathGenerator.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use Magento\Cms\Api\Data\PageInterface;
99

10+
/**
11+
* @api
12+
*/
1013
class CmsPageUrlPathGenerator
1114
{
1215
/** @var \Magento\Framework\Filter\FilterManager */
@@ -22,7 +25,6 @@ public function __construct(
2225
* @param PageInterface $cmsPage
2326
*
2427
* @return string
25-
* @api
2628
*/
2729
public function getUrlPath(PageInterface $cmsPage)
2830
{
@@ -34,7 +36,6 @@ public function getUrlPath(PageInterface $cmsPage)
3436
*
3537
* @param PageInterface $cmsPage
3638
* @return string
37-
* @api
3839
*/
3940
public function getCanonicalUrlPath(PageInterface $cmsPage)
4041
{
@@ -46,7 +47,6 @@ public function getCanonicalUrlPath(PageInterface $cmsPage)
4647
*
4748
* @param PageInterface $cmsPage
4849
* @return string
49-
* @api
5050
*/
5151
public function generateUrlKey(PageInterface $cmsPage)
5252
{
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Overview
2+
3+
The Magento_CmsUrlRewrite module adds support for URL rewrite rules for CMS pages. See also Magento_UrlRewrite module.
4+
5+
The module adds and removes URL rewrite rules as CMS pages are added or removed by a user.
6+
The rules can be edited by an admin user as any other URL rewrite rule.

app/code/Magento/Cron/Model/ConfigInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
/**
99
* Interface \Magento\Cron\Model\ConfigInterface
10+
*
11+
* @api
1012
*/
1113
interface ConfigInterface
1214
{

app/code/Magento/Cron/Model/ResourceModel/Schedule.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Schedule resource
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
11+
* @api
1212
*/
1313
class Schedule extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1414
{

app/code/Magento/Cron/Model/ResourceModel/Schedule/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Schedules Collection
1010
*
11-
* @author Magento Core Team <core@magentocommerce.com>
11+
* @api
1212
*/
1313
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1414
{

0 commit comments

Comments
 (0)