From 16196880215ba178d32f1a03ca86587ca0d06a55 Mon Sep 17 00:00:00 2001
From: Brad Bell <brad@pixelandtonic.com>
Date: Sun, 9 Oct 2022 20:35:34 -0700
Subject: [PATCH 1/2] update ci yaml

---
 .github/workflows/ci.yml | 32 +++++++++-----------------------
 1 file changed, 9 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9fafc7638dc..47973cec4f7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,36 +3,22 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - develop
       - v3
   pull_request:
+permissions:
+  contents: read
 concurrency:
   group: ci-${{ github.ref }}
   cancel-in-progress: true
 jobs:
-  ecs:
-    name: ECS
-    uses: craftcms/.github/.github/workflows/ecs.yml@v2
+  ci:
+    name: ci
+    uses: craftcms/.github/.github/workflows/ci.yml@v3
     with:
-      php_version: '7.2'
-  prettier:
-    name: Prettier
-    uses: craftcms/.github/.github/workflows/prettier.yml@v2
-  codecept:
-    name: Codeception
-    needs: [ecs, prettier]
-    uses: craftcms/.github/.github/workflows/codecept.yml@v2
-    with:
-      php_versions: '["7.2", "7.3", "7.4", "8.0", "8.1"]'
-  notify-slack:
-    name: Notify Slack
-    needs: [ecs, prettier, codecept]
-    if: ${{ always() }}
-    uses: craftcms/.github/.github/workflows/notify-slack.yml@v2
-    with:
-      success: ${{ needs.ecs.result == 'success' && needs.prettier.result == 'success' && needs.codecept.result == 'success' }}
-      failure: ${{ needs.ecs.result == 'failure' || needs.prettier.result == 'failure' || needs.codecept.result == 'failure' }}
-      failure_text_prefix: <!subteam^SGFL9NKNZ>
+      craft_version: '3'
+      jobs: '["ecs", "prettier", "tests"]'
+      notify_slack: true
+      slack_subteam: <!subteam^SGFL9NKNZ>
     secrets:
       token: ${{ secrets.GITHUB_TOKEN }}
       slack_webhook_url: ${{ secrets.SLACK_CRAFT_WEBHOOK_URL }}

From 94ec14f2c5a9ee22f4f92a694394b793c0fe9f5a Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Mon, 10 Oct 2022 09:59:52 -0700
Subject: [PATCH 2/2] =?UTF-8?q?ReflectionMethod=20=E2=86=92=20ReflectionFu?=
 =?UTF-8?q?nctionAbstract?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In preparation for Yii 2.0.46
---
 src/console/controllers/HelpController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/console/controllers/HelpController.php b/src/console/controllers/HelpController.php
index 72dbf2b42db..457d92df72d 100644
--- a/src/console/controllers/HelpController.php
+++ b/src/console/controllers/HelpController.php
@@ -9,7 +9,7 @@
 
 use Craft;
 use craft\helpers\Json;
-use ReflectionMethod;
+use ReflectionFunctionAbstract;
 use Throwable;
 use yii\base\InvalidConfigException;
 use yii\console\Controller;
@@ -218,10 +218,10 @@ protected function allCommandsInfo(): array
      * Returns full description from the docblock without any kind of ANSI terminal formatting
      *
      * @see Controller::getActionHelp()
-     * @param ReflectionMethod $reflection
+     * @param ReflectionFunctionAbstract $reflection
      * @return string
      */
-    protected function unformattedActionHelp(ReflectionMethod $reflection): string
+    protected function unformattedActionHelp(ReflectionFunctionAbstract $reflection): string
     {
         $comment = strtr(trim(preg_replace('/^\s*\**( |\t)?/m', '', trim($reflection->getDocComment(), '/'))), "\r", '');
         if (preg_match('/^\s*@\w+/m', $comment, $matches, PREG_OFFSET_CAPTURE)) {