Skip to content

Commit e9100c7

Browse files
committed
Merge remote-tracking branch 'webplates/master'
2 parents 892d234 + 28848ac commit e9100c7

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.gitattributes export-ignore
33
/.github/ export-ignore
44
.gitignore export-ignore
5-
/.php_cs export-ignore
5+
/.php_cs.dist export-ignore
66
/.scrutinizer.yml export-ignore
77
/.styleci.yml export-ignore
88
/.travis.yml export-ignore

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/.php_cs
12
/behat.yml
23
/build/
34
/composer.lock

.php_cs renamed to .php_cs.dist

File renamed without changes.

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ cache:
77
- $HOME/.composer/cache/files
88

99
php:
10-
- 5.4
1110
- 5.5
1211
- 5.6
1312
- 7.0
@@ -25,7 +24,7 @@ branches:
2524
matrix:
2625
fast_finish: true
2726
include:
28-
- php: 5.4
27+
- php: 5.5
2928
env: COMPOSER_FLAGS="--prefer-stable --prefer-lowest" COVERAGE=true TEST_COMMAND="composer test-ci"
3029

3130
before_install:

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# Boilerplate
1+
# Package
22

3-
[![Latest Version](https://img.shields.io/github/release/php-http/boilerplate.svg?style=flat-square)](https://github.com/php-http/boilerplate/releases)
4-
[![Build Status](https://img.shields.io/travis/php-http/boilerplate.svg?style=flat-square)](https://travis-ci.org/php-http/boilerplate)
5-
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-http/boilerplate.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/boilerplate)
6-
[![Quality Score](https://img.shields.io/scrutinizer/g/php-http/boilerplate.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/boilerplate)
7-
[![Total Downloads](https://img.shields.io/packagist/dt/php-http/boilerplate.svg?style=flat-square)](https://packagist.org/packages/php-http/boilerplate)
3+
[![Latest Version](https://img.shields.io/github/release/php-http/package.svg?style=flat-square)](https://github.com/php-http/package/releases)
4+
[![Build Status](https://img.shields.io/travis/php-http/package.svg?style=flat-square)](https://travis-ci.org/php-http/package)
5+
[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/php-http/package.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/package)
6+
[![Quality Score](https://img.shields.io/scrutinizer/g/php-http/package.svg?style=flat-square)](https://scrutinizer-ci.com/g/php-http/package)
7+
[![Total Downloads](https://img.shields.io/packagist/dt/php-http/package.svg?style=flat-square)](https://packagist.org/packages/php-http/package)
88

99
**Boilerplate PHP HTTP library.**
1010

@@ -14,7 +14,7 @@
1414
Via Composer
1515

1616
``` bash
17-
$ composer require php-http/boilerplate
17+
$ composer require php-http/package
1818
```
1919

2020

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
}
1212
],
1313
"require": {
14-
"php": "^5.4 || ^7.0"
14+
"php": "^5.5 || ^7.0"
1515
},
1616
"autoload": {
1717
"psr-4": {
18-
"Http\\Boilerplate\\": "src/"
18+
"Http\\Package\\": "src/"
1919
}
2020
},
2121
"scripts": {

0 commit comments

Comments
 (0)