Merge pull request #2309 from zephir-lang/#2308-globals-string

#2308 - Fix support of `string` type in struct globals

CHANGELOG.md

@@ -5,6 +5,8 @@ The format based on [Keep a Changelog](http://keepachangelog.com)
 and this project adheres to [Semantic Versioning](http://semver.org).
 
 ## [Unreleased]
+### Fixed
+- Fix support of `string` type in struct globals [#2308](https://github.com/zephir-lang/zephir/issues/2308)
 
 ## [0.15.0] - 2021-10-05
 ### Added

Library/Code/Builder/Struct.php

@@ -122,6 +122,9 @@ public function getCDefault(string $name, array $global, string $namespace): str
             case 'bool':
                 return '';
 
+            case 'string':
+                return "\t".$namespace.'_globals->'.$this->simpleName.'.'.$name.' = ZSTR_VAL(zend_string_init(ZEND_STRL("'.$global['default'].'"), 0));';
+
             case 'int':
             case 'uint':
             case 'long':
@@ -192,6 +195,9 @@ protected function convertToCType(string $type): string
             case 'hash':
                 return 'HashTable* ';
 
+            case 'string':
+                return 'zend_string* ';
+
             case 'int':
             case 'uint':
             case 'long':

Library/Compiler/CompilerFileFactory.php

@@ -9,6 +9,8 @@
  * the LICENSE file that was distributed with this source code.
  */
 
+declare(strict_types=1);
+
 namespace Zephir\Compiler;
 
 use Psr\Log\LoggerInterface;
@@ -19,15 +21,12 @@
 
 final class CompilerFileFactory
 {
-    private $config;
-    private $filesystem;
-    private $logger;
-
-    public function __construct(
-        Config $config,
-        FileSystemInterface $filesystem,
-        LoggerInterface $logger
-    ) {
+    private Config $config;
+    private FileSystemInterface $filesystem;
+    private LoggerInterface $logger;
+
+    public function __construct(Config $config, FileSystemInterface $filesystem, LoggerInterface $logger)
+    {
         $this->config = $config;
         $this->filesystem = $filesystem;
         $this->logger = $logger;
@@ -43,7 +42,7 @@ public function __construct(
      *
      * @return FileInterface
      */
-    public function create($className, $filePath)
+    public function create(string $className, string $filePath): FileInterface
     {
         $compiler = new CompilerFile($this->config, new AliasManager(), $this->filesystem);
 

config.json

@@ -119,6 +119,10 @@
       "type": "bool",
       "default": true
     },
+    "orm.cache_prefix": {
+      "type": "string",
+      "default": "prefix-string-"
+    },
     "extension.test_ini_variable": {
       "type": "bool",
       "default": true,

ext/php_stub.h

@@ -26,6 +26,7 @@ typedef struct _zephir_struct_db {
 typedef struct _zephir_struct_orm { 
 	int cache_level;
 	zend_bool cache_enable;
+	zend_string*  cache_prefix;
 } zephir_struct_orm;
 
 typedef struct _zephir_struct_extension { 

ext/stub.c

@@ -254,6 +254,7 @@ PHP_INI_BEGIN()
 
 
 	STD_PHP_INI_BOOLEAN("stub.orm.cache_enable", "1", PHP_INI_ALL, OnUpdateBool, orm.cache_enable, zend_stub_globals, stub_globals)
+
 	STD_PHP_INI_BOOLEAN("extension.test_ini_variable", "1", PHP_INI_ALL, OnUpdateBool, extension.test_ini_variable, zend_stub_globals, stub_globals)
 	STD_PHP_INI_BOOLEAN("ini-entry.my_setting_1", "1", PHP_INI_ALL, OnUpdateBool, my_setting_1, zend_stub_globals, stub_globals)
 	STD_PHP_INI_BOOLEAN("stub.test_setting_1", "1", PHP_INI_ALL, OnUpdateBool, test_setting_1, zend_stub_globals, stub_globals)
@@ -520,6 +521,7 @@ static void php_zephir_init_globals(zend_stub_globals *stub_globals)
 	stub_globals->db.my_setting_3 = 7.5;
 	stub_globals->orm.cache_level = 3;
 
+	stub_globals->orm.cache_prefix = ZSTR_VAL(zend_string_init(ZEND_STRL("prefix-string-"), 0));
 
 	stub_globals->my_setting_1 = 1;
 	stub_globals->test_setting_1 = 1;

stub/globals.zep

@@ -35,6 +35,11 @@ class Globals
 		globals_set("orm.cache_level", value);
 	}
 
+	public function setDefaultGlobalsOrmCachePrefix(string value) -> void
+	{
+	    globals_set("orm.cache_prefix", value);
+	}
+
 	/* Get Default Properties */
 
 	/**
@@ -108,4 +113,12 @@ class Globals
 	{
 		return globals_get("orm.cache_level");
 	}
+
+	/**
+     * @return mixed
+     */
+    public function getDefaultGlobalsOrmCachePrefix()
+    {
+        return globals_get("orm.cache_prefix");
+    }
 }

tests/Extension/GlobalsTest.php

@@ -83,6 +83,23 @@ public function testSetStringValue(): void
 
         $this->test->setStringValue('Long Text without any sense...');
         $this->assertSame('Long Text without any sense...', $this->test->getDefaultGlobals8());
+
+        /**
+         * Get and set string value from globals struct.
+         */
+        $this->assertSame('prefix-string-', $this->test->getDefaultGlobalsOrmCachePrefix());
+
+        $this->test->setDefaultGlobalsOrmCachePrefix('1');
+        $this->assertSame('1', $this->test->getDefaultGlobalsOrmCachePrefix());
+
+        $this->test->setDefaultGlobalsOrmCachePrefix('c');
+        $this->assertSame('c', $this->test->getDefaultGlobalsOrmCachePrefix());
+
+        $this->test->setDefaultGlobalsOrmCachePrefix('char');
+        $this->assertSame('char', $this->test->getDefaultGlobalsOrmCachePrefix());
+
+        $this->test->setDefaultGlobalsOrmCachePrefix('Long Text without any sense...');
+        $this->assertSame('Long Text without any sense...', $this->test->getDefaultGlobalsOrmCachePrefix());
     }
 
     public function testSetBoolValueUsingInt(): void