Merge pull request #84 from lcobucci/fix/use-external-coverage

Using external coverage (and keeping track of just unit tests coverage).

.scrutinizer.yml

@@ -11,10 +11,21 @@ tools:
     php_pdepend: true
     php_analyzer: true
     php_changetracking: true
+    sensiolabs_security_checker: true
+    php_mess_detector: true
+    php_code_coverage: true
+    external_code_coverage:
+        timeout: 1800
     php_code_sniffer:
+        enabled: true
         config:
             standard: "PSR2"
-    php_mess_detector: true
+    php_cpd:
+        enabled: true
+        excluded_dirs: ["test", "vendor"]
+    php_loc:
+        enabled: true
+        excluded_dirs: ["test", "vendor"]
 checks:
     php:
         code_rating: true
@@ -50,7 +61,6 @@ checks:
         verify_access_scope_valid: true
         verify_argument_usable_as_reference: true
         verify_property_names: true
-
 filter:
     excluded_paths:
         - test/*

.travis.yml

@@ -4,13 +4,18 @@ sudo: false
 php:
   - 7.0
   - hhvm
-  - hhvm-nightly
 
 matrix:
   allow_failures:
     - php: hhvm
-    - php: hhvm-nightly
 
 before_script:
-  - composer selfupdate
   - composer install --prefer-dist -o
+
+script:
+  - ./vendor/bin/phpunit --coverage-clover ./clover.xml test/unit
+  - ./vendor/bin/phpunit test/functional
+
+after_script:
+  - wget https://scrutinizer-ci.com/ocular.phar
+  - php ocular.phar code-coverage:upload --format=php-clover ./clover.xml

composer.json

@@ -22,11 +22,11 @@
         "lcobucci/jose-parsing": "~2.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.1",
-        "squizlabs/php_codesniffer": "~2.3",
-        "phpmd/phpmd": "~2.2",
+        "phpunit/phpunit": "~5.3",
+        "squizlabs/php_codesniffer": "~2.6",
+        "phpmd/phpmd": "~2.4",
         "phpunit/php-invoker": "~1.1",
-        "mikey179/vfsStream": "~1.5",
+        "mikey179/vfsStream": "~1.6",
         "mdanter/ecc": "~0.3"
     },
     "suggest":{

phpunit.xml.dist

@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-    backupGlobals="false" 
-    backupStaticAttributes="false" 
+    backupGlobals="false"
+    backupStaticAttributes="false"
     bootstrap="vendor/autoload.php"
-    colors="true" 
+    colors="true"
     verbose="true"
     beStrictAboutOutputDuringTests="true"
-    beStrictAboutTestSize="true"
     beStrictAboutTestsThatDoNotTestAnything="true"
     beStrictAboutTodoAnnotatedTests="true"
     checkForUnintentionallyCoveredCode="true"
+    beStrictAboutChangesToGlobalState="true"
+    beStrictAboutCoversAnnotation="true"
+    beStrictAboutResourceUsageDuringSmallTests="true"
     forceCoversAnnotation="true">
 	<testsuites>
 		<testsuite name="Unit Test Suite">
@@ -20,12 +22,12 @@
 			<directory>test/functional</directory>
 		</testsuite>
 	</testsuites>
-    
+
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>
         </whitelist>
-        
+
         <blacklist>
             <directory suffix=".php">vendor</directory>
         </blacklist>