Skip to content

Commit

Permalink
Merge branch 'Sam-Burns-php-version' into 4.x
Browse files Browse the repository at this point in the history
Closes #2178
  • Loading branch information
akrabat committed Mar 21, 2017
2 parents 943b0be + 62b5982 commit 19e3a34
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Expand Up @@ -3,7 +3,6 @@ sudo: false
language: php

php:
- 5.5
- 5.6
- 7.0
- 7.1
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -12,10 +12,10 @@ Slim is a PHP micro-framework that helps you quickly write simple yet powerful w
It's recommended that you use [Composer](https://getcomposer.org/) to install Slim.

```bash
$ composer require slim/slim "^3.0"
$ composer require slim/slim "^4.0"
```

This will install Slim and all required dependencies. Slim requires PHP 5.5.0 or newer.
This will install Slim and all required dependencies. Slim requires PHP 5.6.0 or newer.

## Usage

Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -28,7 +28,7 @@
}
],
"require": {
"php": ">=5.5.0",
"php": ">=5.6.0",
"pimple/pimple": "^3.0",
"psr/http-message": "^1.0",
"nikic/fast-route": "^1.0",
Expand Down

0 comments on commit 19e3a34

Please sign in to comment.