ReflectionFunctionAbstract

peachpiecompiler · Apr 26, 2019 · 4b065a7 · 4b065a7
1 parent a153fbb
commit 4b065a7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/Peachpie.Library/Reflection/ReflectionFunctionAbstract.cs b/src/Peachpie.Library/Reflection/ReflectionFunctionAbstract.cs
@@ -44,7 +44,9 @@ private protected bool ResolveReturnType(out Type type, out bool notNullFlag)
             var m = _routine.Methods[0];
 
             type = m.ReturnType;
-            notNullFlag = m.ReturnTypeCustomAttributes.IsDefined(typeof(NotNullAttribute), false);
+            notNullFlag =
+                m.ReturnTypeCustomAttributes.IsDefined(typeof(NotNullAttribute), false) ||
+                m.ReturnTypeCustomAttributes.IsDefined(typeof(CastToFalse), false); // [return: CastToFalse] => NULL cannot be returned
 
             //
             return type != typeof(PhpValue) && type != typeof(PhpAlias); // dunno

diff --git a/src/Peachpie.Runtime/Reflection/ReflectionUtils.cs b/src/Peachpie.Runtime/Reflection/ReflectionUtils.cs
@@ -93,6 +93,8 @@ public static bool IsPhpClassType(TypeInfo tinfo)
         /// </summary>
         public static bool IsNullable(this ParameterInfo p)
         {
+            Debug.Assert(typeof(PhpArray).IsValueType == false); // see TODO below
+
             if (p.ParameterType.IsValueType &&
                 p.ParameterType != typeof(PhpValue) &&
                 //p.ParameterType != typeof(PhpArray) // TODO: uncomment when PhpArray will be struct