Merge 633a1f3 into 8687c24

meadsteve · Apr 4, 2019 · 7fb7939 · 7fb7939
2 parents 8687c24 + 633a1f3
commit 7fb7939
Show file tree

Hide file tree

Showing 21 changed files with 1,071 additions and 187 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,10 +2,12 @@ language: php
 php:
   - 7.1
   - 7.2
+  - 7.3
 
 install: composer install
 script:
-  - ./vendor/bin/phpspec run
-  - ./vendor/bin/phpcs --standard=PSR2 --ignore=src/Protos src/
   - ./vendor/bin/phpunit -c tests/app-tests.xml
-  - ./vendor/bin/phpstan analyse src --level max
+  - ./vendor/bin/phpspec run
+  - ./vendor/bin/phpstan analyse src --level max
+  - ./vendor/bin/psalm --show-info=false
+  - ./vendor/bin/phpcs --standard=PSR2 --ignore=src/Protos src/
diff --git a/composer.json b/composer.json
@@ -12,20 +12,25 @@
     "predis/predis": "^1.0.1",
     "league/commonmark": "^0.8.0",
     "php": ">=7.1, <8.0",
-    "google/protobuf": "^3.7"
+    "google/protobuf": "^3.7",
+    "ext-json": "*"
   },
 
   "require-dev": {
     "heroku/heroku-buildpack-php": "v67",
     "phpspec/phpspec": "2.4.0-rc1",
     "squizlabs/php_codesniffer": "^2.3.2",
     "phpunit/phpunit": "^4.6.6",
-    "phpstan/phpstan": "^0.9.2"
+    "phpstan/phpstan": "^0.11.5",
+    "vimeo/psalm": "^3.2"
   },
 
   "autoload": {
     "psr-4": {
        "MeadSteve\\DiceApi\\": "src/"
-    }
+    },
+    "files": [
+      "src/Helpers.php"
+    ]
   }
 }