Allow Flow 6.x

.circleci/config.yml

@@ -1,7 +1,7 @@
 version: 2.1
 
 aliases:
-  - &ci-build-image quay.io/yeebase/ci-build:7.2
+  - &ci-build-image quay.io/yeebase/ci-build:7.3
   - &workspace_root ~/workspace
 
   - &save_composer_cache
@@ -16,11 +16,11 @@ aliases:
       - composer-cache-v1-
 
   - &attach_workspace
-     at: *workspace_root
+    at: *workspace_root
 
   - &persist_to_workspace
     root: .
-    paths: 
+    paths:
       - .
 
 jobs:
@@ -32,7 +32,7 @@ jobs:
     steps:
       - checkout
       - restore_cache: *restore_composer_cache
-      
+
       - run: |
           mkdir slack
           shopt -s extglob dotglob
@@ -61,17 +61,36 @@ jobs:
       FLOW_CONTEXT: Testing
     steps:
       - attach_workspace: *attach_workspace
-      - run:
-          bin/phpunit -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml slack/Tests/Unit
+      - run: bin/phpunit -c Build/BuildEssentials/PhpUnit/FunctionalTests.xml slack/Tests/Unit
 
 workflows:
   version: 2
   build_and_test:
     jobs:
-      - checkout
+      - checkout:
+          filters:
+            branches:
+              ignore: /dependabot.*/
       - lint:
           requires:
             - checkout
       - tests:
           requires:
-            - checkout
+            - checkout
+
+  build_and_test_dependabot:
+    jobs:
+      - hold:
+          type: approval
+          filters:
+            branches:
+              only: /dependabot.*/
+      - checkout:
+          requires:
+            - hold
+      - lint:
+          requires:
+            - checkout
+      - tests:
+          requires:
+            - checkout

.dependabot/config.yml

@@ -0,0 +1,6 @@
+version: 1
+update_configs:
+  - package_manager: "php:composer"
+    directory: "/"
+    update_schedule: "weekly"
+    target_branch: "master"

Tests/Unit/SlackServiceTest.php

@@ -27,7 +27,7 @@ class SlackServiceTest extends UnitTestCase
         ]
     ];
 
-    public function setUp()
+    public function setUp(): void
     {
         $this->slackService = new SlackService();
         $this->inject($this->slackService, 'configurations', $this->configurations);

composer.json

@@ -3,12 +3,9 @@
   "type": "neos-package",
   "name": "t3n/slack",
   "require": {
-    "neos/flow": "^5.2.0",
+    "neos/flow": "~5.2 || ~6.0",
     "maknz/slack": "~1.7.0"
   },
-  "require-dev": {
-    "t3n/coding-standard": "~1.0.0"
-  },
   "autoload": {
     "psr-4": {
       "t3n\\Slack\\": "Classes/"

composer.json.ci

@@ -6,14 +6,14 @@
     "bin-dir": "bin"
   },
   "require": {
-    "neos/flow": "~5.2.0",
-    "neos/buildessentials": "~5.2.0",
+    "neos/flow": "~6.0",
+    "neos/buildessentials": "~6.0",
     "t3n/slack": "@dev",
-    "t3n/coding-standard": "~1.0.0"
+    "t3n/coding-standard": "~1.1.0"
   },
   "require-dev": {
-    "squizlabs/php_codesniffer": "3.3.2",
-    "phpunit/phpunit": "~7.5.6",
+    "squizlabs/php_codesniffer": "~3.5",
+    "phpunit/phpunit": "~8.5",
     "mikey179/vfsstream": "~1.6"
   },
   "repositories": {