Updates, Release 2.0.0

.gitignore

@@ -1,4 +1,6 @@
 vendor/
-composer.phar
 composer.lock
 phpspec.yml
+phpunit.xml
+.idea
+.phpunit.result.cache

.travis.yml

@@ -1,26 +1,32 @@
+dist: trusty
+
 language: php
 
 php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - hhvm
+  - 7.3
+  - 7.4
+  # - hhvm
+  # - nightly
 
 matrix:
   allow_failures:
-    - php: hhvm
+    # - php: hhvm
+    # - php: nightly
   include:
-    - php: 5.6
+    - php: 7.3
       env:
-        - COMPOSER_FLAGS="--prefer-lowest --prefer-stable"
+        - COMPOSER_FLAGS=" --prefer-stable"
         - COVERAGE=true
-        - PHPSPEC_FLAGS="--config phpspec.yml.ci"
+        - PHPUNIT_FLAGS="--coverage-clover=coverage.clover"
 
 install:
   - travis_retry composer update ${COMPOSER_FLAGS} --prefer-source --no-interaction
 
+before_script:
+  - export XDEBUG_MODE=coverage
+
 script:
-  - vendor/bin/phpspec run ${PHPSPEC_FLAGS}
+  - phpdbg -qrr vendor/bin/phpspec run
 
 after_script:
   - if [[ "$COVERAGE" = true ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi

composer.json

@@ -19,16 +19,21 @@
     ],
     "support": {
         "issues": "https://github.com/portphp/portphp/issues",
-        "source": "https://github.com/portphp/boilerplate",
+        "source": "https://github.com/portphp/steps",
         "docs": "https://portphp.readthedocs.org"
     },
     "require": {
-        "php": ">=5.6.0",
-        "portphp/portphp": "^1.0.0",
+        "php": ">=7.3",
+        "portphp/portphp": "^2.0.0",
         "seld/signal-handler": "^1.0",
         "symfony/property-access": "^2.3 || ^3.0 || ^4.0 || ^5.0",
         "symfony/validator": "^2.5 || ^3.0 || ^4.0 || ^5.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "^9.2.0",
+        "phpspec/phpspec": "^7.0",
+        "friends-of-phpspec/phpspec-code-coverage": "^5.0"
+    },
     "autoload": {
         "psr-4": {
             "Port\\Steps\\": "src/"
@@ -37,10 +42,6 @@
     "conflict": {
         "symfony/validator": "<2.5"
     },
-    "require-dev": {
-        "phpspec/phpspec": "^2.2",
-        "henrikbjorn/phpspec-code-coverage" : "^1.0"
-    },
     "suggest": {
         "symfony/property-access": "Used in MappingStep",
         "symfony/validator": "Used in ValidatorStep"
@@ -49,5 +50,11 @@
         "branch-alias": {
             "dev-master": "2.0.x-dev"
         }
-    }
+    },
+    "repositories": [
+        {
+            "type": "git",
+            "url": "https://github.com/klodoma/portphp-portphp"
+        }
+    ]
 }

phpspec.yml.dist

@@ -1,5 +1,10 @@
 suites:
-  step_suite:
+  library_suite:
     namespace: Port\Steps
     psr4_prefix: Port\Steps
+extensions:
+  FriendsOfPhpSpec\PhpSpec\CodeCoverage\CodeCoverageExtension: ~
 formatter.name: pretty
+code_coverage:
+  format: clover
+  output: build/phpspec.coverage.xml

spec/Step/ValidatorStepSpec.php

@@ -3,6 +3,7 @@
 namespace spec\Port\Steps\Step;
 
 use Port\Steps\Step;
+use stdClass;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintViolation;
 use Symfony\Component\Validator\ConstraintViolationList;
@@ -117,7 +118,7 @@ function it_validates_an_item_from_metadata(
     ) {
         $next = function() {};
         $list->count()->willReturn(1);
-        $item = new \stdClass();
+        $item = new stdClass();
         $validator->validate($item)->willReturn($list);
 
         $this->process(
@@ -136,15 +137,15 @@ function it_validates_multiple_items_from_metadata(
         $numberOfCalls = 3;
         $next = function() {};
         $list->count()->willReturn(1);
-        $item = new \stdClass();
+        $item = new stdClass();
         $validator->validate($item)->willReturn($list);
 
         for ($i = 0; $i < $numberOfCalls; $i++) {
             $this->process($item, $next);
         }
 
         $this->getViolations()->shouldReturn(array_fill(1, $numberOfCalls, $list));
-    }    
+    }
 
     function it_tracks_lines_when_exceptions_are_thrown_during_process(
         Step $step,

src/Step/ArrayCheckStep.php

@@ -2,8 +2,10 @@
 
 namespace Port\Steps\Step;
 
+use ArrayAccess;
 use Port\Exception\UnexpectedTypeException;
 use Port\Steps\Step;
+use Traversable;
 
 /**
  * @author Márk Sági-Kazár <[email protected]>
@@ -15,7 +17,7 @@ class ArrayCheckStep implements Step
      */
     public function process($item, callable $next)
     {
-        if (!is_array($item) && !($item instanceof \ArrayAccess && $item instanceof \Traversable)) {
+        if (!is_array($item) && !($item instanceof ArrayAccess && $item instanceof Traversable)) {
             throw new UnexpectedTypeException($item, 'array');
         }
 

src/Step/FilterStep.php

@@ -3,20 +3,21 @@
 namespace Port\Steps\Step;
 
 use Port\Steps\Step;
+use SplPriorityQueue;
 
 /**
  * @author Markus Bachmann <[email protected]>
  */
 class FilterStep implements Step
 {
     /**
-     * @var \SplPriorityQueue
+     * @var SplPriorityQueue
      */
     private $filters;
 
     public function __construct()
     {
-        $this->filters = new \SplPriorityQueue();
+        $this->filters = new SplPriorityQueue();
     }
 
     /**

src/Step/ValidatorStep.php

@@ -118,6 +118,8 @@ public function process($item, callable $next)
         if (0 === count($list)) {
             return $next($item);
         }
+
+        return null;
     }
 
     /**

src/StepAggregator.php

@@ -2,6 +2,7 @@
 
 namespace Port\Steps;
 
+use DateTime;
 use Port\Exception;
 use Port\Reader;
 use Port\Result;
@@ -12,6 +13,7 @@
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\NullLogger;
 use Seld\Signal\SignalHandler;
+use SplObjectStorage;
 
 /**
  * A mediator between a reader and one or more writers and converters
@@ -100,8 +102,8 @@ public function addWriter(Writer $writer)
     public function process()
     {
         $count      = 0;
-        $exceptions = new \SplObjectStorage();
-        $startTime  = new \DateTime;
+        $exceptions = new SplObjectStorage();
+        $startTime  = new DateTime;
 
         $signal = SignalHandler::create(['SIGTERM', 'SIGINT'], $this->logger);
 
@@ -137,7 +139,7 @@ public function process()
             $writer->finish();
         }
 
-        return new Result($this->name, $startTime, new \DateTime, $count, $exceptions);
+        return new Result($this->name, $startTime, new DateTime, $count, $exceptions);
     }
 
     /**