From 51d8afae66a321610a8eee5ff7439ced21970617 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:09:15 +0100 Subject: [PATCH 01/32] gitignore --- .circleci/config.yml | 64 ++++++++++++++++++++++++++++++++++++-------- .php_cs.dist | 28 +++++++++---------- 2 files changed, 67 insertions(+), 25 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2672583..a1538d2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,17 +1,59 @@ version: 2.1 + +orbs: + composer: stockfiller/composer@0.0.38 + php-cs-fixer: stockfiller/php-cs-fixer@0.0.13 + phpunit: stockfiller/phpunit@0.0.13 + executors: default: docker: - - image: cimg/php:7.0 - - image: cimg/php:7.1 - - image: cimg/php:7.2 - - image: cimg/php:7.3 - - image: cimg/php:7.4 -orbs: - php-coveralls: nekman/php-coveralls@0.0.1 - php-cs-fixer: stockfiller/php-cs-fixer@0.0.10 + - image: php:7.4-alpine + matrix: + docker: + - image: php:7.4-alpine + - image: php:8.0-alpine + +jobs: + test: + executor: matrix + environment: + CLOVER_PATH: coverage/clover.xml + steps: + - checkout + - composer/install + - phpunit/test: + flags: --coverage-clover ${CLOVER_PATH} + no-cache: false # not all phpunit versions supports ignoring cache + - run: php vendor/bin/php-coveralls --coverage_clover ${CLOVER_PATH} + - store_artifacts: + path: "${CLOVER_PATH}" + workflows: - foo: + master: + jobs: + - test: &test + pre-steps: + - run: | + apk add --update --no-cache ${PHPIZE_DEPS} wget + yes | pecl install xdebug-3.0.2 + docker-php-ext-enable xdebug + - composer/install_bin + filters: + branches: + only: master + branch: jobs: - - php-coveralls/test_and_upload - - php-cs-fixer/fix + - php-cs-fixer/fix: + name: coding-standards + executor: default + pre-steps: + - composer/install_bin + filters: &branch-filters + branches: + ignore: master + - test: + <<: *test + filters: *branch-filters + requires: + - coding-standards diff --git a/.php_cs.dist b/.php_cs.dist index a70eec1..f80e399 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -1,14 +1,14 @@ -setRules([ - '@PSR2' => true, - 'ordered_imports' => true, - 'phpdoc_order' => true, - 'simplified_null_return' => false, - 'no_unused_imports' => true, - ])->setFinder( - PhpCsFixer\Finder::create() - ->in(__DIR__.'/src') - ->in(__DIR__.'/tests') - ); +setRules([ + '@PSR2' => true, + 'ordered_imports' => true, + 'phpdoc_order' => true, + 'simplified_null_return' => false, + 'no_unused_imports' => true, + ])->setFinder( + PhpCsFixer\Finder::create() + ->in(__DIR__.'/src') + ->in(__DIR__.'/tests') + ); From 6abd27f77a9b67c03196b26bc8235af24dfb8bcd Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:11:00 +0100 Subject: [PATCH 02/32] fix --- .circleci/config.yml | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1538d2..07c4c1d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,31 +14,24 @@ executors: - image: php:7.4-alpine - image: php:8.0-alpine -jobs: - test: - executor: matrix - environment: - CLOVER_PATH: coverage/clover.xml - steps: - - checkout - - composer/install - - phpunit/test: - flags: --coverage-clover ${CLOVER_PATH} - no-cache: false # not all phpunit versions supports ignoring cache - - run: php vendor/bin/php-coveralls --coverage_clover ${CLOVER_PATH} - - store_artifacts: - path: "${CLOVER_PATH}" - workflows: master: jobs: - - test: &test + - phpunit/test: &test + environment: + CLOVER_PATH: coverage/clover.xml + flags: --coverage-clover ${CLOVER_PATH} + no-cache: false # not all phpunit versions supports ignoring cache pre-steps: - run: | apk add --update --no-cache ${PHPIZE_DEPS} wget yes | pecl install xdebug-3.0.2 docker-php-ext-enable xdebug - composer/install_bin + post-steps: + - run: php vendor/bin/php-coveralls --coverage_clover ${CLOVER_PATH} + - store_artifacts: + path: "${CLOVER_PATH}" filters: branches: only: master From 4ebd0516f92e47ac19605cc3a311cecba237ae24 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:11:28 +0100 Subject: [PATCH 03/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 07c4c1d..a93b880 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,7 +21,7 @@ workflows: environment: CLOVER_PATH: coverage/clover.xml flags: --coverage-clover ${CLOVER_PATH} - no-cache: false # not all phpunit versions supports ignoring cache + no-cache: false # not all phpunit versions supports ignoring cache pre-steps: - run: | apk add --update --no-cache ${PHPIZE_DEPS} wget From dbfc96f432f0301d65c06057b84408afc1f0817e Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:12:20 +0100 Subject: [PATCH 04/32] fix --- .circleci/config.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a93b880..51c7782 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -18,9 +18,7 @@ workflows: master: jobs: - phpunit/test: &test - environment: - CLOVER_PATH: coverage/clover.xml - flags: --coverage-clover ${CLOVER_PATH} + flags: --coverage-clover coverage/clover.xml no-cache: false # not all phpunit versions supports ignoring cache pre-steps: - run: | @@ -29,9 +27,9 @@ workflows: docker-php-ext-enable xdebug - composer/install_bin post-steps: - - run: php vendor/bin/php-coveralls --coverage_clover ${CLOVER_PATH} + - run: php vendor/bin/php-coveralls --coverage_clover coverage/clover.xml - store_artifacts: - path: "${CLOVER_PATH}" + path: coverage/clover.xml filters: branches: only: master From 0dea5e011ffbdb220acede721de1d3bd2a819cff Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:12:46 +0100 Subject: [PATCH 05/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51c7782..1ddb2ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ workflows: filters: &branch-filters branches: ignore: master - - test: + - phpunit/test: <<: *test filters: *branch-filters requires: From 656923eb8495b13b5d6f49aa5c3789b79c828a70 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:15:15 +0100 Subject: [PATCH 06/32] fix --- .circleci/config.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ddb2ff..e5aa3a8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,22 +14,20 @@ executors: - image: php:7.4-alpine - image: php:8.0-alpine +commands: + install_xdebug: + steps: + - run: | + apk add --update --no-cache ${PHPIZE_DEPS} wget + yes | pecl install xdebug-3.0.2 + docker-php-ext-enable xdebug + workflows: master: jobs: - phpunit/test: &test - flags: --coverage-clover coverage/clover.xml - no-cache: false # not all phpunit versions supports ignoring cache pre-steps: - - run: | - apk add --update --no-cache ${PHPIZE_DEPS} wget - yes | pecl install xdebug-3.0.2 - docker-php-ext-enable xdebug - composer/install_bin - post-steps: - - run: php vendor/bin/php-coveralls --coverage_clover coverage/clover.xml - - store_artifacts: - path: coverage/clover.xml filters: branches: only: master @@ -45,6 +43,14 @@ workflows: ignore: master - phpunit/test: <<: *test + flags: --coverage-clover coverage/clover.xml + pre-steps: + - install_xdebug + - composer/install_bin + post-steps: + - run: php vendor/bin/php-coveralls --coverage_clover coverage/clover.xml + - store_artifacts: + path: coverage/clover.xml filters: *branch-filters requires: - coding-standards From f65560f4fdd6b80bd1dc4bf52c7b010381c9678d Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:16:15 +0100 Subject: [PATCH 07/32] fix --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e5aa3a8..0c608a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,6 +26,7 @@ workflows: master: jobs: - phpunit/test: &test + executor: default pre-steps: - composer/install_bin filters: From bda826e24fd77835268b40658b7cde1248a0b129 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:16:22 +0100 Subject: [PATCH 08/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c608a7..e43d474 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ workflows: master: jobs: - phpunit/test: &test - executor: default + executor: matrix pre-steps: - composer/install_bin filters: From cb6afb1ec6747ad74dac9497df3f040db0b5f8bc Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:19:19 +0100 Subject: [PATCH 09/32] fix --- .circleci/config.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e43d474..0dcc1ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -17,10 +17,13 @@ executors: commands: install_xdebug: steps: - - run: | - apk add --update --no-cache ${PHPIZE_DEPS} wget - yes | pecl install xdebug-3.0.2 - docker-php-ext-enable xdebug + - run: + name: Install Xdebug + command: |- + #!/bin/sh + apk add --update --no-cache ${PHPIZE_DEPS} wget + yes | pecl install xdebug-3.0.2 + docker-php-ext-enable xdebug workflows: master: From 829cce50df21ea28b560eb6885060a7315c8ac0d Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:27:53 +0100 Subject: [PATCH 10/32] fix --- .circleci/config.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0dcc1ce..7c881e2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,10 +9,12 @@ executors: default: docker: - image: php:7.4-alpine + resource_class: small matrix: docker: - image: php:7.4-alpine - image: php:8.0-alpine + resource_class: small commands: install_xdebug: @@ -21,9 +23,10 @@ commands: name: Install Xdebug command: |- #!/bin/sh - apk add --update --no-cache ${PHPIZE_DEPS} wget + apk add --update --no-cache ${PHPIZE_DEPS} yes | pecl install xdebug-3.0.2 docker-php-ext-enable xdebug + apk del --purge --no-cache ${PHPIZE_DEPS} workflows: master: From 392c3bfee3359f810a7daf7cda363683bae3a708 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:31:16 +0100 Subject: [PATCH 11/32] fix --- .circleci/config.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7c881e2..5dded40 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install xdebug-3.0.2 + yes | pecl install xdebug-2.9.8 docker-php-ext-enable xdebug apk del --purge --no-cache ${PHPIZE_DEPS} diff --git a/README.md b/README.md index 69e5912..ccf8527 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Luhn Algorithm -[![Build Status](https://travis-ci.org/Ekman/Luhn-Algorithm.svg?branch=master)](https://travis-ci.org/Ekman/Luhn-Algorithm) +[![Build Status](https://circleci.com/github/Ekman/luhn-algorithm.svg?style=shield)](https://app.circleci.com/pipelines/github/Ekman) [![Coverage Status](https://coveralls.io/repos/github/Ekman/luhn-algorithm/badge.svg?branch=master)](https://coveralls.io/github/Ekman/luhn-algorithm?branch=master) This is a zero dependency implementation of the Luhn Algorithm for PHP 7.0 and above. The Luhn Algorithm is used to validate things like credit cards and national identification numbers. More information on the algorithm can be found at [Wikipedia](http://en.wikipedia.org/wiki/Luhn_algorithm). From 4cc11ce9e9f6abe0960470aef3e08b14fa15978a Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:32:51 +0100 Subject: [PATCH 12/32] fix --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5dded40..63f82bd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,8 +24,8 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install xdebug-2.9.8 - docker-php-ext-enable xdebug + yes | pecl install xdebug-3.0.2 + # docker-php-ext-enable xdebug apk del --purge --no-cache ${PHPIZE_DEPS} workflows: From 7767a54705aebc3cabc64d54a1c0851d319245f0 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:40:29 +0100 Subject: [PATCH 13/32] fix --- .coveralls.yml | 3 - .gitignore | 2 + composer.json | 3 +- coverage/clover.xml | 105 ----------------------------- phpunit.xml | 3 - test-results/junit.xml | 62 ----------------- tests/LuhnAlgorithmFactoryTest.php | 2 +- 7 files changed, 5 insertions(+), 175 deletions(-) delete mode 100644 .coveralls.yml delete mode 100644 coverage/clover.xml delete mode 100644 test-results/junit.xml diff --git a/.coveralls.yml b/.coveralls.yml deleted file mode 100644 index 351146f..0000000 --- a/.coveralls.yml +++ /dev/null @@ -1,3 +0,0 @@ -service_name: travis-ci -coverage_clover: /tmp/coverage-clover.xml -json_path: /tmp/coveralls-upload.json diff --git a/.gitignore b/.gitignore index bcf880b..6d7e6a1 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ nbproject/ .idea/ .php_cs.cache .phpunit.result.cache +coverage +test-results # Eclipse .buildpath diff --git a/composer.json b/composer.json index e4f8964..1813778 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,7 @@ }, "scripts": { "lint": "php-cs-fixer fix", - "test": "phpunit --configuration phpunit.xml" + "test": "phpunit", + "coveralls": "php-coveralls" } } diff --git a/coverage/clover.xml b/coverage/clover.xml deleted file mode 100644 index becd19c..0000000 --- a/coverage/clover.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/phpunit.xml b/phpunit.xml index 53a68fa..494425d 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -5,9 +5,6 @@ src - - - diff --git a/test-results/junit.xml b/test-results/junit.xml deleted file mode 100644 index e1506be..0000000 --- a/test-results/junit.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/LuhnAlgorithmFactoryTest.php b/tests/LuhnAlgorithmFactoryTest.php index 1ee1a05..cbb88f7 100644 --- a/tests/LuhnAlgorithmFactoryTest.php +++ b/tests/LuhnAlgorithmFactoryTest.php @@ -29,7 +29,7 @@ use Nekman\LuhnAlgorithm\LuhnAlgorithmFactory; use PHPUnit\Framework\TestCase; -class LuhmAlgorithmFactoryTest extends TestCase +class LuhnAlgorithmFactoryTest extends TestCase { public function testCreate() { From 6fa2728e51aef6af958f3bb11af53a197779fc13 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:45:58 +0100 Subject: [PATCH 14/32] fix --- .circleci/config.yml | 3 ++- .travis.yml | 23 ----------------------- composer.json | 4 +--- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index 63f82bd..4f92cb6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: composer: stockfiller/composer@0.0.38 - php-cs-fixer: stockfiller/php-cs-fixer@0.0.13 + php-cs-fixer: stockfiller/php-cs-fixer@0.0.15 phpunit: stockfiller/phpunit@0.0.13 executors: @@ -43,6 +43,7 @@ workflows: - php-cs-fixer/fix: name: coding-standards executor: default + rules: @PSR2 pre-steps: - composer/install_bin filters: &branch-filters diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 2bddeda..0000000 --- a/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: php - -php: - - 7.4 - - 8.0 - - nightly - -matrix: - allow_failures: - - php: nightly - -install: composer update --no-interaction --classmap-authoritative --no-suggest --ignore-platform-reqs --prefer-lowest - -script: vendor/bin/phpunit --configuration phpunit.xml - -after_success: vendor/bin/php-coveralls --verbose - -notifications: - email: false - -cache: - directories: - - $HOME/.composer diff --git a/composer.json b/composer.json index 1813778..9564577 100644 --- a/composer.json +++ b/composer.json @@ -44,8 +44,6 @@ "php-coveralls/php-coveralls": "^2.1" }, "scripts": { - "lint": "php-cs-fixer fix", - "test": "phpunit", - "coveralls": "php-coveralls" + "test": "phpunit" } } From f4e64e0749cb9553249c64229e440f35311a712f Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:46:06 +0100 Subject: [PATCH 15/32] fix --- .php_cs.dist | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 .php_cs.dist diff --git a/.php_cs.dist b/.php_cs.dist deleted file mode 100644 index f80e399..0000000 --- a/.php_cs.dist +++ /dev/null @@ -1,14 +0,0 @@ -setRules([ - '@PSR2' => true, - 'ordered_imports' => true, - 'phpdoc_order' => true, - 'simplified_null_return' => false, - 'no_unused_imports' => true, - ])->setFinder( - PhpCsFixer\Finder::create() - ->in(__DIR__.'/src') - ->in(__DIR__.'/tests') - ); From 5ccd3f0d1f740b49b86e9f804587d385c091a105 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:46:33 +0100 Subject: [PATCH 16/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4f92cb6..ca8f795 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,7 +43,7 @@ workflows: - php-cs-fixer/fix: name: coding-standards executor: default - rules: @PSR2 + rules: "@PSR2" pre-steps: - composer/install_bin filters: &branch-filters From 77ccc200311e9f045cd32079e4bdbb9170103ce4 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:47:32 +0100 Subject: [PATCH 17/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ca8f795..d3a19ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 orbs: composer: stockfiller/composer@0.0.38 - php-cs-fixer: stockfiller/php-cs-fixer@0.0.15 + php-cs-fixer: stockfiller/php-cs-fixer@0.0.16 phpunit: stockfiller/phpunit@0.0.13 executors: From 2d638a66012a097607ee7376bdd91fa87aff04f7 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:51:36 +0100 Subject: [PATCH 18/32] fix --- .circleci/config.yml | 4 ++-- LICENSE.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d3a19ef..8348c8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,8 +24,8 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install xdebug-3.0.2 - # docker-php-ext-enable xdebug + yes | pecl install xdebug-3.0.2 || exit 0 + docker-php-ext-enable xdebug apk del --purge --no-cache ${PHPIZE_DEPS} workflows: diff --git a/LICENSE.md b/LICENSE.md index 7e3b91a..829363d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2018 Niklas Ekman +Copyright (c) 2021 Niklas Ekman Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in From 78b6407c5bb14ef281b066dede318d0480953b63 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:54:08 +0100 Subject: [PATCH 19/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8348c8f..f82f163 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install xdebug-3.0.2 || exit 0 + yes | pecl install xdebug-3.0.1 docker-php-ext-enable xdebug apk del --purge --no-cache ${PHPIZE_DEPS} From 764c0f080dd8565914ff80880e9bd1ea370ad997 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:55:58 +0100 Subject: [PATCH 20/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f82f163..ac69dc5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install xdebug-3.0.1 + yes | pecl install xdebug-3.0.0 docker-php-ext-enable xdebug apk del --purge --no-cache ${PHPIZE_DEPS} From 02b5f218c2faef49191708a95760be1322b177ad Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 13:58:39 +0100 Subject: [PATCH 21/32] fix --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ac69dc5..67a924b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,12 +20,12 @@ commands: install_xdebug: steps: - run: - name: Install Xdebug + name: Install PCOV command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install xdebug-3.0.0 - docker-php-ext-enable xdebug + yes | pecl install pcov-1.0.6 + docker-php-ext-enable pcov apk del --purge --no-cache ${PHPIZE_DEPS} workflows: From f24cb7c630ee239d978d6638d40fe21ca4a7507b Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:02:59 +0100 Subject: [PATCH 22/32] fix --- .circleci/config.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 67a924b..1479f80 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,9 +24,8 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install pcov-1.0.6 + yes | pecl install --soft pcov-1.0.6 docker-php-ext-enable pcov - apk del --purge --no-cache ${PHPIZE_DEPS} workflows: master: From 78a0c0a27704aab58d5dca9ff15977bb20216810 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:03:48 +0100 Subject: [PATCH 23/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1479f80..6953fc1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install --soft pcov-1.0.6 + yes | pecl install --ignore-errors pcov-1.0.6 docker-php-ext-enable pcov workflows: From daf578accc62eaa238c16e73ca887cf8e076a1ca Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:05:07 +0100 Subject: [PATCH 24/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6953fc1..b8c47de 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install --ignore-errors pcov-1.0.6 + yes | pecl install --force pcov-1.0.6 docker-php-ext-enable pcov workflows: From 7470216e44a92af1df5463c927b3134bf5322f9d Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:08:51 +0100 Subject: [PATCH 25/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8c47de..b0aa321 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - yes | pecl install --force pcov-1.0.6 + pecl install --force pcov-1.0.6 docker-php-ext-enable pcov workflows: From 7505f4294a6ec96614e09aafb5b28b4c3d5c48a2 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:08:55 +0100 Subject: [PATCH 26/32] fix --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b0aa321..c1170b6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -24,7 +24,7 @@ commands: command: |- #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} - pecl install --force pcov-1.0.6 + pecl install pcov-1.0.6 docker-php-ext-enable pcov workflows: From f74fb3fa1c1a4d086947ae45d8353428b2dc0429 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:10:39 +0100 Subject: [PATCH 27/32] fix --- .circleci/config.yml | 3 +-- .coveralls.yml | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 .coveralls.yml diff --git a/.circleci/config.yml b/.circleci/config.yml index c1170b6..ca78fe5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,7 +22,6 @@ commands: - run: name: Install PCOV command: |- - #!/bin/sh apk add --update --no-cache ${PHPIZE_DEPS} pecl install pcov-1.0.6 docker-php-ext-enable pcov @@ -55,7 +54,7 @@ workflows: - install_xdebug - composer/install_bin post-steps: - - run: php vendor/bin/php-coveralls --coverage_clover coverage/clover.xml + - run: php vendor/bin/php-coveralls - store_artifacts: path: coverage/clover.xml filters: *branch-filters diff --git a/.coveralls.yml b/.coveralls.yml new file mode 100644 index 0000000..430eb16 --- /dev/null +++ b/.coveralls.yml @@ -0,0 +1,2 @@ +json_path: coverage/coveralls.json +coverage_clover: coverage/clover.xml From a614c0c9426d5423eeae1fcc10361fc09c6fa21d Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:11:43 +0100 Subject: [PATCH 28/32] fix --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ca78fe5..2746db3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,9 +20,9 @@ commands: install_xdebug: steps: - run: - name: Install PCOV + name: Install PCOV and Git command: |- - apk add --update --no-cache ${PHPIZE_DEPS} + apk add --update --no-cache ${PHPIZE_DEPS} git pecl install pcov-1.0.6 docker-php-ext-enable pcov From 2d7575f1daac526a2dcf352bd5abbee6e8fda2d8 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:12:56 +0100 Subject: [PATCH 29/32] fix --- .circleci/config.yml | 5 +++-- .coveralls.yml | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 2746db3..4273fe9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,8 @@ commands: workflows: master: jobs: - - phpunit/test: &test + - phpunit/test: &unit-tests + name: unit-tests executor: matrix pre-steps: - composer/install_bin @@ -48,7 +49,7 @@ workflows: branches: ignore: master - phpunit/test: - <<: *test + <<: *unit-tests flags: --coverage-clover coverage/clover.xml pre-steps: - install_xdebug diff --git a/.coveralls.yml b/.coveralls.yml index 430eb16..6e0b724 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1,2 +1,3 @@ json_path: coverage/coveralls.json coverage_clover: coverage/clover.xml +verbose: true From f91edb979843d70674fca3d9b2249f04a489b411 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:13:03 +0100 Subject: [PATCH 30/32] fix --- .coveralls.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.coveralls.yml b/.coveralls.yml index 6e0b724..06c707e 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1,3 +1,4 @@ json_path: coverage/coveralls.json coverage_clover: coverage/clover.xml verbose: true +service: circleci From 68de1c8cdde8dbfe98218c23511e0cccdd690bc9 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:14:18 +0100 Subject: [PATCH 31/32] fix --- .circleci/config.yml | 2 +- .coveralls.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4273fe9..a4f1617 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,7 +55,7 @@ workflows: - install_xdebug - composer/install_bin post-steps: - - run: php vendor/bin/php-coveralls + - run: php vendor/bin/php-coveralls --verbose - store_artifacts: path: coverage/clover.xml filters: *branch-filters diff --git a/.coveralls.yml b/.coveralls.yml index 06c707e..9db1085 100644 --- a/.coveralls.yml +++ b/.coveralls.yml @@ -1,4 +1,3 @@ json_path: coverage/coveralls.json coverage_clover: coverage/clover.xml -verbose: true -service: circleci +service_name: circleci From 5c8679a215277a0b2e13e5fc95b1b1595a0128a7 Mon Sep 17 00:00:00 2001 From: Niklas Ekman Date: Sun, 10 Jan 2021 14:21:45 +0100 Subject: [PATCH 32/32] fix --- .circleci/config.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a4f1617..b53f499 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,17 +2,16 @@ version: 2.1 orbs: composer: stockfiller/composer@0.0.38 - php-cs-fixer: stockfiller/php-cs-fixer@0.0.16 + php-cs-fixer: stockfiller/php-cs-fixer@0.0.18 phpunit: stockfiller/phpunit@0.0.13 executors: - default: + php74: docker: - image: php:7.4-alpine resource_class: small - matrix: + php80: docker: - - image: php:7.4-alpine - image: php:8.0-alpine resource_class: small @@ -31,7 +30,11 @@ workflows: jobs: - phpunit/test: &unit-tests name: unit-tests - executor: matrix + matrix: + parameters: + executor: + - php74 + - php80 pre-steps: - composer/install_bin filters: @@ -41,7 +44,7 @@ workflows: jobs: - php-cs-fixer/fix: name: coding-standards - executor: default + executor: php74 rules: "@PSR2" pre-steps: - composer/install_bin