Skip to content

Replacing Zend_Cache with symfony/cache component #40058

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.

Sign up for GitHub

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 3 commits into
base: 2.4-develop
Choose a base branch
from
+1,611 −1,195
Open

Replacing Zend_Cache with symfony/cache component #40058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
194e011
replacing zend_cache with symfony cache
Jul 9, 2025
d5d5529
Merge branch '2.4-develop' into zend_cache_removal
jakwinkler Jul 9, 2025
31af08b
Merge branch '2.4-develop' into zend_cache_removal
jakwinkler Jul 9, 2025
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
5 changes: 2 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,13 @@
"magento/composer": "^1.10.1-beta1",
"magento/composer-dependency-version-audit-plugin": "^0.1",
"magento/magento-composer-installer": ">=0.4.0",
"magento/zend-cache": "^1.16",
"symfony/cache": "^6.4",
"magento/zend-db": "^1.16",
"magento/zend-pdf": "^1.16",
"monolog/monolog": "^3.6",
"opensearch-project/opensearch-php": "^2.3",
"pelago/emogrifier": "^7.0",
"php-amqplib/php-amqplib": "^3.2",
"phpseclib/mcrypt_compat": "^2.0",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it was removed by misteke, it's not relates to this PR

"phpseclib/phpseclib": "^3.0",
"psr/log": "^2 || ^3",
"ramsey/uuid": "^4.2",
Expand Down Expand Up @@ -398,4 +397,4 @@
}
},
"prefer-stable": true
}
}
1,684 changes: 950 additions & 734 deletions composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion lib/internal/Magento/Framework/Acl/Data/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@

namespace Magento\Framework\Acl\Data;

use Magento\Framework\Cache\FrontendInterface;

/**
* ACL data cache layer.
* @package Magento\Framework\Acl\Data
Expand Down Expand Up @@ -84,7 +86,7 @@ public function remove($identifier)
/**
* {@inheritdoc}
*/
public function clean($mode = \Zend_Cache::CLEANING_MODE_MATCHING_TAG, array $tags = [])
public function clean($mode = FrontendInterface::CLEANING_MODE_MATCHING_TAG, array $tags = [])
{
$this->aclBuilder->resetRuntimeAcl();
return $this->cache->clean($mode, array_merge($tags, [$this->cacheTag]));
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/App/Cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public function remove($identifier)
public function clean($tags = [])
{
if ($tags) {
$result = $this->_frontend->clean(\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG, (array)$tags);
$result = $this->_frontend->clean(\Magento\Framework\Cache\FrontendInterface::CLEANING_MODE_MATCHING_ANY_TAG, (array)$tags);
} else {
/** @deprecated special case of cleaning by empty tags is deprecated after 2.0.0.0-dev42 */
$result = false;
Expand Down
2 changes: 1 addition & 1 deletion lib/internal/Magento/Framework/App/Cache/FlushCacheByTags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private function cleanCacheByTags(array $tags): void
foreach ($this->cacheList as $cacheType) {
if ($this->cacheState->isEnabled($cacheType)) {
$this->cachePool->get($cacheType)->clean(
\Zend_Cache::CLEANING_MODE_MATCHING_ANY_TAG,
\Magento\Framework\Cache\FrontendInterface::CLEANING_MODE_MATCHING_ANY_TAG,
$uniqueTags = $uniqueTags ?? \array_unique($tags)
);
}
Expand Down
Loading