Merge pull request #9 from jaylinski/dev/psr12

Change default coding style to PSR-12

.gitignore

@@ -1,3 +1,3 @@
-/vendor
 /coverage
+/vendor
 coverage.xml

.travis.yml

@@ -3,6 +3,7 @@ language: php
 php:
   - '7.1'
   - '7.2'
+  - '7.3'
 
 before_install:
   - travis_retry composer self-update

CHANGELOG.md

@@ -1,6 +1,15 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [v5.0.0] - 2019-11-18
+### Changed
+- Default coding style is now PSR-12
+- Default code style fixer is now `squizlabs/php_codesniffer`
+### Added 
+- Support for phpspec v5 and v6
+### Removed
+- Support for phpspec v4
+
 ## [v4.2.0] - 2019-11-04
 ### Changed
 - Replaced package `leanphp/phpspec-code-coverage` with `friends-of-phpspec/phpspec-code-coverage`

README.md

@@ -20,21 +20,11 @@ Must be configured with a `phpspec.yml` file in your root folder.
 We are using the `leanphp/phpspec-code-coverage` extension for generating coverage reports.   
 This extension requires a `phpspec-coverage.yml` file in your root folder and Xdebug enabled.
 
-### [FriendsOfPHP/PHP-CS-Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer)
-
-Currently used for fixing the code.   
-Fixes all files in `src` directory.
-
-This package is not used for checking (linting), because PHP_Codesniffer prints a 
-more readable output.
-
 ### [squizlabs/PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer)
 
-Currently used for checking (linting) the code.   
+Currently used for checking (linting) and fixing the code.   
 Sniffs all files in `src` directory.
 
-This package could also be used for fixing, but PHP-CS-Fixer does it better.
-
 ### [phpmd/phpmd](https://github.com/phpmd/phpmd)
 
 Used for mess detection.   
@@ -84,6 +74,7 @@ Usage:
 Options:
       --fail     Exit with 1 if tests fail.
       --notty    Disable TTY.
+      --ptimeout Set process timeout (defaults to 60 seconds).
    -v --verbose  Increase the verbosity of messages.
 ```
 
@@ -94,11 +85,11 @@ Usage:
   coverage [--] [options]
 
 Options:
-      --env    Specifiy the environment. Possible values:
-               'local': prints output on command-line.
-               'jenkins': generates a JUnit report file.
-      --notty  Disable TTY.
-
+      --env       Specifiy the environment. Possible values:
+                  'local': prints output on command-line.
+                  'jenkins': generates a JUnit report file.
+      --notty     Disable TTY.
+      --ptimeout  Set process timeout (defaults to 60 seconds).
 ```
 
 #### `lint`
@@ -108,11 +99,12 @@ Usage:
   lint [--] [options]
 
 Options:
-      --env    Specifiy the environment. Possible values:
-               'local': prints output on command-line.
-               'jenkins': generates a checkstyle report file.
-      --fail   Exit with 1 if linting fails.
-      --notty  Disable TTY.
+      --env       Specifiy the environment. Possible values:
+                  'local': prints output on command-line.
+                  'jenkins': generates a checkstyle report file.
+      --fail      Exit with 1 if linting fails.
+      --notty     Disable TTY.
+      --ptimeout  Set process timeout (defaults to 60 seconds).
 ```
 
 #### `md`
@@ -122,10 +114,11 @@ Usage:
   lint [--] [options]
 
 Options:
-      --env    Specifiy the environment. Possible values:
-               'local': prints output on command-line.
-               'jenkins': generates a xml report file.
-      --notty  Disable TTY.
+      --env       Specifiy the environment. Possible values:
+                  'local': prints output on command-line.
+                  'jenkins': generates a xml report file.
+      --notty     Disable TTY.
+      --ptimeout  Set process timeout (defaults to 60 seconds).
 ```
 
 #### `fix`
@@ -135,7 +128,8 @@ Usage:
   fix [--] [options]
 
 Options:
-      --notty  Disable TTY.
+      --notty     Disable TTY.
+      --ptimeout  Set process timeout (defaults to 60 seconds).
 ```
 
 ## Using custom matchers

composer.json

@@ -17,11 +17,10 @@
     },
     "require": {
         "php": ">=7.1",
-        "friendsofphp/php-cs-fixer": "^2.13",
-        "karriere/phpspec-matchers": "^2.0",
         "friends-of-phpspec/phpspec-code-coverage": "^4.3",
+        "karriere/phpspec-matchers": "^3.0",
         "phpmd/phpmd": "^2.6",
-        "phpspec/phpspec": "^4.3",
+        "phpspec/phpspec": "^5.1 || ^6.0",
         "squizlabs/php_codesniffer": "^3.3",
         "symfony/console": "^3.2 || ^4.0",
         "symfony/process": "^3.2 || ^4.0"