Skip to content
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
24 changes: 12 additions & 12 deletions app/code/Magento/AwsS3/Test/Mftf/Helper/DummyMetadataCache.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2021 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand All @@ -13,72 +13,72 @@
class DummyMetadataCache implements \Magento\RemoteStorage\Driver\Adapter\Cache\CacheInterface
{
/**
* @inheirtDoc
* @inheritDoc
*/
public function exists(string $path): ?bool
{
return null;
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function getMetadata(string $path): ?array
{
return null;
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function flushCache(): void
{
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function purgeQueue(): void
{
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function moveFile(string $path, string $newpath): void
{
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function copyFile(string $path, string $newpath): void
{
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function deleteFile(string $path): void
{
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function deleteDir(string $dirname): void
{
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function updateMetadata(string $path, array $objectMetadata, bool $persist = false): void
{
}

/**
* @inheirtDoc
* @inheritDoc
*/
public function storeFileNotExists(string $path): void
{
Expand Down
7 changes: 4 additions & 3 deletions app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2011 Adobe
* All Rights Reserved.
*/

namespace Magento\Catalog\Model\Product\Type;
Expand Down Expand Up @@ -241,12 +241,13 @@ public function getRelationInfo()
* group => array(ids)
* )
*
* @deplacated TODO: refactor to child relation manager
* @deprecated TODO: refactor to child relation manager
*
* @param int $parentId
* @param bool $required
* @return array
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
* @see Nothing
*/
public function getChildrenIds($parentId, $required = true)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2014 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -70,7 +70,7 @@ class CategoryRepositoryTest extends TestCase
private $populateWithValuesMock;

/**
* @inheridoc
* @inheritDoc
*/
protected function setUp(): void
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2016 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -46,7 +46,7 @@ class SaveHandlerTest extends TestCase
private $relationMock;

/**
* @inheridoc
* @inheritDoc
*/
protected function setUp(): void
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2014 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -64,7 +64,7 @@ class AttributeTest extends TestCase
private $eavConfig;

/**
* @inheridoc
* @inheritDoc
*/
protected function setUp(): void
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?php

/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2016 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -84,7 +83,7 @@ class SaveTest extends TestCase
private $pageId = 1;

/**
* @inheirtDoc
* @inheritDoc
*/
protected function setUp(): void
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2021 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

namespace Magento\Elasticsearch7\Model\Adapter\DynamicTemplates;

/**
* @inheridoc
* @inheritDoc
* @deprecated because of EOL for Elasticsearch7
* @see this class will be responsible for ES7 only
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2021 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

namespace Magento\Elasticsearch7\Model\Adapter\DynamicTemplates;

/**
* @inheridoc
* @inheritDoc
* @deprecated because of EOL for Elasticsearch7
* @see this class will be responsible for ES7 only
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2021 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

namespace Magento\Elasticsearch7\Model\Adapter\DynamicTemplates;

/**
* @inheridoc
* @inheritDoc
* @deprecated because of EOL for Elasticsearch7
* @see this class will be responsible for ES7 only
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2021 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

namespace Magento\Elasticsearch7\Model\Adapter\DynamicTemplates;

/**
* @inheridoc
* @inheritDoc
* @deprecated because of EOL for Elasticsearch7
* @see this class will be responsible for ES7 only
*/
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/Email/Test/Unit/Model/TransportTest.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2021 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -36,7 +36,7 @@ class TransportTest extends TestCase
private $scopeConfigMock;

/**
* @inheridoc
* @inheritDoc
*/
protected function setUp(): void
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2022 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand Down Expand Up @@ -29,7 +29,7 @@ class DisableSessionTest extends TestCase
private $model;

/**
* @inheirtDoc
* @inheritDoc
*/
public function setUp(): void
{
Expand Down
8 changes: 5 additions & 3 deletions app/code/Magento/Payment/Block/Adminhtml/Transparent/Form.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2015 Adobe
* All Rights Reserved.
*/
namespace Magento\Payment\Block\Adminhtml\Transparent;

Expand All @@ -22,10 +22,12 @@ protected function shouldRender()
}

/**
* {inheritdoc}
* @inheritDoc
*/
protected function initializeMethod()
{
// @codingStandardsIgnoreStart
return;
// @codingStandardsIgnoreEnd
}
}
6 changes: 3 additions & 3 deletions app/code/Magento/Payment/Block/Transparent/Form.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2015 Adobe
* All Rights Reserved.
*/
namespace Magento\Payment\Block\Transparent;

Expand Down Expand Up @@ -47,7 +47,7 @@ public function __construct(
}

/**
* {inheritdoc}
* @inheritDoc
*/
protected function _toHtml()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2015 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand All @@ -14,10 +14,10 @@ class FormTesting extends Form
/**
* Return values for processHtml() method
*/
const PROCESS_HTML_RESULT = 'parent_result';
public const PROCESS_HTML_RESULT = 'parent_result';

/**
* {inheritdoc}
* {@inheritDoc}
*/
protected function processHtml()
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
* Copyright 2015 Adobe
* All Rights Reserved.
*/
declare(strict_types=1);

Expand All @@ -17,10 +17,10 @@ class FormTesting extends Form
/**
* Return values for processHtml() method
*/
const PROCESS_HTML_RESULT = 'parent_result';
public const PROCESS_HTML_RESULT = 'parent_result';

/**
* {inheritdoc}
* {@inheritDoc}
*/
protected function processHtml()
{
Expand Down
Loading