Skip to content

Commit

Permalink
updating packages, updating testing, updating baseline
Browse files Browse the repository at this point in the history
  • Loading branch information
SignpostMarv committed Jan 9, 2020
1 parent 896f0d8 commit f605679
Show file tree
Hide file tree
Showing 4 changed files with 212 additions and 197 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
dist: xenial
language: php
php:
- 7.4.0
- 7.4
cache:
directories:
Expand Down
12 changes: 7 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"sort-packages": true
},
"conflict": {
"vimeo/psalm": "<3.7"
"vimeo/psalm": "<3.8"
},
"scripts": {
"tests": [
Expand All @@ -44,8 +44,10 @@
"require": {
"php": "^7.4",
"ext-PDO": "*",
"robmorgan/phinx": "^0.11.3",
"signpostmarv/daft-framework": "^3.3"
"robmorgan/phinx": "^0.11.4",
"signpostmarv/daft-framework": "^3.4|3.4.x-dev",
"signpostmarv/daft-router": "^4.4|4.4.x-dev",
"signpostmarv/daft-typed-object": "^0.5|0.5.x-dev"
},
"require-dev": {
"ext-pdo_sqlite": "*",
Expand All @@ -57,7 +59,7 @@
"psalm/plugin-phpunit": "^0.8.0",
"roave/security-advisories": "dev-master",
"sebastian/phpcpd": "^4.1",
"signpostmarv/php-cs-fixer-config": "^0.13.0",
"vimeo/psalm": "^3.7"
"signpostmarv/php-cs-fixer-config": "^0.14.0",
"vimeo/psalm": "^3.8"
}
}
Loading

0 comments on commit f605679

Please sign in to comment.