Merge pull request #10 from Sebobo/task/run-actions

TASK: Run automatic tests
Sebobo · Jan 28, 2022 · c05d2ca · c05d2ca
2 parents 945ab39 + 7954b44
commit c05d2ca
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -2,31 +2,36 @@ name: Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        flowVersion:
+        neosVersion:
+#          - '4.3'
           - '5.3'
-          - '6.3'
           - '7.3'
 
-    name: 'Terminal ${{ matrix.flowVersion }} test'
+    name: 'Terminal with Neos ${{ matrix.neosVersion }} test'
 
     env:
-      FLOW_TARGET_VERSION: ${{matrix.flowVersion}}
+      NEOS_TARGET_VERSION: ${{matrix.neosVersion}}
       FLOW_CONTEXT: Testing
-      FLOW_FOLDER: ../flow-base-distribution
+      FLOW_FOLDER: ../neos-base-distribution
 
     steps:
     - uses: actions/checkout@v2
 
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: 7.4
+
     - name: Update Composer
       run: |
         sudo composer self-update
@@ -46,7 +51,8 @@ jobs:
 
     - name: Prepare Flow distribution
       run: |
-        git clone https://github.com/neos/flow-base-distribution.git -b ${FLOW_TARGET_VERSION} ${FLOW_FOLDER}
+        git clone https://github.com/neos/neos-base-distribution.git -b ${NEOS_TARGET_VERSION} ${FLOW_FOLDER}
+        cd ${FLOW_FOLDER}
         composer require --no-update --no-interaction shel/neos-terminal
 
     - name: Install distribution

diff --git a/Classes/Controller/TerminalCommandController.php b/Classes/Controller/TerminalCommandController.php
@@ -152,7 +152,7 @@ public function invokeCommandAction(
      * @param ActionResponse $response
      * @throws UnsupportedRequestTypeException
      */
-    protected function initializeController(ActionRequest $request, ActionResponse $response): void
+    protected function initializeController(ActionRequest $request, ActionResponse $response)
     {
         parent::initializeController($request, $response);
         $this->feedbackCollection->setControllerContext($this->getControllerContext());
@@ -163,7 +163,7 @@ protected function initializeController(ActionRequest $request, ActionResponse $
      *
      * @throws TerminalException
      */
-    protected function initializeAction(): void
+    protected function initializeAction()
     {
         $terminalConfiguration = $this->frontendConfiguration['Shel.Neos.Terminal:Terminal'];
 

diff --git a/Readme.md b/Readme.md
@@ -1,5 +1,7 @@
 # Neos CMS terminal for running Eel expressions and other commands in the UI
 
+[![Tests](https://github.com/Sebobo/Shel.Neos.Terminal/actions/workflows/tests.yml/badge.svg)](https://github.com/Sebobo/Shel.Neos.Terminal/actions/workflows/tests.yml)
+
 This package provides a Terminal emulator plugin for the [Neos CMS](https://www.neos.io) UI.
 Several commands are provided to save time during development & debugging of Neos CMS projects.