', $body);
// Verify the password check box is not checked
- $this->assertContains('
', $body);
+ $this->assertContains(
+ '
',
+ $body
+ );
}
/**
@@ -510,14 +553,16 @@ public function testEditPostAction()
$this->login(1);
$this->getRequest()
->setMethod('POST')
- ->setPostValue([
- 'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
- 'firstname' => 'John',
- 'lastname' => 'Doe',
- 'email' => 'johndoe@email.com',
- 'change_email' => 1,
- 'current_password' => 'password'
- ]);
+ ->setPostValue(
+ [
+ 'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
+ 'firstname' => 'John',
+ 'lastname' => 'Doe',
+ 'email' => 'johndoe@email.com',
+ 'change_email' => 1,
+ 'current_password' => 'password'
+ ]
+ );
$this->dispatch('customer/account/editPost');
@@ -648,16 +693,18 @@ public function testWrongConfirmationEditPostAction()
$this->login(1);
$this->getRequest()
->setMethod('POST')
- ->setPostValue([
- 'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
- 'firstname' => 'John',
- 'lastname' => 'Doe',
- 'email' => 'johndoe@email.com',
- 'change_password' => 1,
- 'current_password' => 'password',
- 'password' => 'new-password',
- 'password_confirmation' => 'new-password-no-match',
- ]);
+ ->setPostValue(
+ [
+ 'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
+ 'firstname' => 'John',
+ 'lastname' => 'Doe',
+ 'email' => 'johndoe@email.com',
+ 'change_password' => 1,
+ 'current_password' => 'password',
+ 'password' => 'new-password',
+ 'password_confirmation' => 'new-password-no-match',
+ ]
+ );
$this->dispatch('customer/account/editPost');
@@ -841,13 +888,15 @@ private function getCustomerByEmail($email)
*/
private function prepareRequest()
{
- $post = new Parameters([
- 'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
- 'login' => [
- 'username' => 'customer@example.com',
- 'password' => 'password'
+ $post = new Parameters(
+ [
+ 'form_key' => $this->_objectManager->get(FormKey::class)->getFormKey(),
+ 'login' => [
+ 'username' => 'customer@example.com',
+ 'password' => 'password'
+ ]
]
- ]);
+ );
$request = $this->getRequest();
$formKey = $this->_objectManager->get(FormKey::class);
$request->setParam('form_key', $formKey->getFormKey());
@@ -913,6 +962,7 @@ private function getConfirmationUrlFromMessageContent(string $content): string
if (preg_match('
.*?)".*>', $content, $matches)) {
$confirmationUrl = $matches['url'];
$confirmationUrl = str_replace('http://localhost/index.php/', '', $confirmationUrl);
+ // phpcs:ignore Magento2.Functions.DiscouragedFunction
$confirmationUrl = html_entity_decode($confirmationUrl);
}
diff --git a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
index e2392b198492b..8f8dfd3baf1b6 100644
--- a/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
+++ b/lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
@@ -1,18 +1,24 @@
cachePool = $cachePool;
$this->cacheState = $cacheState;
@@ -54,17 +58,14 @@ public function __construct(
/**
* Clean cache on save object
*
- * @param \Magento\Framework\Model\ResourceModel\AbstractResource $subject
+ * @param AbstractResource $subject
* @param \Closure $proceed
- * @param \Magento\Framework\Model\AbstractModel $object
- * @return \Magento\Framework\Model\ResourceModel\AbstractResource
+ * @param AbstractModel $object
+ * @return AbstractResource
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function aroundSave(
- \Magento\Framework\Model\ResourceModel\AbstractResource $subject,
- \Closure $proceed,
- \Magento\Framework\Model\AbstractModel $object
- ) {
+ public function aroundSave(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
+ {
$result = $proceed($object);
$tags = $this->tagResolver->getTags($object);
$this->cleanCacheByTags($tags);
@@ -75,39 +76,37 @@ public function aroundSave(
/**
* Clean cache on delete object
*
- * @param \Magento\Framework\Model\ResourceModel\AbstractResource $subject
+ * @param AbstractResource $subject
* @param \Closure $proceed
- * @param \Magento\Framework\Model\AbstractModel $object
- * @return \Magento\Framework\Model\ResourceModel\AbstractResource
+ * @param AbstractModel $object
+ * @return AbstractResource
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
- public function aroundDelete(
- \Magento\Framework\Model\ResourceModel\AbstractResource $subject,
- \Closure $proceed,
- \Magento\Framework\Model\AbstractModel $object
- ) {
+ public function aroundDelete(AbstractResource $subject, \Closure $proceed, AbstractModel $object): AbstractResource
+ {
$tags = $this->tagResolver->getTags($object);
$result = $proceed($object);
$this->cleanCacheByTags($tags);
+
return $result;
}
/**
* Clean cache by tags
*
- * @param string[] $tags
+ * @param string[] $tags
* @return void
*/
- private function cleanCacheByTags($tags)
+ private function cleanCacheByTags(array $tags): void
{
- if (empty($tags)) {
+ if (!$tags) {
return;
}
foreach ($this->cacheList as $cacheType) {
if ($this->cacheState->isEnabled($cacheType)) {
$this->cachePool->get($cacheType)->clean(
- \Zend_Cache::CLEANING_MODE_MATCHING_TAG,
- array_unique($tags)
+ \Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG,
+ \array_unique($tags)
);
}
}
diff --git a/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php b/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
index e05399cd0bfcb..60dba582177eb 100644
--- a/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
+++ b/lib/internal/Magento/Framework/App/Test/Unit/Cache/FlushCacheByTagsTest.php
@@ -3,9 +3,20 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
+declare(strict_types=1);
namespace Magento\Framework\App\Test\Unit\Cache;
+use Magento\Framework\App\Cache\FlushCacheByTags;
+use Magento\Framework\App\Cache\StateInterface;
+use Magento\Framework\App\Cache\Tag\Resolver;
+use Magento\Framework\App\Cache\Type\FrontendPool;
+use Magento\Framework\Model\AbstractModel;
+use Magento\Framework\Model\ResourceModel\AbstractResource;
+
+/**
+ * Unit tests for the \Magento\Framework\App\Cache\FlushCacheByTags class.
+ */
class FlushCacheByTagsTest extends \PHPUnit\Framework\TestCase
{
/**
@@ -28,13 +39,16 @@ class FlushCacheByTagsTest extends \PHPUnit\Framework\TestCase
*/
private $plugin;
+ /**
+ * @inheritdoc
+ */
protected function setUp()
{
- $this->cacheState = $this->getMockForAbstractClass(\Magento\Framework\App\Cache\StateInterface::class);
- $this->frontendPool = $this->createMock(\Magento\Framework\App\Cache\Type\FrontendPool::class);
- $this->tagResolver = $this->createMock(\Magento\Framework\App\Cache\Tag\Resolver::class);
+ $this->cacheState = $this->getMockForAbstractClass(StateInterface::class);
+ $this->frontendPool = $this->createMock(FrontendPool::class);
+ $this->tagResolver = $this->createMock(Resolver::class);
- $this->plugin = new \Magento\Framework\App\Cache\FlushCacheByTags(
+ $this->plugin = new FlushCacheByTags(
$this->frontendPool,
$this->cacheState,
['test'],
@@ -42,14 +56,19 @@ protected function setUp()
);
}
- public function testAroundSave()
+ /**
+ * @return void
+ */
+ public function testAroundSave(): void
{
- $resource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
+ $resource = $this->getMockBuilder(AbstractResource::class)
->disableOriginalConstructor()
->getMockForAbstractClass();
- $model = $this->getMockBuilder(\Magento\Framework\Model\AbstractModel::class)
+ $model = $this->getMockBuilder(AbstractModel::class)
->disableOriginalConstructor()
->getMockForAbstractClass();
+ $this->tagResolver->expects($this->atLeastOnce())->method('getTags')->with($model)->willReturn([]);
+
$result = $this->plugin->aroundSave(
$resource,
function () use ($resource) {
@@ -57,17 +76,23 @@ function () use ($resource) {
},
$model
);
+
$this->assertSame($resource, $result);
}
- public function testAroundDelete()
+ /**
+ * @return void
+ */
+ public function testAroundDelete(): void
{
- $resource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
+ $resource = $this->getMockBuilder(AbstractResource::class)
->disableOriginalConstructor()
->getMockForAbstractClass();
- $model = $this->getMockBuilder(\Magento\Framework\Model\AbstractModel::class)
+ $model = $this->getMockBuilder(AbstractModel::class)
->disableOriginalConstructor()
->getMockForAbstractClass();
+ $this->tagResolver->expects($this->atLeastOnce())->method('getTags')->with($model)->willReturn([]);
+
$result = $this->plugin->aroundDelete(
$resource,
function () use ($resource) {
@@ -75,25 +100,7 @@ function () use ($resource) {
},
$model
);
- $this->assertSame($resource, $result);
- }
- public function testAroundSaveWithInterface()
- {
- $resource = $this->getMockBuilder(\Magento\Framework\Model\ResourceModel\AbstractResource::class)
-
- ->disableOriginalConstructor()
- ->getMockForAbstractClass();
- $model = $this->getMockBuilder(\Magento\Framework\Model\AbstractModel::class)
- ->disableOriginalConstructor()
- ->getMockForAbstractClass();
- $result = $this->plugin->aroundSave(
- $resource,
- function () use ($resource) {
- return $resource;
- },
- $model
- );
$this->assertSame($resource, $result);
}
}