Skip to content

Commit 011f9a8

Browse files
authored
Merge pull request #13 from renatomefi/fix/general-improvements
Fix/general improvements
2 parents ff86f7f + 43f2719 commit 011f9a8

File tree

10 files changed

+1362
-42
lines changed

10 files changed

+1362
-42
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
*.idea*
2+
*.sublime-*
3+
**/vendor/*
4+
coverage/*

LICENSE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2013 Adrian Philipp, https://github.com/adri <[email protected]>
1+
Copyright (c) 2013-2016 Adrian Philipp, https://github.com/adri <[email protected]>
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

PHPUnit/Util/Log/VCR.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* A TestListener that integrates with PHP-VCR.
45
*
@@ -13,7 +14,7 @@
1314
* @package PHPUnit
1415
* @subpackage Util_Log
1516
* @author Adrian Philipp <[email protected]>
16-
* @copyright 2011-2012 Adrian Philipp <[email protected]>
17+
* @copyright 2011-2016 Adrian Philipp <[email protected]>
1718
* @license http://www.opensource.org/licenses/BSD-3-Clause The BSD 3-Clause License
1819
* @version Release: @package_version@
1920
* @link http://www.phpunit.de/
@@ -118,6 +119,7 @@ public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time)
118119
* A test started.
119120
*
120121
* @param PHPUnit_Framework_Test $test
122+
* @return bool|null
121123
*/
122124
public function startTest(PHPUnit_Framework_Test $test)
123125
{
@@ -171,6 +173,7 @@ private static function parseDocBlock($doc_block, $tag)
171173

172174
return $matches;
173175
}
176+
174177
/**
175178
* A test ended.
176179
*

README.md

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Use `@vcr cassette_name` on your tests to turn VCR automatically on and off.
99

1010
## Usage example
1111

12-
``` php
12+
```php
1313
class VCRTest extends \PHPUnit_Framework_TestCase
1414
{
1515
/**
@@ -26,26 +26,18 @@ class VCRTest extends \PHPUnit_Framework_TestCase
2626

2727
## Installation
2828

29-
1) Add to your `composer.json`:
29+
1) Install using composer:
3030

31-
``` json
32-
"require-dev": {
33-
"php-vcr/phpunit-testlistener-vcr": "*"
34-
}
35-
```
36-
37-
2) Install using composer:
38-
39-
``` bash
31+
```sh
4032
composer require --dev php-vcr/phpunit-testlistener-vcr
4133
```
4234

43-
3) Add listener to your `phpunit.xml`:
35+
2) Add listener to your `phpunit.xml`:
4436

45-
``` bash
46-
<listeners>
47-
<listener class="PHPUnit_Util_Log_VCR" file="vendor/php-vcr/phpunit-testlistener-vcr/PHPUnit/Util/Log/VCR.php" />
48-
</listeners>
37+
```yml
38+
<listeners>
39+
<listener class="PHPUnit_Util_Log_VCR" file="vendor/php-vcr/phpunit-testlistener-vcr/PHPUnit/Util/Log/VCR.php" />
40+
</listeners>
4941
```
5042

5143
## Dependencies
@@ -59,17 +51,17 @@ PHPUnit-Testlistener-VCR depends on:
5951

6052
In order to run all tests you need to get development dependencies using composer:
6153

62-
``` php
63-
composer install --dev
64-
phpunit ./tests
54+
```php
55+
composer install
56+
./vendor/bin/phpunit
6557
```
6658

6759
## Changelog
6860

69-
* 2013-05-14 1.0.0: First prototype
61+
**The changelog is manage at [PHPUnit testlistener for PHP-VCR releases page](https://github.com/php-vcr/phpunit-testlistener-vcr/releases).**
7062

7163
## Copyright
72-
Copyright (c) 2013 Adrian Philipp. Released under the terms of the MIT license. See LICENSE for details.
64+
Copyright (c) 2013-2016 Adrian Philipp. Released under the terms of the MIT license. See LICENSE for details.
7365

7466
<!--
7567
name of the projects and all sub-modules and libraries (sometimes they are named different and very confusing to new users)

composer.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@
1212

1313
"require": {
1414
"php-vcr/php-vcr": "*"
15+
},
16+
"require-dev": {
17+
"phpunit/phpunit": "^4.8"
1518
}
1619
}

0 commit comments

Comments
 (0)