Skip to content

Remove forbidden @author tag from Magento_Captcha and Magento_Cms #36980

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

Open
wants to merge 10 commits into
base: 2.4-develop
Choose a base branch
from
13 changes: 4 additions & 9 deletions app/code/Magento/Captcha/Block/Captcha.php
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2012 Adobe
* All Rights Reserved.
*/

/**
* Captcha block
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Captcha\Block;

/**
* Captcha block
*
* @api
* @since 100.0.2
*/
class Captcha extends \Magento\Framework\View\Element\Template
{
/**
* Captcha data
*
* @var \Magento\Captcha\Helper\Data
*/
protected $_captchaData = null;
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/Captcha/Helper/Adminhtml/Data.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2013 Adobe
* All Rights Reserved.
*/

/**
* Captcha helper for adminhtml area
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Captcha\Helper\Adminhtml;

Expand Down Expand Up @@ -42,6 +40,7 @@ public function __construct(
* @param string $key The last part of XML_PATH_$area_CAPTCHA_ constant (case insensitive)
* @param \Magento\Store\Model\Store $store
* @return \Magento\Framework\App\Config\Element
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getConfig($key, $store = null)
{
Expand All @@ -53,6 +52,7 @@ public function getConfig($key, $store = null)
*
* @param mixed $website
* @return string
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
protected function _getWebsiteCode($website = null)
{
Expand Down
8 changes: 2 additions & 6 deletions app/code/Magento/Captcha/Model/Config/Font.php
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2012 Adobe
* All Rights Reserved.
*/

/**
* Captcha image model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Captcha\Model\Config;

class Font implements \Magento\Framework\Option\ArrayInterface
{
/**
* Captcha data
*
* @var \Magento\Captcha\Helper\Data
*/
protected $_captchaData = null;
Expand Down
6 changes: 2 additions & 4 deletions app/code/Magento/Captcha/Model/Config/Form/AbstractForm.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2012 Adobe
* All Rights Reserved.
*/

/**
* Data source to fill "Forms" field
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Captcha\Model\Config\Form;

Expand Down
6 changes: 2 additions & 4 deletions app/code/Magento/Captcha/Model/Config/Form/Backend.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2012 Adobe
* All Rights Reserved.
*/

/**
* Captcha image model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Captcha\Model\Config\Form;

Expand Down
6 changes: 2 additions & 4 deletions app/code/Magento/Captcha/Model/Config/Form/Frontend.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2012 Adobe
* All Rights Reserved.
*/

/**
* Captcha image model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Captcha\Model\Config\Form;

Expand Down
6 changes: 2 additions & 4 deletions app/code/Magento/Captcha/Model/Config/Mode.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2012 Adobe
* All Rights Reserved.
*/

/**
* Captcha image model
*
* @author Magento Core Team <[email protected]>
*/
namespace Magento\Captcha\Model\Config;

Expand Down
13 changes: 5 additions & 8 deletions app/code/Magento/Captcha/Model/ResourceModel/Log.php
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2012 Adobe
* All Rights Reserved.
*/

namespace Magento\Captcha\Model\ResourceModel;

/**
* Log Attempts resource
*
* @author Magento Core Team <[email protected]>
*/
class Log extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
{
/**
* Remote Address log type
*/
const TYPE_REMOTE_ADDRESS = 1;
public const TYPE_REMOTE_ADDRESS = 1;

/**
* Type User Login Name
*/
const TYPE_LOGIN = 2;
public const TYPE_LOGIN = 2;

/**
* Core Date
*
* @var \Magento\Framework\Stdlib\DateTime\DateTime
*/
protected $_coreDate;
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Cms/Block/Adminhtml/Page/Widget/Chooser.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/

namespace Magento\Cms\Block\Adminhtml\Page\Widget;

/**
* CMS page chooser for Wysiwyg CMS widget
*
*/
class Chooser extends \Magento\Backend\Block\Widget\Grid\Extended
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/

namespace Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Content;

/**
* New directory block for Wysiwyg Images
*
* @author Magento Core Team <[email protected]>
*/
class Newfolder extends \Magento\Backend\Block\Template
{
Expand Down
15 changes: 6 additions & 9 deletions app/code/Magento/Cms/Block/Widget/Block.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2013 Adobe
* All Rights Reserved.
*/

declare(strict_types=1);

namespace Magento\Cms\Block\Widget;
Expand All @@ -15,8 +14,6 @@

/**
* Cms Static Block Widget
*
* @author Magento Core Team <[email protected]>
*/
class Block extends \Magento\Framework\View\Element\Template implements BlockInterface, IdentityInterface
{
Expand All @@ -33,8 +30,6 @@ class Block extends \Magento\Framework\View\Element\Template implements BlockInt
protected static $_widgetUsageMap = [];

/**
* Block factory
*
* @var \Magento\Cms\Model\BlockFactory
*/
protected $_blockFactory;
Expand Down Expand Up @@ -77,6 +72,7 @@ protected function _beforeToHtml()
if (isset(self::$_widgetUsageMap[$blockHash])) {
return $this;
}

self::$_widgetUsageMap[$blockHash] = true;

$block = $this->getBlock();
Expand All @@ -87,9 +83,10 @@ protected function _beforeToHtml()
$this->setText(
$this->_filterProvider->getBlockFilter()->setStoreId($storeId)->filter($block->getContent())
);
} catch (NoSuchEntityException $e) {
} catch (NoSuchEntityException $e) { // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
}
}

unset(self::$_widgetUsageMap[$blockHash]);
return $this;
}
Expand Down Expand Up @@ -132,7 +129,7 @@ private function getBlock(): ?CmsBlock
$this->block = $block;

return $block;
} catch (NoSuchEntityException $e) {
} catch (NoSuchEntityException $e) { // phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
}
}

Expand Down
11 changes: 4 additions & 7 deletions app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images.php
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/

namespace Magento\Cms\Controller\Adminhtml\Wysiwyg;

/**
* Images manage controller for Cms WYSIWYG editor
*
* @author Magento Core Team <[email protected]>
*/
abstract class Images extends \Magento\Backend\App\Action
{
Expand All @@ -17,11 +16,9 @@ abstract class Images extends \Magento\Backend\App\Action
*
* @see _isAllowed()
*/
const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';
public const ADMIN_RESOURCE = 'Magento_Cms::media_gallery';

/**
* Core registry
*
* @var \Magento\Framework\Registry
*/
protected $_coreRegistry = null;
Expand Down