diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f02b096446ade34ebcb169f81612c049db238a14
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,30 @@
+version: "2"
+
+checks:
+ method-complexity:
+ config:
+ threshold: 9
+
+exclude_patterns:
+ - "config/"
+ - "db/"
+ - "dist/"
+ - "docs/"
+ - "features/"
+ - "**/node_modules/"
+ - "script/"
+ - "**/spec/"
+ - "**/test/"
+ - "**/tests/"
+ - "Tests/"
+ - "example.php"
+ - "examples/"
+ - "**/vendor/"
+ - "**/*_test.go"
+ - "**/*.d.ts"
+
+plugins:
+ phpcodesniffer:
+ enabled: true
+ config:
+ standard: "PSR2"
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f7a98f9bffb2f069c27474fe464da1699ff47c6c
--- /dev/null
+++ b/.github/workflows/push.yml
@@ -0,0 +1,81 @@
+on: [push, pull_request]
+jobs:
+ before:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Prepare CodeClimate
+ env:
+ CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+ run: |
+ wget https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 -qO ./cc-test-reporter
+ chmod +x ./cc-test-reporter
+ ./cc-test-reporter before-build
+
+ unit-tests:
+ needs: [before]
+ strategy:
+ matrix:
+ include:
+ - image: 'iras/php7-composer:1'
+ php_version: 7.1
+ - image: 'iras/php7-composer:2'
+ php_version: 7.2
+ - image: 'iras/php7-composer:3'
+ php_version: 7.3
+ - image: 'iras/php7-composer:4'
+ php_version: 7.4
+ - image: 'iras/php8-composer:0'
+ php_version: 8.0
+ name: PHP Unit Tests on PHP ${{ matrix.php_version }}
+ runs-on: ubuntu-latest
+ container: ${{ matrix.image }}
+ steps:
+ - name: Container Setup
+ run: |
+ apk add --no-cache tar openssl
+ mkdir coverage
+ wget https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 -qO /usr/bin/cc-test-reporter
+ chmod +x /usr/bin/cc-test-reporter
+ - name: Checkout
+ run: |
+ git init && git remote add origin https://github.com/${{ github.repository }}.git
+ git fetch origin ${{ github.sha }} && git reset --hard ${{ github.sha }}
+ - uses: actions/cache@v2
+ with:
+ path: /composer/cache
+ key: composer-cache-7.${{ matrix.MINOR_VERSION }}
+ - name: Install dependencies
+ run: composer install --no-interaction --ansi
+ - name: Execute tests
+ run: |
+ php -dzend_extension=xdebug.so -dxdebug.mode=coverage vendor/bin/phpunit \
+ -c phpunit.xml \
+ --coverage-clover=coverage/clover.xml \
+ --coverage-text \
+ --color=always
+ - name: Format Coverage
+ run: |
+ cc-test-reporter format-coverage -t clover -o coverage/cc-${{ matrix.php_version }}.json coverage/clover.xml
+ - name: Store Coverage Result
+ uses: actions/upload-artifact@v3
+ with:
+ name: coverage-results
+ path: coverage/
+
+ after:
+ needs: [unit-tests]
+ runs-on: ubuntu-latest
+ steps:
+ - name: Restore Coverage Result
+ uses: actions/download-artifact@v3
+ with:
+ name: coverage-results
+ path: coverage/
+ - name: Report Coverage
+ env:
+ CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+ run: |
+ wget https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 -qO ./cc-test-reporter
+ chmod +x ./cc-test-reporter
+ ./cc-test-reporter sum-coverage coverage/cc-*.json -p 5 -o coverage/cc-total.json
+ ./cc-test-reporter upload-coverage -i coverage/cc-total.json
diff --git a/.gitignore b/.gitignore
index c10ac6e1e661709f770577b8609ee583375d9415..d3c5cfd349cb6c55ad5f938672086ebb20120e0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,8 @@ composer.phar
# ide settings
/.idea*
+# phpunit result
+/.phpunit.result.cache
+
# rendered documentation
/docs/_site
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 495e31c3a7d1bfa7562e4e05b3139eba597070d7..0000000000000000000000000000000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-language: php
-dist: trusty
-php:
- - 7.0
- - 7.1
- - 7.2
-
-sudo: false
-
-cache:
- directories:
- - $HOME/.composer/cache
-
-matrix:
- fast_finish: true
-
-before_script:
- - composer install --no-interaction
- - sh -c 'if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then composer require satooshi/php-coveralls:~0.6@stable; fi;'
- - mkdir -p build/logs
-
-script:
- - composer code-style
- - vendor/bin/phpunit -c phpunit.xml --coverage-clover=build/logs/clover.xml --coverage-text
- - sh -c 'if [ "$TRAVIS_PHP_VERSION" = "7.1" ]; then php vendor/bin/coveralls -v; fi;'
diff --git a/README.md b/README.md
index a49389f1ea9633cc0a93639db5b22846971a9d59..1c7d53ac0de23027c0b1ace3d681170a5f9a6268 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
# tflori/verja
-[](https://travis-ci.org/tflori/verja)
-[](https://coveralls.io/github/tflori/verja?branch=master)
+[](https://github.com/tflori/verja/actions/workflows/push.yml)
+[](https://codeclimate.com/github/tflori/verja/test_coverage)
+[](https://codeclimate.com/github/tflori/verja/maintainability)
[](https://packagist.org/packages/tflori/verja)
[](https://packagist.org/packages/tflori/verja)
[](https://packagist.org/packages/tflori/verja)
diff --git a/composer.json b/composer.json
index 9e9086427cfdc76024275c6725a856ba660e13a4..cb5bbde2673f6c665b42445807b0c12b25c6419a 100644
--- a/composer.json
+++ b/composer.json
@@ -3,15 +3,16 @@
"description": "An validation tool for arrays filled by foreign input",
"license": "MIT",
"require": {
- "php": "^7.0",
+ "php": "^7.0 || ^8.0",
"ext-json": "*"
},
"require-dev": {
- "phpunit/phpunit": "^6.0",
- "mockery/mockery": "^0.9",
- "squizlabs/php_codesniffer": "^2.7",
- "tflori/dependency-injector": "^1.3",
- "nesbot/carbon": "^1.23"
+ "phpunit/phpunit": "*",
+ "tflori/phpunit-printer": "*",
+ "mockery/mockery": "^1.1",
+ "squizlabs/php_codesniffer": "^3.5",
+ "tflori/dependency-injector": "^2.2",
+ "nesbot/carbon": "^2.53"
},
"autoload": {
"psr-4": {
diff --git a/phpunit.xml b/phpunit.xml
index 3a97ae4cc47bd5a90e5bb1a12393a10373a1f5aa..08eda2feacfeff715253a6211f529db678304f06 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -9,8 +9,7 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
- syntaxCheck="true"
- printerClass="\Verja\Test\Printer">
+ printerClass="PhpUnitPrinter\TextPrinter">
<testsuite name="tests">
<directory>./tests/</directory>
</testsuite>
diff --git a/tests/ErrorsTest.php b/tests/ErrorsTest.php
index 35f5252f04a720a17b64c93bffff078036e8df51..a8f126ca4cbec3add35690b8b842e34c62c41331 100644
--- a/tests/ErrorsTest.php
+++ b/tests/ErrorsTest.php
@@ -43,9 +43,9 @@ class ErrorsTest extends TestCase
$serialized = serialize($error);
- self::assertContains('ERROR_KEY', $serialized);
- self::assertContains('validated value', $serialized);
- self::assertContains('Error message from validator', $serialized);
+ self::assertStringContainsString('ERROR_KEY', $serialized);
+ self::assertStringContainsString('validated value', $serialized);
+ self::assertStringContainsString('Error message from validator', $serialized);
}
/** @test */
diff --git a/tests/Field/ValidatorTest.php b/tests/Field/ValidatorTest.php
index 36d46bc0a2fccb212db2f95689703dd9230e8616..21a432a80ace93d1b7265b0d14f658dd8206d598 100644
--- a/tests/Field/ValidatorTest.php
+++ b/tests/Field/ValidatorTest.php
@@ -2,7 +2,6 @@
namespace Verja\Test\Field;
-use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
use Verja\Field;
use Verja\Gate;
use Verja\Test\Examples\NotSerializable;
@@ -13,8 +12,6 @@ use Verja\ValidatorInterface;
class ValidatorTest extends TestCase
{
- use MockeryPHPUnitIntegration;
-
/** @dataProvider provideValidatorsValueExpected
* @param ValidatorInterface[] $validators
* @param mixed $value
diff --git a/tests/Filter/DateTimeTest.php b/tests/Filter/DateTimeTest.php
index c884a59ba951df1730371e85d55690a61a1e132a..306da86a673a270b3d97f6f88e0f9a0919685279 100644
--- a/tests/Filter/DateTimeTest.php
+++ b/tests/Filter/DateTimeTest.php
@@ -9,7 +9,7 @@ use Verja\Test\TestCase;
class DateTimeTest extends TestCase
{
- public static function setUpBeforeClass()
+ public static function setUpBeforeClass(): void
{
parent::setUpBeforeClass();
date_default_timezone_set('Europe/Berlin');
diff --git a/tests/Filter/EscapeTest.php b/tests/Filter/EscapeTest.php
index b2c9e30c03ffffb06ea3406f2ca437dc78892449..7b148e731eba9d6ecb6b0bc4403dd85e526076b3 100644
--- a/tests/Filter/EscapeTest.php
+++ b/tests/Filter/EscapeTest.php
@@ -39,7 +39,7 @@ class EscapeTest extends TestCase
$filtered = $filter->filter(42);
- self::assertInternalType('integer', $filtered);
+ self::assertIsInt($filtered);
}
/** @dataProvider provideStringsWithHtmlEntities
diff --git a/tests/Filter/FromStringTest.php b/tests/Filter/FromStringTest.php
index a5074f22bb7925ff031028ec30836dafb6dfc11a..258e5315d830a8c87db3948ebe80ae84fcf1edda 100644
--- a/tests/Filter/FromStringTest.php
+++ b/tests/Filter/FromStringTest.php
@@ -9,7 +9,7 @@ use Verja\Test\Examples\CustomFilter;
class FromStringTest extends TestCase
{
- protected function tearDown()
+ protected function tearDown(): void
{
parent::tearDown();
Filter::resetNamespaces();
diff --git a/tests/Printer.php b/tests/Printer.php
deleted file mode 100644
index a2c8ca519dd96cc4fdf4eb518e0022979d8add06..0000000000000000000000000000000000000000
--- a/tests/Printer.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-namespace Verja\Test;
-
-use PHPUnit\Framework\AssertionFailedError;
-use PHPUnit\Framework\Test;
-use PHPUnit\Framework\Warning;
-use PHPUnit\TextUI\ResultPrinter;
-
-class Printer extends ResultPrinter
-{
-
- /**
- * Replacement symbols for test statuses.
- *
- * @var array
- */
- protected static $symbols = [
- 'E' => "\e[31m!\e[0m", // red !
- 'F' => "\e[31m\xe2\x9c\x96\e[0m", // red X
- 'W' => "\e[33mW\e[0m", // yellow W
- 'I' => "\e[33mI\e[0m", // yellow I
- 'R' => "\e[33mR\e[0m", // yellow R
- 'S' => "\e[36mS\e[0m", // cyan S
- '.' => "\e[32m\xe2\x9c\x94\e[0m", // green checkmark
- ];
- /**
- * Structure of the outputted test row.
- *
- * @var string
- */
- protected $testRow = '';
-
- /** @var string */
- protected $previousClassName = '';
-
- /**
- * {@inheritdoc}
- */
- protected function writeProgress($progress)
- {
- if ($this->hasReplacementSymbol($progress)) {
- $progress = static::$symbols[$progress];
- }
- $this->write(" {$progress} {$this->testRow}" . PHP_EOL);
- $this->column++;
- $this->numTestsRun++;
- }
- /**
- * {@inheritdoc}
- */
- public function addError(Test $test, \Exception $e, $time)
- {
- $this->buildTestRow(get_class($test), $test->getName(), $time, 'fg-red');
- parent::addError($test, $e, $time);
- }
- /**
- * {@inheritdoc}
- */
- public function addFailure(Test $test, AssertionFailedError $e, $time)
- {
- $this->buildTestRow(get_class($test), $test->getName(), $time, 'fg-red');
- parent::addFailure($test, $e, $time);
- }
- /**
- * {@inheritdoc}
- */
- public function addWarning(Test $test, Warning $e, $time)
- {
- $this->buildTestRow(get_class($test), $test->getName(), $time, 'fg-yellow');
- parent::addWarning($test, $e, $time);
- }
- /**
- * {@inheritdoc}
- */
- public function addIncompleteTest(Test $test, \Exception $e, $time)
- {
- $this->buildTestRow(get_class($test), $test->getName(), $time, 'fg-yellow');
- parent::addIncompleteTest($test, $e, $time);
- }
- /**
- * {@inheritdoc}
- */
- public function addRiskyTest(Test $test, \Exception $e, $time)
- {
- $this->buildTestRow(get_class($test), $test->getName(), $time, 'fg-yellow');
- parent::addRiskyTest($test, $e, $time);
- }
- /**
- * {@inheritdoc}
- */
- public function addSkippedTest(Test $test, \Exception $e, $time)
- {
- $this->buildTestRow(get_class($test), $test->getName(), $time, 'fg-cyan');
- parent::addSkippedTest($test, $e, $time);
- }
- /**
- * {@inheritdoc}
- */
- public function endTest(Test $test, $time)
- {
- $testName = \PHPUnit\Util\Test::describe($test);
- if ($this->hasCompoundClassName($testName)) {
- list($className, $methodName) = explode('::', $testName);
- $this->buildTestRow($className, $methodName, $time);
- }
- parent::endTest($test, $time);
- }
- /**
- * {@inheritdoc}
- *
- * We'll handle the coloring ourselves.
- */
- protected function writeProgressWithColor($color, $buffer)
- {
- return $this->writeProgress($buffer);
- }
- /**
- * Formats the results for a single test.
- *
- * @param $className
- * @param $methodName
- * @param $time
- * @param $color
- */
- protected function buildTestRow($className, $methodName, $time, $color = 'fg-white')
- {
- if ($className != $this->previousClassName) {
- $this->write(PHP_EOL . $this->formatWithColor('fg-magenta', $className) . PHP_EOL);
- $this->previousClassName = $className;
- }
-
- $this->testRow = sprintf(
- "(%s) %s",
- $this->formatTestDuration($time),
- $this->formatWithColor($color, "{$this->formatMethodName($methodName)}")
- );
- }
- /**
- * Makes the method name more readable.
- *
- * @param $method
- * @return mixed
- */
- protected function formatMethodName($method)
- {
- return ucfirst(
- $this->splitCamels(
- $this->splitSnakes($method)
- )
- );
- }
- /**
- * Replaces underscores in snake case with spaces.
- *
- * @param $name
- * @return string
- */
- protected function splitSnakes($name)
- {
- return str_replace('_', ' ', $name);
- }
- /**
- * Splits camel-cased names while handling caps sections properly.
- *
- * @param $name
- * @return string
- */
- protected function splitCamels($name)
- {
- return preg_replace('/(?<=[a-z])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])/', ' $1', $name);
- }
- /**
- * Colours the duration if the test took longer than 500ms.
- *
- * @param $time
- * @return string
- */
- protected function formatTestDuration($time)
- {
- $testDurationInMs = round($time * 1000);
- $duration = $testDurationInMs > 500
- ? $this->formatWithColor('fg-yellow', $testDurationInMs)
- : $testDurationInMs;
- return sprintf('%s ms', $duration);
- }
- /**
- * Verifies if we have a replacement symbol available.
- *
- * @param $progress
- * @return bool
- */
- protected function hasReplacementSymbol($progress)
- {
- return in_array($progress, array_keys(static::$symbols));
- }
- /**
- * Checks if the class name is in format Class::method.
- *
- * @param $testName
- * @return bool
- */
- protected function hasCompoundClassName($testName)
- {
- return ! empty($testName) && strpos($testName, '::') > -1;
- }
-}
diff --git a/tests/TestCase.php b/tests/TestCase.php
index d874a701b7a80853d41826de6693fc2022c7332f..420b0bd3be1ff48639e5c25a6990c330b611b0a6 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -2,35 +2,8 @@
namespace Verja\Test;
-use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
-class TestCase extends \PHPUnit\Framework\TestCase
+class TestCase extends MockeryTestCase
{
- use MockeryPHPUnitIntegration;
-
- /**
- * Performs assertions shared by all tests of a test case. This method is
- * called before execution of a test ends and before the tearDown method.
- */
- protected function assertPostConditions()
- {
- $this->addMockeryExpectationsToAssertionCount();
- $this->closeMockery();
-
- parent::assertPostConditions();
- }
-
- protected function addMockeryExpectationsToAssertionCount()
- {
- $container = \Mockery::getContainer();
- if ($container != null) {
- $count = $container->mockery_getExpectationCount();
- $this->addToAssertionCount($count);
- }
- }
-
- protected function closeMockery()
- {
- \Mockery::close();
- }
}
diff --git a/tests/Validator/FromStringTest.php b/tests/Validator/FromStringTest.php
index f361b66186d626c0e7f4a55df011bb47cce3c61c..de5fb66d8da676224ba9d5f8012e49926856810c 100644
--- a/tests/Validator/FromStringTest.php
+++ b/tests/Validator/FromStringTest.php
@@ -9,7 +9,7 @@ use Verja\Validator;
class FromStringTest extends TestCase
{
- protected function tearDown()
+ protected function tearDown(): void
{
parent::tearDown();
Validator::resetNamespaces();
diff --git a/tests/Validator/UrlTest.php b/tests/Validator/UrlTest.php
index 47e6ae2cace15a8a151db9f527630becea18d7e6..81a4bad4796f81787c4e4f65b5f092579f20e618 100644
--- a/tests/Validator/UrlTest.php
+++ b/tests/Validator/UrlTest.php
@@ -14,7 +14,7 @@ class UrlTest extends TestCase
/** @var Helper|Mock */
protected $helperMock;
- protected function setUp()
+ protected function setUp(): void
{
parent::setUp();
@@ -208,11 +208,10 @@ class UrlTest extends TestCase
public function provideInvalidUrls()
{
return [
- [':'],
- ['//'],
- ['//example.com:65536'], // port out of range
- ['//example.com:0'], // port out of range
- ['//:'],
+ 'only-colon' => [':'],
+ 'only-slashes' => ['//'],
+ 'port>65k' => ['//example.com:65536'], // port out of range
+ 'no-port-and-host' => ['//:'],
];
}