Merge pull request #1983 from phalcon/cleanup

Added more tests
zephir-lang · Oct 19, 2019 · 6e9c252 · 6e9c252
2 parents 1d7233b + 9e07ccf
commit 6e9c252
Show file tree

Hide file tree

Showing 22 changed files with 167 additions and 93 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Fixed
+- Fixed incorrect behaviour in `zephir_get_global` if `zval` reference count <= 1
+  [#1961](https://github.com/phalcon/zephir/issues/1961)
+
 ### Removed
 - Removed `--vernum` option from the help for regular commands
 - Removed `void` from the return type hint in the generated stubs

diff --git a/ext/kernel/main.c b/ext/kernel/main.c
@@ -107,9 +107,6 @@ int zephir_get_global(zval *arr, const char *global, unsigned int global_length)
 					zend_hash_update(&EG(symbol_table), str, arr);
 				}
 
-				// See: https://github.com/phalcon/zephir/pull/1965#issuecomment-541299003
-				// ZVAL_COPY_VALUE(arr, gv);
-
 				zend_string_release(str);
 				return SUCCESS;
 			}

diff --git a/ext/test/globals/server.zep.c b/ext/test/globals/server.zep.c
diff --git a/ext/test/oo/oodestruct.zep.c b/ext/test/oo/oodestruct.zep.c
diff --git a/ext/test/optimizers/strreplace.zep.c b/ext/test/optimizers/strreplace.zep.c
diff --git a/ext/test/properties/propertyarray.zep.c b/ext/test/properties/propertyarray.zep.c
diff --git a/ext/test/quantum.zep.c b/ext/test/quantum.zep.c
diff --git a/ext/test/range.zep.c b/ext/test/range.zep.c
diff --git a/ext/test/regexdna.zep.c b/ext/test/regexdna.zep.c
diff --git a/ext/test/requires.zep.c b/ext/test/requires.zep.c
diff --git a/ext/test/requires/external3.zep.c b/ext/test/requires/external3.zep.c
diff --git a/ext/test/resourcetest.zep.c b/ext/test/resourcetest.zep.c
diff --git a/ext/test/router.zep.c b/ext/test/router.zep.c
diff --git a/ext/test/scall.zep.c b/ext/test/scall.zep.c
diff --git a/ext/test/scope.zep.c b/ext/test/scope.zep.c