SHORE: flash session optimization

Author: phphleb

Helpers/FlashSessionHelper.php

@@ -0,0 +1,36 @@
+<?php
+
+/*declare(strict_types=1);*/
+
+namespace Hleb\Helpers;
+
+/** @internal */
+class FlashSessionHelper
+{
+    /**
+     * Preparing sessions for flash messages.
+     *
+     * Подготовка сессий для работы флеш-сообщений.
+     *
+     * @internal
+     */
+   public static function update(array &$session, string $id): void
+   {
+      if (\is_array($session[$id])) {
+           foreach ($session[$id] as $key => &$data) {
+               $data['reps_left']--;
+               if ($data['reps_left'] < 0) {
+                   unset($session[$id][$key]);
+                   continue;
+               }
+               if (isset($data['new'])) {
+                   $data['old'] = $data['new'];
+                   $data['new'] = null;
+               }
+               if (\is_null($data['old'])) {
+                   unset($session[$id][$key]);
+               }
+           }
+       }
+   }
+}

HlebBootstrap.php

@@ -109,7 +109,7 @@ public function __construct(?string $publicPath = null, array $config = [], ?Log
 
         // The current version of the framework.
         // Текущая версия фреймворка.
-        \defined('HLEB_CORE_VERSION') or \define('HLEB_CORE_VERSION', '2.1.16');
+        \defined('HLEB_CORE_VERSION') or \define('HLEB_CORE_VERSION', '2.1.17');
 
         $this->logger = $logger;
 

Init/Connectors/HlebConnector.php

@@ -85,6 +85,7 @@ final class HlebConnector
         'Hleb\Helpers\ClassDataInFile' => '/Helpers/ClassDataInFile.php',
         'Hleb\Helpers\DirectoryCleaner' => '/Helpers/DirectoryCleaner.php',
         'Hleb\Helpers\DirectoryInspector' => '/Helpers/DirectoryInspector.php',
+        'Hleb\Helpers\FlashSessionHelper' => '/Helpers/FlashSessionHelper.php',
         'Hleb\Helpers\DirectoryHelper' => '/Helpers/DirectoryHelper.php',
         'Hleb\Helpers\NameConverter' => '/Helpers/NameConverter.php',
         'Hleb\Helpers\HostHelper' => '/Helpers/HostHelper.php',

Main/ProjectLoader.php

@@ -10,6 +10,7 @@
 use Hleb\Constructor\Data\SystemSettings;
 use Hleb\Constructor\DI\DependencyInjection;
 use Hleb\CoreProcessException;
+use Hleb\Helpers\FlashSessionHelper;
 use Hleb\Helpers\ReflectionMethod;
 use Hleb\Helpers\RouteHelper;
 use Hleb\HttpException;
@@ -314,22 +315,8 @@ private static function initSession(bool|null $disabledInRoute): void
      */
     private static function updateSession(array &$session): void
     {
-        $id = '_hl_flash_';
-        if (isset($session[$id])) {
-            foreach ($session[$id] as $key => &$data) {
-                $data['reps_left']--;
-                if ($data['reps_left'] < 0) {
-                    unset($session[$id][$key]);
-                    continue;
-                }
-                if (isset($data['new'])) {
-                    $data['old'] = $data['new'];
-                    $data['new'] = null;
-                }
-                if (\is_null($data['old'])) {
-                    unset($session[$id][$key]);
-                }
-            }
+        if (!empty($session['_hl_flash_'])) {
+            FlashSessionHelper::update($session, '_hl_flash_');
         }
     }