Merge pull request #16709 from noone-silent/T16705-remove-has-check

[#16705] - refactor: remove has() check in doGet().

Author: niden

CHANGELOG-5.0.md

@@ -2,10 +2,18 @@
 
 ## [5.9.1](https://github.com/phalcon/cphalcon/releases/tag/v5.9.1) (2025-XX-XX)
 
+### Changed
+
+- Changed `Phalcon\Storage\Adapter\AbstractAdapter` and dropped `has()` check before receiving the value. [#16705](https://github.com/phalcon/cphalcon/issues/16705)
+
+### Added
+
 ### Fixed
 
 - Fixed `Phalcon\Mvc\Micro\LazyLoader::callMethod` to prevent `Unknown named parameter` error [#16724](https://github.com/phalcon/cphalcon/issues/16724)
 
+### Removed
+
 ## [5.9.0](https://github.com/phalcon/cphalcon/releases/tag/v5.9.0) (2025-03-08)
 
 ### Changed

phalcon/Storage/Adapter/AbstractAdapter.zep

@@ -163,14 +163,13 @@ abstract class AbstractAdapter implements AdapterInterface, EventsAwareInterface
 
         this->fire(this->eventType . ":beforeGet", key);
 
-        if (true !== this->has(key)) {
+        let content  = this->doGet(key);
+        if (content === false) {
             this->fire(this->eventType . ":afterGet", key);
 
             return defaultValue;
         }
 
-        let content  = this->doGet(key);
-
         let result = this->getUnserializedData(content, defaultValue);
 
         this->fire(this->eventType . ":afterGet", key);

tests/integration/Cache/Adapter/Memory/EventsCest.php

@@ -72,6 +72,9 @@ public function cacheCacheEventTriggers(IntegrationTester $I, Example $example):
         $manager = new Manager();
         $adapter->setEventsManager(new Manager());
 
+        // Avoid unset warning
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'cache:' . $example->offsetGet(0),
             static function (Event $event) use (&$counter, $example): void {

tests/integration/Cache/Cache/GetEventsManagerCest.php

@@ -88,6 +88,12 @@ static function () use (&$counter) {
 
         $adapter->setEventsManager($manager);
 
+        // Avoid unset warning.
+        if ($example->offsetGet(1) !== 'set' && $example->offsetGet(1) !== 'setMultiple') {
+            $adapter->set('test', 'test');
+            $adapter->set('test2', 'test2');
+        }
+
         $I->assertInstanceOf($manager::class, $adapter->getEventsManager());
 
         call_user_func_array([$adapter, $example->offsetGet(1)], $example->offsetGet(2));

tests/integration/Storage/Adapter/EventsCest.php

@@ -61,6 +61,8 @@ public function storageAdapterEventsBeforeGet(IntegrationTester $I, Example $exa
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:beforeGet',
             static function (Event $event) use (&$counter, $example): void {
@@ -109,6 +111,8 @@ public function storageAdapterEventsAfterGet(IntegrationTester $I, Example $exam
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:afterGet',
             static function (Event $event) use (&$counter, $example): void {
@@ -157,6 +161,8 @@ public function storageAdapterEventsBeforeHas(IntegrationTester $I, Example $exa
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:beforeHas',
             static function (Event $event) use (&$counter, $example): void {
@@ -205,6 +211,8 @@ public function storageAdapterEventsAfterHas(IntegrationTester $I, Example $exam
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:afterHas',
             static function (Event $event) use (&$counter, $example): void {
@@ -253,6 +261,8 @@ public function storageAdapterEventsBeforeDelete(IntegrationTester $I, Example $
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:beforeDelete',
             static function (Event $event) use (&$counter, $example): void {
@@ -301,6 +311,8 @@ public function storageAdapterEventsAfterDelete(IntegrationTester $I, Example $e
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:afterDelete',
             static function (Event $event) use (&$counter, $example): void {
@@ -349,6 +361,8 @@ public function storageAdapterEventsBeforeIncrement(IntegrationTester $I, Exampl
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:beforeIncrement',
             static function (Event $event) use (&$counter, $example): void {
@@ -397,6 +411,8 @@ public function storageAdapterEventsAfterIncrement(IntegrationTester $I, Example
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:afterIncrement',
             static function (Event $event) use (&$counter, $example): void {
@@ -445,6 +461,8 @@ public function storageAdapterEventsBeforeDecrement(IntegrationTester $I, Exampl
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:beforeDecrement',
             static function (Event $event) use (&$counter, $example): void {
@@ -493,6 +511,8 @@ public function storageAdapterEventsAfterDecrement(IntegrationTester $I, Example
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:afterDecrement',
             static function (Event $event) use (&$counter, $example): void {
@@ -541,6 +561,8 @@ public function storageAdapterEventsBeforeSet(IntegrationTester $I, Example $exa
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:beforeSet',
             static function (Event $event) use (&$counter, $example): void {
@@ -589,6 +611,8 @@ public function storageAdapterEventsAfterSet(IntegrationTester $I, Example $exam
             )
         );
 
+        $adapter->set('test', 'test');
+
         $manager->attach(
             'storage:afterSet',
             static function (Event $event) use (&$counter, $example): void {