Fix #391: Allow making parameters nullable.

Author: dim-s

exts/jphp-zend-ext/src/main/tests/resources/zend/classes/type_hinting_005b.php

@@ -9,6 +9,5 @@
 ?>
 ==DONE==
 --EXPECTF--
-Warning: Declaration of D::f($a) should be compatible with C::f(array $a) in %s on line 5 at pos %d
 No hint, should be array.
 ==DONE==

jphp-core/src/org/develnext/jphp/core/syntax/generators/manually/SimpleExprGenerator.java

@@ -1443,7 +1443,7 @@ else if (previous instanceof StaticAccessExprToken){
                         isFunc = true;
                     }
 
-                    if (isFunc){
+                    if (isFunc) {
                         CallExprToken call = processCall(previous, current, iterator);
                         if (call.getName() != null) {
                             current = call;

jphp-core/tests/org/develnext/jphp/core/compiler/jvm/ClassesTest.java

@@ -146,6 +146,7 @@ public void testBugs() {
         check("classes/bug123.php");
         check("classes/bug127.php");
         check("classes/bug130.php");
+        check("classes/bug391.phpt", true);
     }
 
     @Test

jphp-core/tests/resources/classes/bug391.phpt

@@ -0,0 +1,19 @@
+--TEST--
+Allow making parameters nullable
+--FILE--
+<?php
+interface a
+{
+    public function test($a);
+}
+
+class b implements a
+{
+    public function test($a = null) {}
+}
+
+var_dump(new b);
+?>
+--EXPECTF--
+object(b)#%d (0) {
+}

jphp-runtime/src/php/runtime/reflection/ClassEntity.java

@@ -340,7 +340,7 @@ public SignatureResult addMethod(MethodEntity method, String realName) {
                     //method.setModifier(Modifier.PUBLIC);
                 }
 
-                if (!systemMethod.equalsBySignature(method, false)) {
+                if (!method.isImplementableSignatureFor(systemMethod)) {
                     addResult.add(InvalidMethod.error(InvalidMethod.Kind.INVALID_SIGNATURE, method));
                 } else if (systemMethod.isStatic && !method.isStatic)
                     addResult.add(InvalidMethod.warning(InvalidMethod.Kind.MUST_STATIC, method));

jphp-runtime/src/php/runtime/reflection/MethodEntity.java

@@ -440,17 +440,38 @@ public boolean isImplementableSignatureFor(MethodEntity parentMethod) {
             return false;
         }
 
-        if (getSignature().equals(parentMethod.getSignature())) {
-            return true;
-        } else {
-            if (parentMethod.getReturnTypeChecker() == null && getReturnTypeChecker() != null) {
-                return getSignature(true).equals(parentMethod.getSignature(true));
+        for (int i = 0; i < p_count; i++) {
+            ParameterEntity param = parameters[i];
+            ParameterEntity parentParam = i > p_parent_count-1 ? null : parentMethod.parameters[i];
+
+            if (parentParam == null) {
+                if (!param.hasDefaultValue()) {
+                    return false;
+                } else {
+                    continue;
+                }
             }
 
-            return false;
+            if (!TypeChecker.identical(param.getTypeChecker(), parentParam.getTypeChecker())) {
+                if (param.getTypeChecker() == null || TypeChecker.of(HintType.ANY).identical(param.getTypeChecker())) {
+                    continue; // skip any typehinting
+                }
+
+                return false;
+            }
         }
+
+        return true;
     }
 
+
+    /**
+     * Use isImplementableSignatureFor() method.
+     * @param method
+     * @param strong
+     * @return
+     */
+    @Deprecated
     public boolean equalsBySignature(MethodEntity method, boolean strong){
         if (strong)
             return getSignature().equals(method.getSignature());
@@ -462,6 +483,13 @@ public boolean equalsBySignature(MethodEntity method, boolean strong){
         }
     }
 
+    /**
+     * Use  isImplementableSignatureFor() method.
+     * @param method
+     * @param strong
+     * @return
+     */
+    @Deprecated
     public boolean equalsBySignature(MethodEntity method){
         return equalsBySignature(method, true);
     }
@@ -554,11 +582,15 @@ public void setTrait(ClassEntity trait) {
 
     public int getRequiredParamCount() {
         int cnt = 0;
-        if (parameters != null)
-        for(ParameterEntity e : parameters) {
-            if (e.getDefaultValue() != null)
-                break;
+
+        if (parameters != null) {
+            for (ParameterEntity e : parameters) {
+                if (e.hasDefaultValue())
+                    break;
+                cnt++;
+            }
         }
+
         return cnt;
     }
 

jphp-runtime/src/php/runtime/reflection/ParameterEntity.java

@@ -54,6 +54,10 @@ public Memory getDefaultValue() {
         return defaultValue;
     }
 
+    public boolean hasDefaultValue() {
+        return defaultValue != null || defaultValueConstName != null;
+    }
+
     public void setDefaultValue(Memory defaultValue) {
         this.defaultValue = defaultValue;
     }

jphp-runtime/src/php/runtime/reflection/support/TypeChecker.java

@@ -29,6 +29,14 @@ public boolean identical(TypeChecker typeChecker) {
         return this == typeChecker;
     }
 
+    public static boolean identical(TypeChecker tc1, TypeChecker tc2) {
+        if (tc1 != null && tc2 != null) {
+            return tc1.identical(tc2);
+        } else {
+            return tc1 == tc2;
+        }
+    }
+
     public static TypeChecker of(HintType type) {
         return Simple.valueOf(type);
     }