Build: Drop older PHP versions, use github actions (#8)

bpolaszek · Jan 2, 2022 · 4237215 · 4237215
1 parent ba7b880
commit 4237215
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 115 deletions.
diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -0,0 +1,64 @@
+name: CI Workflow
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  code-style:
+    name: Code Style & Static Analysis
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: 7.4
+          extensions: mbstring, pcntl
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Check code style
+        run: vendor/bin/phpcs --standard=psr2 -n src/
+
+
+  tests:
+    name: Test Suite
+    runs-on: ubuntu-20.04
+    strategy:
+      max-parallel: 10
+      matrix:
+        php:
+          - 7.4
+          - 8.0
+          - 8.1
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          extensions: mbstring, curl, zip
+          coverage: xdebug
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run tests
+        run: vendor/bin/phpunit --coverage-clover=coverage.xml
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 [![Latest Stable Version](https://poser.pugx.org/bentools/cartesian-product/v/stable)](https://packagist.org/packages/bentools/cartesian-product)
 [![License](https://poser.pugx.org/bentools/cartesian-product/license)](https://packagist.org/packages/bentools/cartesian-product)
-[![Build Status](https://img.shields.io/travis/bpolaszek/cartesian-product/master.svg?style=flat-square)](https://travis-ci.org/bpolaszek/cartesian-product)
-[![Coverage Status](https://coveralls.io/repos/github/bpolaszek/cartesian-product/badge.svg?branch=master)](https://coveralls.io/github/bpolaszek/cartesian-product?branch=master)
-[![Quality Score](https://img.shields.io/scrutinizer/g/bpolaszek/cartesian-product.svg?style=flat-square)](https://scrutinizer-ci.com/g/bpolaszek/cartesian-product)
+[![CI Workflow](https://github.com/bpolaszek/cartesian-product/actions/workflows/ci-workflow.yml/badge.svg)](https://github.com/bpolaszek/cartesian-product/actions/workflows/ci-workflow.yml)
+[![Coverage](https://codecov.io/gh/bpolaszek/cartesian-product/branch/master/graph/badge.svg?token=3CF5QH0CKG)](https://codecov.io/gh/bpolaszek/cartesian-product)
 [![Total Downloads](https://poser.pugx.org/bentools/cartesian-product/downloads)](https://packagist.org/packages/bentools/cartesian-product)
 
 # Cartesian Product

diff --git a/composer.json b/composer.json
@@ -18,12 +18,13 @@
         ]
     },
     "require": {
-        "php": ">=5.6"
+        "php": ">=7.4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.0|^6.0",
+        "phpunit/phpunit": "^8.0|^9.0",
         "squizlabs/php_codesniffer": "@stable",
         "php-coveralls/php-coveralls": "@stable",
-        "symfony/var-dumper": "^3.2|^4.0"
+        "symfony/var-dumper": "^3.2|^4.0",
+        "dms/phpunit-arraysubset-asserts": "^0.3.1"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,28 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
-         bootstrap="vendor/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
->
-    <testsuites>
-        <testsuite name="Test Suite">
-           <file>tests/TestCartesianProduct.php</file>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" beStrictAboutTestsThatDoNotTestAnything="true" beStrictAboutOutputDuringTests="true" bootstrap="vendor/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" failOnRisky="true" failOnWarning="true" processIsolation="false" stopOnError="false" stopOnFailure="false" verbose="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Test Suite">
+      <file>tests/TestCartesianProduct.php</file>
+    </testsuite>
+  </testsuites>
 </phpunit>
diff --git a/tests/CountableIterator.php b/tests/CountableIterator.php
@@ -13,7 +13,7 @@
 final class CountableIterator implements IteratorAggregate, Countable
 {
 
-    private $items = [];
+    private array $items = [];
 
     /**
      * CountableIterator constructor.
@@ -25,12 +25,12 @@ public function __construct(array $items)
     }
 
 
-    public function getIterator()
+    public function getIterator(): \Traversable
     {
         return new ArrayIterator($this->items);
     }
 
-    public function count()
+    public function count(): int
     {
         return \count($this->items);
     }

diff --git a/tests/TestCartesianProduct.php b/tests/TestCartesianProduct.php
@@ -2,33 +2,35 @@
 
 namespace BenTools\CartesianProduct\Tests;
 
-use function BenTools\CartesianProduct\cartesian_product;
+use DMS\PHPUnitExtensions\ArraySubset\ArraySubsetAsserts;
 use PHPUnit\Framework\TestCase;
 
+use function BenTools\CartesianProduct\cartesian_product;
+
 class TestCartesianProduct extends TestCase
 {
+    use ArraySubsetAsserts;
+
     /**
      * @dataProvider dataProvider
      */
-    public function testCartesianProduct(array $cases, array $expected)
+    public function testCartesianProduct(array $cases, array $expected): void
     {
         $result = cartesian_product($cases);
         $this->assertArraySubset($expected, $result->asArray());
         $this->assertArraySubset($expected, $result->asArray());
     }
 
-    public function testEmptySet()
+    public function testEmptySet(): void
     {
         $set = [];
         $this->assertCount(0, iterator_to_array(cartesian_product($set)));
         $this->assertEquals([], cartesian_product($set)->asArray());
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testSetWithEmptyArraySubset()
+    public function testSetWithEmptyArraySubset(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
         $set = [
             'fruits' => [
                 'strawberry',
@@ -46,7 +48,7 @@ public function testSetWithEmptyArraySubset()
         }
     }
 
-    public function testSetWithIteratorSubset()
+    public function testSetWithIteratorSubset(): void
     {
         $set = [
             'fruit'     => [
@@ -81,11 +83,9 @@ public function testSetWithIteratorSubset()
 
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testSetWithInvalidSubset()
+    public function testSetWithInvalidSubset(): void
     {
+        $this->expectException(\InvalidArgumentException::class);
         $set = [
             'fruits' => [
                 'strawberry',
@@ -103,7 +103,7 @@ public function testSetWithInvalidSubset()
         }
     }
 
-    public function testCount()
+    public function testCount(): void
     {
         $set = [
             ['a', 'b', 'c', 'd', 'e', 'f'],
@@ -113,7 +113,7 @@ public function testCount()
         $this->assertCount(60, cartesian_product($set)); // Assert we can call it several times
     }
 
-    public function testRetrieveCurrentCombination()
+    public function testRetrieveCurrentCombination(): void
     {
         $current = null;
         $set = [
@@ -144,14 +144,14 @@ function (array $combination) use (&$current) {
             continue;
         }
         $this->assertNotNull($current);
-        $this->assertInternalType('array', $current);
+        $this->assertIsArray($current);
         $this->assertArrayHasKey('hair', $current);
         $this->assertArrayHasKey('skin', $current);
         $this->assertArrayNotHasKey('eyes', $current);
         $this->assertArrayNotHasKey('gender', $current);
     }
 
-    public function dataProvider()
+    public function dataProvider(): array
     {
         return [
             'shapesAndColors'      => $this->shapesAndColors(),
@@ -161,7 +161,7 @@ public function dataProvider()
         ];
     }
 
-    private function shapesAndColors()
+    private function shapesAndColors(): array
     {
         return [
             'cases'    => [
@@ -217,7 +217,7 @@ private function shapesAndColors()
         ];
     }
 
-    private function moreShapesThanColors()
+    private function moreShapesThanColors(): array
     {
         return [
             'cases'    => [
@@ -260,7 +260,7 @@ private function moreShapesThanColors()
         ];
     }
 
-    private function moreColorsThanShapes()
+    private function moreColorsThanShapes(): array
     {
         return [
             'cases'    => [
@@ -303,7 +303,7 @@ private function moreColorsThanShapes()
         ];
     }
 
-    private function iCanHazClozures()
+    private function iCanHazClozures(): array
     {
         return [
             'cases'           => [