Merge pull request #45 from tanhongit/refactor-events

(#33) update some global functions
cslant · Jun 28, 2023 · 145dc3a · 145dc3a
2 parents 5d7b49e + 47b4771
commit 145dc3a
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@
 
 ## Requirement
 
-- PHP ^7.2|^8.0
+- PHP ^8.0
 - Composer
 - Telegram Bot
 

diff --git a/common/helpers.php b/common/helpers.php
@@ -47,15 +47,31 @@ function urlencoded_message(string $message): array|string
     }
 }
 
+if (!function_exists('get_template')) {
+    /**
+     * Get template
+     *
+     * @param string $partialPath
+     * @param array $data
+     * @return bool|string
+     */
+    function get_template(string $partialPath, array $data = []): bool|string
+    {
+        return (new ConfigHelper())->getTemplateData($partialPath, $data);
+    }
+}
+
 if (!function_exists('get_event_template')) {
     /**
+     * Get event template
+     *
      * @param string $partialPath
      * @param array $data
      * @return bool|string
      */
     function get_event_template(string $partialPath, array $data = []): bool|string
     {
-        return (new ConfigHelper())->getEventTemplate('events/' . $partialPath, $data);
+        return (new ConfigHelper())->getTemplateData('events/' . $partialPath, $data);
     }
 }
 
@@ -69,6 +85,6 @@ function get_event_template(string $partialPath, array $data = []): bool|string
      */
     function get_tool_template(string $partialPath, array $data = []): bool|string
     {
-        return (new ConfigHelper())->getEventTemplate('tools/' . $partialPath, $data);
+        return (new ConfigHelper())->getTemplateData('tools/' . $partialPath, $data);
     }
 }
diff --git a/resources/events/pull_request/partials/_reviewers.php b/resources/events/pull_request/partials/_reviewers.php
@@ -3,14 +3,14 @@
  * @var $payload mixed
  */
 
-$message = '';
-if (count($payload->pull_request->requested_reviewers) > 0) {
+$textReviewers = '';
+if (isset($payload->pull_request->requested_reviewers) && count($payload->pull_request->requested_reviewers) > 0) {
     $reviewers = [];
     foreach ($payload->pull_request->requested_reviewers as $reviewer) {
         $reviewers[] = $reviewer->login;
     }
 
-    $message .= "👥 Reviewers: " . implode(', ', $reviewers) . "\n";
+    $textReviewers .= "👥 Reviewers: " . implode(', ', $reviewers) . "\n";
 }
 
-return $message;
+return $textReviewers;
diff --git a/src/Helpers/ConfigHelper.php b/src/Helpers/ConfigHelper.php
@@ -37,7 +37,7 @@ public function execConfig(string $string): mixed
      * @param array $data
      * @return bool|string
      */
-    public function getEventTemplate($partialPath, array $data = []): bool|string
+    public function getTemplateData($partialPath, array $data = []): bool|string
     {
         $viewPathFile = self::VIEW_PATH . '/' . str_replace('.', '/', $partialPath) . '.php';