Drop EOLed php versions

simPod · simPod · commit b492f099376f · 2021-01-15T22:52:12.000+01:00
- add Github Actions to replace old CI (part 1/3) - upgrade PHPUnit to v9 - lock symfony/var-dumper to v5.2 as @stable is too wide for testing (lowest is incompatible, symfony/var-dumper/Resources/functions/dump.php is missing)
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -0,0 +1,78 @@
+name: "Continuous Integration"
+
+on:
+  pull_request:
+  push:
+    branches:
+      - "master"
+  schedule:
+    - cron: "42 3 * * *"
+
+env:
+  fail-fast: true
+
+jobs:
+  phpunit:
+    name: "PHPUnit"
+    runs-on: "ubuntu-20.04"
+
+    strategy:
+      matrix:
+        php-version:
+          - "7.3"
+          - "7.4"
+          - "8.0"
+        dependencies:
+          - "highest"
+        include:
+          - dependencies: "lowest"
+            php-version: "7.3"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Install PHP"
+        uses: "shivammathur/setup-php@v2"
+        with:
+          php-version: "${{ matrix.php-version }}"
+          coverage: "pcov"
+          ini-values: "zend.assertions=1"
+
+      - name: "Install dependencies with Composer"
+        uses: "ramsey/composer-install@v1"
+        with:
+          dependency-versions: "${{ matrix.dependencies }}"
+
+      - name: "Run PHPUnit"
+        run: "vendor/bin/phpunit --coverage-clover=coverage.xml"
+
+      - name: "Upload coverage file"
+        uses: "actions/upload-artifact@v2"
+        with:
+          name: "phpunit-sqlite-${{ matrix.deps }}-${{ matrix.php-version }}.coverage"
+          path: "coverage.xml"
+
+  upload_coverage:
+    name: "Upload coverage to Codecov"
+    runs-on: "ubuntu-20.04"
+    needs:
+      - "phpunit"
+
+    steps:
+      - name: "Checkout"
+        uses: "actions/checkout@v2"
+        with:
+          fetch-depth: 2
+
+      - name: "Download coverage files"
+        uses: "actions/download-artifact@v2"
+        with:
+          path: "reports"
+
+      - name: "Upload to Codecov"
+        uses: "codecov/codecov-action@v1"
+        with:
+          directory: reports
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -15,11 +15,11 @@
         ]
     },
     "require": {
-        "php": ">=5.3"
+        "php": "^7.3 || ^8.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.0|^5.0|^6.0|^7.0",
+        "phpunit/phpunit": "^9",
         "squizlabs/php_codesniffer": "^2.0|^3.4",
-        "symfony/var-dumper": "@stable"
+        "symfony/var-dumper": "^5.2"
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,32 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         beStrictAboutChangesToGlobalState="true"
          beStrictAboutOutputDuringTests="true"
-         bootstrap="vendor/autoload.php"
+         beStrictAboutTodoAnnotatedTests="true"
+         executionOrder="random"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         failOnRisky="true"
-         failOnWarning="true"
-         processIsolation="false"
-         stopOnError="false"
-         stopOnFailure="false"
-         verbose="true"
+         bootstrap="tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-            <exclude>
-                <file>src/iterable-map-php53.php</file>
-                <file>src/iterable-map-php55.php</file>
-            </exclude>
-        </whitelist>
-    </filter>
+    <coverage>
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 </phpunit>
diff --git a/src/iterable-functions.php b/src/iterable-functions.php
@@ -2,12 +2,41 @@
 
 use BenTools\IterableFunctions\IterableObject;
 
-if (version_compare(PHP_VERSION, '5.5') >= 0) {
-    include_once __DIR__ . '/iterable-map-php55.php';
-} else {
-    include_once __DIR__ . '/iterable-map-php53.php';
+if (!function_exists('iterable_map')) {
+
+    /**
+     * Maps a callable to an iterable.
+     *
+     * @param iterable|array|\Traversable $iterable
+     * @param callable                    $map
+     * @return array|ArrayIterator
+     * @throws InvalidArgumentException
+     */
+    function iterable_map($iterable, $map)
+    {
+        if (!is_iterable($iterable)) {
+            throw new \InvalidArgumentException(
+                sprintf('Expected array or Traversable, got %s', is_object($iterable) ? get_class($iterable) : gettype($iterable))
+            );
+        }
+
+        // Cannot rely on callable type-hint on PHP 5.3
+        if (null !== $map && !is_callable($map) && !$map instanceof Closure) {
+            throw new InvalidArgumentException(
+                sprintf('Expected callable, got %s', is_object($map) ? get_class($map) : gettype($map))
+            );
+        }
+
+        if ($iterable instanceof Traversable) {
+            return new ArrayIterator(array_map($map, iterator_to_array($iterable)));
+        }
+
+        return array_map($map, $iterable);
+    }
+
 }
 
+
 if (!function_exists('is_iterable')) {
 
     /**
diff --git a/src/iterable-map-php53.php b/src/iterable-map-php53.php
diff --git a/src/iterable-map-php55.php b/src/iterable-map-php55.php
diff --git a/tests/IterableFilterTest.php b/tests/IterableFilterTest.php
@@ -23,11 +23,10 @@ public function testTraversableFilter()
         $this->assertEquals(array(1 => 'bar'), iterable_to_array(iterable_filter($iterable, $filter)));
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidIterable()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $filter = function () {
             return true;
         };
diff --git a/tests/IterableMapTest.php b/tests/IterableMapTest.php
@@ -19,11 +19,10 @@ public function testTraversableMap()
         $this->assertEquals(array('FOO', 'BAR'), iterable_to_array(iterable_map($iterable, $map)));
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidIterable()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $filter = function () {
             return true;
         };
diff --git a/tests/IterableToTraversableTest.php b/tests/IterableToTraversableTest.php
@@ -26,13 +26,11 @@ public function testArrayToTraversable()
         $this->assertInstanceOf('Traversable', $traversable);
     }
 
-    /**
-     * @expectedException InvalidArgumentException
-     */
     public function testInvalidArgument()
     {
+        $this->expectException(InvalidArgumentException::class);
+
         $string = 'foo';
         iterable_to_traversable($string);
-        var_dump(iterable_to_traversable(array('foo', 'bar')));
     }
 }
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+error_reporting(E_ALL);
+
+require __DIR__ . '/../vendor/autoload.php';

Original file line number	Diff line number	Diff line change
`@@ -15,11 +15,11 @@`
`15`	`15`	`]`
`16`	`16`	`},`
`17`	`17`	`"require": {`
`18`		`- "php": ">=5.3"`
	`18`	`+ "php": "^7.3 \|\| ^8.0"`
`19`	`19`	`},`
`20`	`20`	`"require-dev": {`
`21`		`- "phpunit/phpunit": "^4.0\|^5.0\|^6.0\|^7.0",`
	`21`	`+ "phpunit/phpunit": "^9",`
`22`	`22`	`"squizlabs/php_codesniffer": "^2.0\|^3.4",`
`23`		`- "symfony/var-dumper": "@stable"`
	`23`	`+ "symfony/var-dumper": "^5.2"`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,11 +23,10 @@ public function testTraversableFilter()`
`23`	`23`	`$this->assertEquals(array(1 => 'bar'), iterable_to_array(iterable_filter($iterable, $filter)));`
`24`	`24`	`}`
`25`	`25`
`26`		`- /**`
`27`		`- * @expectedException InvalidArgumentException`
`28`		`- */`
`29`	`26`	`public function testInvalidIterable()`
`30`	`27`	`{`
	`28`	`+ $this->expectException(InvalidArgumentException::class);`
	`29`	`+`
`31`	`30`	`$filter = function () {`
`32`	`31`	`return true;`
`33`	`32`	`};`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,10 @@ public function testTraversableMap()`
`19`	`19`	`$this->assertEquals(array('FOO', 'BAR'), iterable_to_array(iterable_map($iterable, $map)));`
`20`	`20`	`}`
`21`	`21`
`22`		`- /**`
`23`		`- * @expectedException InvalidArgumentException`
`24`		`- */`
`25`	`22`	`public function testInvalidIterable()`
`26`	`23`	`{`
	`24`	`+ $this->expectException(InvalidArgumentException::class);`
	`25`	`+`
`27`	`26`	`$filter = function () {`
`28`	`27`	`return true;`
`29`	`28`	`};`