Merge pull request #25 from loic425/fix/excluding-specifications

Fixing exclusions and adding support for php 8

Author: pamil

.github/workflows/build.yml

@@ -0,0 +1,49 @@
+name: Build
+
+on:
+    push: ~
+    pull_request: ~
+    release:
+        types: [created]
+    schedule:
+        -
+            cron: "0 1 * * 6" # Run at 1am every Saturday
+
+jobs:
+    tests:
+        runs-on: ubuntu-latest
+        name: "PHP ${{ matrix.php }}, Symfony ${{ matrix.symfony }}"
+        strategy:
+            fail-fast: false
+            matrix:
+                php: ["7.3", "7.4", "8.0"]
+                symfony: ["4.4.*", "5.1.*"]
+
+        steps:
+            -
+                uses: actions/checkout@v2
+
+            -
+                name: Setup PHP
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: "${{ matrix.php }}"
+                    coverage: none
+
+            -
+                name: Update Symfony version
+                if: matrix.symfony != ''
+                run: |
+                    composer require symfony/dependency-injection:${{ matrix.symfony }} --no-update --no-scripts
+
+            -
+                name: Install dependencies
+                run: composer update
+
+            -
+                name: Run analysis
+                run: composer analyse
+
+            -
+                name: Run tests
+                run: composer test

.travis.yml

@@ -1,12 +1,13 @@
 language: php
 
 php:
-    - 7.1
-    - 7.2
+    - 7.3
+    - 7.4
+    - 8.0
 
 env:
-    - SYMFONY_VERSION="3.4.*"
-    - SYMFONY_VERSION="4.1.*"
+    - SYMFONY_VERSION="4.4.*"
+    - SYMFONY_VERSION="5.1.*"
 
 cache:
     directories:

composer.json

@@ -9,19 +9,28 @@
         }
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.1|^8.0",
 
         "behat/behat": "^3.4",
         "symfony/dependency-injection": "^3.4|^4.1"
     },
     "require-dev": {
         "friends-of-behat/test-context": "^1.1",
-        "phpspec/phpspec": "^5.0"
+        "phpspec/phpspec": "^7.0"
     },
     "autoload": {
         "psr-4": { "FriendsOfBehat\\ExcludeSpecificationsExtension\\": "src/" }
     },
     "autoload-dev": {
         "psr-4" : { "spec\\FriendsOfBehat\\ExcludeSpecificationsExtension\\": "spec/" }
+    },
+    "scripts": {
+        "analyse": [
+            "@composer validate --ansi --strict"
+        ],
+        "test": [
+            "vendor/bin/phpspec run --format dot -vvv --no-interaction",
+            "vendor/bin/behat -f progress --strict -vvv --no-interaction --colors"
+        ]
     }
 }

src/Locator/ExcludingSpecificationIterator.php

@@ -48,11 +48,14 @@ public function __construct(SpecificationIterator $specificationIterator, array
      */
     public function accept(): bool
     {
-        return !in_array(
-            $this->current()->getFile(),
-            $this->skippedPaths,
-            true
-        );
+        foreach ($this->skippedPaths as $skippedPath) {
+            $files[$skippedPath] = strpos($this->current()->getFile(), $skippedPath);
+            if (false !== strpos($this->current()->getFile(), $skippedPath)) {
+                return false;
+            }
+        }
+
+        return true;
     }
 
     /**