Skip to content
This repository has been archived by the owner on Feb 25, 2021. It is now read-only.

Commit

Permalink
Merge pull request #27 from chimeraphp/upgrade-dependencies
Browse files Browse the repository at this point in the history
Upgrade dependencies
  • Loading branch information
lcobucci authored May 3, 2020
2 parents c38caf6 + bf3e751 commit b6078c0
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .scrutinizer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build:
rabbitmq: false
mongodb: false
php:
version: 7.3
version: 7.4
cache:
disabled: false
directories:
Expand Down
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ sudo: false
language: php

php:
- 7.3
- 7.4snapshot
- 7.4
- nightly

cache:
Expand Down Expand Up @@ -52,4 +51,4 @@ jobs:
- mv ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/xdebug.ini{.disabled,}
- if [[ ! $(php -m | grep -si xdebug) ]]; then echo "xdebug required for mutation tests"; exit 1; fi
script:
- ./vendor/bin/infection --threads=$(nproc) --min-msi=66 --min-covered-msi=100
- ./vendor/bin/infection --threads=$(nproc) --min-msi=71 --min-covered-msi=100
21 changes: 13 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,27 @@
"sort-packages": true
},
"require": {
"php": "^7.3 || ^8.0",
"chimera/routing": "^0.3",
"php": "^7.4 || ^8.0",
"chimera/foundation": "^0.4@dev",
"chimera/routing": "^0.4@dev",
"zendframework/zend-diactoros": "^2.2",
"zendframework/zend-expressive": "^3.2",
"zendframework/zend-expressive-fastroute": "^3.0",
"zendframework/zend-expressive-helpers": "^5.3"
},
"require-dev": {
"infection/infection": "^0.16.2",
"lcobucci/coding-standard": "^3.1",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-deprecation-rules": "^0.11",
"phpstan/phpstan-phpunit": "^0.11",
"phpstan/phpstan-strict-rules": "^0.11",
"infection/infection": "^0.16",
"lcobucci/coding-standard": "^4.0",
"phpstan/extension-installer": "^1.0",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-deprecation-rules": "^0.12",
"phpstan/phpstan-phpunit": "^0.12",
"phpstan/phpstan-strict-rules": "^0.12",
"phpunit/phpunit": "^9.1"
},
"provide": {
"chimera/routing-implementation": "0.4.0"
},
"autoload": {
"psr-4": {
"Chimera\\Routing\\Expressive\\": "src"
Expand Down
8 changes: 1 addition & 7 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
includes:
- vendor/phpstan/phpstan-phpunit/extension.neon
- vendor/phpstan/phpstan-phpunit/rules.neon
- vendor/phpstan/phpstan-strict-rules/rules.neon
- vendor/phpstan/phpstan-deprecation-rules/rules.neon

parameters:
level: 7
level: max
paths:
- src
- tests
5 changes: 1 addition & 4 deletions src/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@

final class Application implements ApplicationInterface
{
/**
* @var Expressive
*/
private $application;
private Expressive $application;

public function __construct(Expressive $application)
{
Expand Down
5 changes: 1 addition & 4 deletions src/UriGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@

final class UriGenerator implements UriGeneratorInterface
{
/**
* @var RouterInterface
*/
private $router;
private RouterInterface $router;

public function __construct(RouterInterface $router)
{
Expand Down
9 changes: 3 additions & 6 deletions tests/ApplicationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,17 @@
*/
final class ApplicationTest extends TestCase
{
/**
* @var Expressive
*/
private $expressive;
private Expressive $expressive;

/**
* @var EmitterInterface&MockObject
*/
private $emitter;
private EmitterInterface $emitter;

/**
* @var MiddlewarePipeInterface&MockObject
*/
private $pipeline;
private MiddlewarePipeInterface $pipeline;

/**
* @before
Expand Down

0 comments on commit b6078c0

Please sign in to comment.