Merge branch 'master' of https://github.com/rougin/slytherin

rougin · Feb 23, 2018 · a257967 · a257967
2 parents b4cead5 + b68a9eb
commit a257967
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -24,8 +24,8 @@ matrix:
 before_script:
   - travis_retry composer self-update
   - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-source
-  - if [[ $TRAVIS_PHP_VERSION == '5.3' ]]; then composer require container-interop/container-interop:1.2 filp/whoops rdlowrey/auryn twig/twig http-interop/http-middleware:^0.4.1 --dev; fi
-  - if [[ $TRAVIS_PHP_VERSION != '5.3' ]]; then composer require container-interop/container-interop:1.2 filp/whoops league/container nikic/fast-route phroute/phroute rdlowrey/auryn twig/twig zendframework/zend-diactoros zendframework/zend-stratigility http-interop/http-middleware:^0.4.1 --dev; fi
+  - composer require container-interop/container-interop filp/whoops rdlowrey/auryn twig/twig http-interop/http-middleware:^0.4.1
+  - if [[ $TRAVIS_PHP_VERSION != '5.3' ]]; then composer require league/container nikic/fast-route phroute/phroute zendframework/zend-diactoros zendframework/zend-stratigility --dev; fi
 
 script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover

diff --git a/src/Http/LICENSE.md b/src/Http/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2017 Fabien Potencier
+Copyright (c) 2004-2018 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal