From e6166a8b4074c76ac05c3f40d4ae6a4e3b267060 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 10 Feb 2020 11:19:17 +0100 Subject: [PATCH 1/4] PHP 7.4 fix - Ensure the existence of the 'args' key. --- src/DocBlock/Tags/InvalidTag.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/DocBlock/Tags/InvalidTag.php b/src/DocBlock/Tags/InvalidTag.php index a531c03..95f8221 100644 --- a/src/DocBlock/Tags/InvalidTag.php +++ b/src/DocBlock/Tags/InvalidTag.php @@ -104,6 +104,7 @@ final class InvalidTag implements Tag do { $trace = array_map( static function (array $call) use ($flatten) : array { + $call += ['args' => []]; array_walk_recursive($call['args'], $flatten); return $call; From adcffd685b30d3ed73ad1be7e1e58778ef5ea9a7 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 10 Feb 2020 11:52:42 +0100 Subject: [PATCH 2/4] PHP 7.4 fix - Check if 'args' key exists, if not, use an empty array. --- src/DocBlock/Tags/InvalidTag.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/DocBlock/Tags/InvalidTag.php b/src/DocBlock/Tags/InvalidTag.php index 95f8221..df674ef 100644 --- a/src/DocBlock/Tags/InvalidTag.php +++ b/src/DocBlock/Tags/InvalidTag.php @@ -104,8 +104,7 @@ final class InvalidTag implements Tag do { $trace = array_map( static function (array $call) use ($flatten) : array { - $call += ['args' => []]; - array_walk_recursive($call['args'], $flatten); + array_walk_recursive($call['args'] ?? [], $flatten); return $call; }, From 1c6203a9f73e1fc09016fa16bcb0d4cbaabb1810 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 10 Feb 2020 13:18:57 +0100 Subject: [PATCH 3/4] PHP 7.4 fix - Create a temporary variable to prevent Fatal error. --- src/DocBlock/Tags/InvalidTag.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/DocBlock/Tags/InvalidTag.php b/src/DocBlock/Tags/InvalidTag.php index df674ef..d15818e 100644 --- a/src/DocBlock/Tags/InvalidTag.php +++ b/src/DocBlock/Tags/InvalidTag.php @@ -104,7 +104,9 @@ final class InvalidTag implements Tag do { $trace = array_map( static function (array $call) use ($flatten) : array { - array_walk_recursive($call['args'] ?? [], $flatten); + $args = $call['args'] ?? []; + + array_walk_recursive($args, $flatten); return $call; }, From 91307e3009402a6d3e2197b9109c1ffda52b5e3c Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Mon, 10 Feb 2020 21:04:24 +0100 Subject: [PATCH 4/4] Fix previous erroneous assignment. --- src/DocBlock/Tags/InvalidTag.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DocBlock/Tags/InvalidTag.php b/src/DocBlock/Tags/InvalidTag.php index d15818e..c37ea69 100644 --- a/src/DocBlock/Tags/InvalidTag.php +++ b/src/DocBlock/Tags/InvalidTag.php @@ -104,9 +104,9 @@ final class InvalidTag implements Tag do { $trace = array_map( static function (array $call) use ($flatten) : array { - $args = $call['args'] ?? []; + $call['args'] = $call['args'] ?? []; - array_walk_recursive($args, $flatten); + array_walk_recursive($call['args'], $flatten); return $call; },