Merge branch '0.4.x'

# Conflicts:
#	composer.json
#	src/Bootstrap/Config.php
#	src/Db/Adapter/Pdo/Mysql.php
#	src/Locale.php
#	src/Mvc/Controller/Traits/Params.php
#	src/Mvc/Controller/Traits/Query.php
#	src/Mvc/Model/Behavior/Conditional.php
#	src/Support/Env.php
#	src/Support/HelperFactory.php
#	src/Support/Options/Options.php

Author: jturbide

composer.json

@@ -64,7 +64,7 @@
     "ext-sodium": "*",
     "docopt/docopt": "^1.0.5",
     "league/flysystem": "^3.29.1",
-    "league/fractal": "^0.20.1",
+    "league/fractal": "^0.20.2",
     "phalcon/devtools": "~5.0",
     "phalcon/incubator-mailer": "^2.0",
     "vlucas/phpdotenv": "^5.6.1"

src/Bootstrap.php

@@ -85,7 +85,7 @@ class Bootstrap
     /**
      * @throws Exception
      */
-    public function __construct(string $mode = null)
+    public function __construct(?string $mode = null)
     {
         $this->setMode($mode);
         $this->setEventsManager(new Events\Manager());
@@ -229,7 +229,7 @@ public function bootServices(): void
     /**
      * Register modules
      */
-    public function registerModules(AbstractApplication $application = null, ?array $modules = null, ?string $defaultModule = null): void
+    public function registerModules(?AbstractApplication $application = null, ?array $modules = null, ?string $defaultModule = null): void
     {
         $application ??= $this->isMvc()
             ? $this->di->get('application')

src/Bootstrap/Config.php

@@ -1080,7 +1080,8 @@ public function __construct(array $data = [], bool $insensitive = false)
                         'charset' => Env::get('DATABASE_CHARSET', 'utf8'),
                         'options' => [
                             \PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES ' . Env::get('DATABASE_CHARSET', 'utf8') .
-                            ', sql_mode = \'' . Env::get('DATABASE_SQL_MODE', 'STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION') . '\'',
+                            ', sql_mode = \'' . Env::get('DATABASE_SQL_MODE', 'STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_ENGINE_SUBSTITUTION') . '\'' .
+                                ', block_encryption_mode = \''.Env::get('DATABASE_BLOCK_ENCRYPTION_MODE', 'aes-256-cbc').'\'',
                             \PDO::ATTR_EMULATE_PREPARES => Env::get('DATABASE_EMULATE_PREPARES', false), // https://stackoverflow.com/questions/10113562/pdo-mysql-use-pdoattr-emulate-prepares-or-not
                             \PDO::ATTR_STRINGIFY_FETCHES => Env::get('DATABASE_STRINGIFY_FETCHES', false),
                             \PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT => Env::get('DATABASE_SSL_VERIFY_SERVER_CERT', true),

src/Cli/Console.php

@@ -15,7 +15,7 @@
 
 class Console extends \Phalcon\Cli\Console
 {
-    public function __construct(DiInterface $container = null)
+    public function __construct(?DiInterface $container = null)
     {
         parent::__construct($container);
     }

src/Cli/Module.php

@@ -35,7 +35,7 @@ class Module implements ModuleDefinitionInterface
     /**
      * Registers an autoloader related to the frontend module
      */
-    public function registerAutoloaders(DiInterface $container = null): void
+    public function registerAutoloaders(?DiInterface $container = null): void
     {
         $this->loader = $container['loader'] ?? new Loader();
         assert($this->loader instanceof Loader);
@@ -90,7 +90,7 @@ public function getNamespaces(): array
         return $namespaces;
     }
 
-    public function getServices(DiInterface $container = null): void
+    public function getServices(?DiInterface $container = null): void
     {
         $this->loader = $container['loader'] ?? new Loader();
         $this->config ??= $container['config'] ?? new Config();

src/Db/Adapter/Pdo/Mysql.php

@@ -15,4 +15,117 @@
 
 class Mysql extends \Phalcon\Db\Adapter\Pdo\Mysql
 {
+    public function describeColumns(string $table, ?string $schema = null): array
+    {
+        $definitions = parent::describeColumns($table, $schema);
+        
+        if (Column::TYPE_TINYINTEGER !== Column::TYPE_BINARY) {
+            return $definitions;
+        }
+        
+        foreach ($definitions as $definitionKey => $definition) {
+            
+            if ($definition->getType() === Column::TYPE_TINYINTEGER && !$definition->isNumeric()) {
+                // probably a binary at this point
+                
+                $newDefinition = [];
+                
+                // protected to public
+                $prefix = chr(0) . '*' . chr(0);
+                foreach ((array)$definition as $key => $value) {
+                    $newDefinition[str_replace($prefix, '', $key)] = $value;
+                }
+                
+                $newDefinition['bindType'] = Column::BIND_PARAM_BLOB;
+                $newDefinition['type'] = Column::TYPE_VARBINARY;
+                unset($newDefinition['scale']);
+                
+                // reset definition
+                $definitions[$definitionKey] = new Column($definition->getName(), $newDefinition);
+            }
+        }
+        
+        return $definitions;
+    }
+    
+    /**
+     * Overrides the executePrepared method to rewrite duplicate placeholders.
+     *
+     * @param \PDOStatement $statement The original PDO statement.
+     * @param array $placeholders An array of bind values.
+     * @param array $dataTypes An array of bind types.
+     *
+     * @return \PDOStatement
+     */
+    public function executePrepared(\PDOStatement $statement, array $placeholders, $dataTypes): \PDOStatement
+    {
+        // Get the original SQL from the statement.
+        $sql = $statement->queryString;
+        
+        // Rewrite the SQL to ensure unique parameter names and update the placeholders.
+        [$newSql, $newPlaceholders, $newDataTypes] = $this->rewriteQueryPlaceholders($sql, $placeholders, $dataTypes);
+        
+        // Prepare a new statement with the rewritten SQL.
+        $newStatement = $this->pdo->prepare($newSql);
+        
+        // Call parent's executePrepared with the new statement.
+        return parent::executePrepared($newStatement, $newPlaceholders, $newDataTypes);
+    }
+    
+    /**
+     * Rewrites an SQL query by replacing duplicate named placeholders with unique ones.
+     *
+     * This function scans the SQL for named placeholders (like :paramName) and for every
+     * duplicate occurrence (beyond the first), it appends a unique suffix (e.g. :paramName_2)
+     * and duplicates the corresponding bind value and type.
+     *
+     * It also handles cases where the bind arrays use keys without a leading colon.
+     *
+     * @param string $sql The original SQL query.
+     * @param array $bind The bind values array.
+     * @param array $bindTypes The bind types array.
+     *
+     * @return array            An array containing the new SQL, the new bind values, and the new bind types.
+     */
+    public function rewriteQueryPlaceholders(string $sql, array $bind, array $bindTypes): array
+    {
+        // Pattern to match named placeholders, e.g. ":paramName"
+        $pattern = '/(:[a-zA-Z0-9_]+)/';
+        $placeholderCount = [];
+        
+        $newSql = preg_replace_callback($pattern, function ($matches) use (&$placeholderCount, &$bind, &$bindTypes) {
+            $placeholder = $matches[1]; // e.g. ":myParam"
+            
+            // Determine the key used in the bind arrays.
+            // Some arrays use keys with the colon, others without.
+            $originalKey = array_key_exists($placeholder, $bind)
+                ? $placeholder
+                : ltrim($placeholder, ':');
+            
+            // If this is the first occurrence, leave it as is.
+            if (!isset($placeholderCount[$placeholder])) {
+                $placeholderCount[$placeholder] = 1;
+                return $placeholder;
+            }
+            
+            // For subsequent occurrences, increment the counter and generate a unique placeholder.
+            $placeholderCount[$placeholder]++;
+            $newPlaceholder = $placeholder . '_' . $placeholderCount[$placeholder];
+            
+            // Adjust the new key to match the original style.
+            $newKey = (str_starts_with($originalKey, ':')) ? $newPlaceholder : ltrim($newPlaceholder, ':');
+            
+            // Duplicate the bind value and type for the new placeholder.
+            if (isset($bind[$originalKey])) {
+                $bind[$newKey] = $bind[$originalKey];
+            }
+            if (isset($bindTypes[$originalKey])) {
+                $bindTypes[$newKey] = $bindTypes[$originalKey];
+            }
+            
+            return $newPlaceholder;
+        }, $sql);
+        
+        return [$newSql, $bind, $bindTypes];
+    }
 }

src/Identity/Traits/Role.php

@@ -29,7 +29,7 @@ trait Role
     public function hasRole(?array $roles = null, bool $or = false, bool $inherit = true): bool
     {
         $roleList = array_keys($this->getRoleList());
-        return $this->has($roles, $inherit ? $this->getInheritedRoleList($roleList) : $roleList, $or);
+        return $this->has($roles, $inherit ? array_merge($roleList, $this->getInheritedRoleList($roleList)) : $roleList, $or);
     }
 
     /**

src/Locale.php

@@ -246,7 +246,7 @@ public function getFromHttp(?string $default = null): ?string
     /**
      * Save locale into session if mode contain session handling
      */
-    public function saveIntoSession(?string $locale = null, bool $force = false): void
+    public function saveIntoSession(?string $locale = null, ?bool $force = false): void
     {
         $locale ??= $this->getLocale();