Subject: [PATCH] userdiff: php: Improved tests catching "abstract" and "final" functions

From: "Javier Spagnoletti via GitGitGadget" <[email-masked]>
Date: Sat, 14 Nov 2020 21:18:07 +0000

From: Javier Spagnoletti <[email-masked]>

Since the original tests cases were using other detectable keywords (like
"public" or "protected"), they are able to pass even if the keywords
intended to be covered are not present.

Signed-off-by: Javier Spagnoletti <[email-masked]>
---
    userdiff: php: Improved test cases used to catch "abstract" and "final"
    functions
    
    Since the original tests cases were using other detectable keywords
    (like "public" or "protected"), they are able to pass even if the
    keywords intended to be covered are not present. In the case of the test
    for "abstract" keyword, the method's body was removed in the fixture,
    since PHP doesn't allow an abstract method to have a body.
    
    Signed-off-by: Javier Spagnoletti [email-masked] [[email-masked]]

Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-915%2Fphansys%2Fpr_864-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-915/phansys/pr_864-v1
Pull-Request: https://github.com/git/git/pull/915

 t/t4018/php-abstract-method | 5 ++++-
 t/t4018/php-final-method    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/t/t4018/php-abstract-method b/t/t4018/php-abstract-method
index ce215df75a..14d77e6c15 100644
--- a/t/t4018/php-abstract-method
+++ b/t/t4018/php-abstract-method
@@ -1,7 +1,10 @@
 abstract class Klass
 {
-    abstract public function RIGHT(): ?string
+    abstract function RIGHT(): ?string
     {
+        // PHP doesn't allow abstract methods to have a body,
+        // but this is here just for diff ckeck purposes.
+
         return 'ChangeMe';
     }
 }
diff --git a/t/t4018/php-final-method b/t/t4018/php-final-method
index 537fb8ad9a..f7dd2dec17 100644
--- a/t/t4018/php-final-method
+++ b/t/t4018/php-final-method
@@ -1,6 +1,6 @@
 class Klass
 {
-    final public function RIGHT(): string
+    final function RIGHT(): string
     {
         return 'ChangeMe';
     }

base-commit: e31aba42fb12bdeb0f850829e008e1e3f43af500
-- 
gitgitgadget