From 00b3b0c044c93ca568829bcec36d1a02fef1062c Mon Sep 17 00:00:00 2001
From: Niklas Ekman <nikl.ekman@gmail.com>
Date: Sun, 10 Jan 2021 14:46:08 +0100
Subject: [PATCH 1/4] fix

---
 .circleci/config.yml | 47 +++++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 768cda9..0350aed 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,25 +16,39 @@ executors:
       - image: php:8.0-alpine
     resource_class: small
 
+commands:
+  test_coverage:
+    steps:
+      - run:
+          name: Install PCOV and git
+          command: |-
+            apk add --update --no-cache ${PHPIZE_DEPS} git
+            pecl install pcov-1.0.6
+            docker-php-ext-enable pcov
+      - checkout
+      - composer/install_bin
+      - composer/install
+      - phpunit/test:
+          flags: --coverage-clover coverage/clover.xml
+      - php-coveralls/upload:
+          clover-path: coverage/clover.xml
+
 workflows:
   master:
     jobs:
-      - phpunit/test: &unit-tests
-          name: unit-tests
+      - phpunit/test:
           matrix:
             parameters:
               executor:
                 - php74
                 - php80
-          pre-steps:
-            - composer/install_bin
+          pre-steps: [ composer/install_bin ]
           filters:
             branches:
               only: master
   branch:
     jobs:
       - php-cs-fixer/fix:
-          name: coding-standards
           executor: php74
           rules: "@PSR2"
           pre-steps:
@@ -43,18 +57,15 @@ workflows:
           filters: &branch-filters
             branches:
               ignore: master
+      - test_coverage:
+          executor: php74
+          filters: *branch-filters
+          requires: [ php-cs-fixer/fix ]
       - phpunit/test:
-          <<: *unit-tests
-          flags: --coverage-clover coverage/clover.xml
-          pre-steps:
-            - run: |-
-                apk add --update --no-cache ${PHPIZE_DEPS} git
-                pecl install pcov-1.0.6
-                docker-php-ext-enable pcov
-            - composer/install_bin
-          post-steps:
-            - php-coveralls/upload:
-                clover-path: coverage/clover.xml
+          matrix:
+            parameters:
+              executor:
+                - php80
+          pre-steps: [ composer/install_bin ]
           filters: *branch-filters
-          requires:
-            - coding-standards
+          requires: [ php-cs-fixer/fix ]

From 0275afc1452f8d1eb0b3f4802b2657a0d4a4432d Mon Sep 17 00:00:00 2001
From: Niklas Ekman <nikl.ekman@gmail.com>
Date: Mon, 11 Jan 2021 10:49:00 +0100
Subject: [PATCH 2/4] fix

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0350aed..d89255a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,7 +16,7 @@ executors:
       - image: php:8.0-alpine
     resource_class: small
 
-commands:
+jobs:
   test_coverage:
     steps:
       - run:

From 8a26eba852a851d7e72a7a54e3b17655ddf6ed3f Mon Sep 17 00:00:00 2001
From: Niklas Ekman <nikl.ekman@gmail.com>
Date: Mon, 11 Jan 2021 10:49:36 +0100
Subject: [PATCH 3/4] fix

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d89255a..651dafb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,6 +18,7 @@ executors:
 
 jobs:
   test_coverage:
+    executor: php74
     steps:
       - run:
           name: Install PCOV and git

From adf4128e6ed7ceada3e22ec33d5b6efe1cf11ea9 Mon Sep 17 00:00:00 2001
From: Niklas Ekman <nikl.ekman@gmail.com>
Date: Mon, 11 Jan 2021 10:49:42 +0100
Subject: [PATCH 4/4] fix

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 651dafb..8fc8100 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,7 +59,6 @@ workflows:
             branches:
               ignore: master
       - test_coverage:
-          executor: php74
           filters: *branch-filters
           requires: [ php-cs-fixer/fix ]
       - phpunit/test: