Skip to content

Commit 1330000

Browse files
committed
Minor aesthetics improvements regarding docs, file names and indentation
1 parent ac08902 commit 1330000

File tree

6 files changed

+31
-29
lines changed

6 files changed

+31
-29
lines changed

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@
44
/.gitignore export-ignore
55
/.travis.yml export-ignore
66
/phpunit.xml export-ignore
7+
/phpunit.xml.dist export-ignore

.travis.yml

+24-25
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
language: php
22

3-
# Test php-vcr with all relevant PHP versions but only use PHP 5.6 for integration tests.
43
matrix:
54
fast_finish: true
65
include:
7-
- env: TEST_DIR=.
8-
php: 5.3
9-
- env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
10-
php: 5.3
11-
- env: TEST_DIR=.
12-
php: 5.4
13-
- env: TEST_DIR=.
14-
php: 5.5
15-
- env: TEST_DIR=.
16-
php: 5.6
17-
- env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
18-
php: 5.6
19-
- env: TEST_DIR=.
20-
php: 7.0
21-
- env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
22-
php: 7.0
23-
- env: TEST_DIR=tests/integration/guzzle/3
24-
php: 5.6
25-
- env: TEST_DIR=tests/integration/guzzle/4
26-
php: 5.6
27-
- env: TEST_DIR=tests/integration/guzzle/5
28-
php: 5.6
29-
- env: TEST_DIR=tests/integration/soap
30-
php: 5.6
6+
- env: TEST_DIR=.
7+
php: 5.3
8+
- env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
9+
php: 5.3
10+
- env: TEST_DIR=.
11+
php: 5.4
12+
- env: TEST_DIR=.
13+
php: 5.5
14+
- env: TEST_DIR=.
15+
php: 5.6
16+
- env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
17+
php: 5.6
18+
- env: TEST_DIR=.
19+
php: 7.0
20+
- env: TEST_DIR=. COMPOSER_FLAGS="--prefer-lowest"
21+
php: 7.0
22+
- env: TEST_DIR=tests/integration/guzzle/3
23+
php: 5.6
24+
- env: TEST_DIR=tests/integration/guzzle/4
25+
php: 5.6
26+
- env: TEST_DIR=tests/integration/guzzle/5
27+
php: 5.6
28+
- env: TEST_DIR=tests/integration/soap
29+
php: 5.6
3130

3231
before_install:
3332
- composer self-update

Readme.md README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ class VCRTest extends \PHPUnit_Framework_TestCase
6767
```
6868

6969
You can use annotations in PHPUnit by using [phpunit-testlistener-vcr](https://github.com/php-vcr/phpunit-testlistener-vcr):
70+
7071
``` php
7172
class VCRTest extends \PHPUnit_Framework_TestCase
7273
{
@@ -110,8 +111,8 @@ Composer installs all dependencies except extensions like curl.
110111
In order to run all tests you need to get development dependencies using composer:
111112

112113
``` php
113-
composer install --dev
114-
phpunit ./tests
114+
composer install
115+
./vendor/bin/phpunit
115116
```
116117

117118
## Changelog

composer.json

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"autoload": {
2828
"classmap": ["src/"]
2929
},
30+
3031
"extra": {
3132
"branch-alias": {
3233
"dev-master": "1.3.x-dev"

composer.lock

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

phpunit.xml phpunit.xml.dist

File renamed without changes.

0 commit comments

Comments
 (0)