Skip to content

Instantly share code, notes, and snippets.

diff --git a/Zend/zend_ast.c b/Zend/zend_ast.c
index a064927f93..0d69bfbaca 100644
--- a/Zend/zend_ast.c
+++ b/Zend/zend_ast.c
@@ -482,7 +482,7 @@ static zend_result zend_ast_add_unpacked_element(zval *result, zval *expr) {
zend_class_entry *zend_ast_fetch_class(zend_ast *ast, zend_class_entry *scope)
{
- return zend_fetch_class(zend_ast_get_str(ast), ast->attr | ZEND_FETCH_CLASS_EXCEPTION);
+ return zend_fetch_class_with_scope(zend_ast_get_str(ast), ast->attr | ZEND_FETCH_CLASS_EXCEPTION, scope);
=====================================================================
PHP : /home/cmp/php-src/sapi/cli/php
PHP_SAPI : cli
PHP_VERSION : 8.0.0-dev
ZEND_VERSION: 4.0.0-dev
PHP_OS : Linux - Linux cmp 5.3.0-46-generic SMP Fri Mar 27 17:37:05 UTC 2020 x86_64
INI actual : /home/cmp/php-src
More .INIs :
---------------------------------------------------------------------
PHP : /home/cmp/php-src/sapi/phpdbg/phpdbg

Keybase proof

I hereby claim:

  • I am camporter on github.
  • I am camporter (https://keybase.io/camporter) on keybase.
  • I have a public key ASBGiUIQNev5CO9hJgXCSwP7ZlETAM0W5VYCmirSuS1n4Qo

To claim this, I am signing this object:

=====================================================================
PHP_SAPI : cli
PHP_VERSION : 7.2.14-dev
ZEND_VERSION: 3.2.0
PHP_OS : Darwin
More .INIs :
VALGRIND : Not used
=====================================================================
Running selected tests.
PASS PDO OCI Bug #41996 (Problem accessing Oracle ROWID) [ext/pdo_oci/tests/bug41996.phpt]
=====================================================================
PHP_SAPI : cli
PHP_VERSION : 7.2.14-dev
ZEND_VERSION: 3.2.0
PHP_OS : Darwin
More .INIs :
VALGRIND : Not used
=====================================================================
Running selected tests.
PASS PDO OCI Bug #41996 (Problem accessing Oracle ROWID) [ext/pdo_oci/tests/bug41996.phpt]
--- before.log 2015-06-27 02:42:23.987409298 -0500
+++ after.log 2015-06-27 02:16:23.495463595 -0500
@@ -1,251 +1,179 @@
=====================================================================
Number of tests : 353 295
Tests skipped : 58 ( 16.4%) --------
Tests warned : 0 ( 0.0%) ( 0.0%)
-Tests failed : 236 ( 66.9%) ( 80.0%)
+Tests failed : 164 ( 46.5%) ( 55.6%)
Expected fail : 0 ( 0.0%) ( 0.0%)
diff --git a/engine/source/platformAndroid/AndroidConsole.h b/engine/source/platformAndroid/AndroidConsole.h
index 5226bf3..023efce 100755
--- a/engine/source/platformAndroid/AndroidConsole.h
+++ b/engine/source/platformAndroid/AndroidConsole.h
@@ -27,7 +27,7 @@
#include "console/console.h"
#endif
#ifndef _EVENT_H_
-#include "Platform/event.h"
+#include "platform/event.h"
@camporter
camporter / gist:8486304
Created January 18, 2014 04:37
Patch to add TextObject for Android and VS2012 projects
diff --git a/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj b/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj
index f64694d..b5dfac9 100644
--- a/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj
+++ b/engine/compilers/VisualStudio 2012/Torque 2D.vcxproj
@@ -276,6 +276,7 @@
<ClCompile Include="..\..\source\2d\sceneobject\Scroller.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\ShapeVector.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\Sprite.cc" />
+ <ClCompile Include="..\..\source\2d\sceneobject\TextObject.cc" />
<ClCompile Include="..\..\source\2d\sceneobject\Trigger.cc" />