Skip to content

Commit

Permalink
Merge pull request #14 from higidi/follow-semantic-versioning
Browse files Browse the repository at this point in the history
Follow semantic versioning
  • Loading branch information
simonhard authored Aug 24, 2021
2 parents 341950b + 0fbdb6c commit 078a0d9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/vendor/
composer.lock
3 changes: 2 additions & 1 deletion DataCollector/VCRDataCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\DataCollector\DataCollector;

use VCR\VCRBundle\VCR\Logger;

class VCRDataCollector extends DataCollector
Expand All @@ -16,7 +17,7 @@ public function __construct(Logger $logger)
$this->logger = $logger;
}

public function collect(Request $request, Response $response, \Throwable $exception = null)
public function collect(Request $request, Response $response, \Exception $exception = null)
{
$requests = $this->logger->getHttpRequests();
$playbacks = $this->logger->getPlaybacks();
Expand Down
4 changes: 2 additions & 2 deletions DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public function __construct(array $factories = array())

public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder('vcrvcr');
$rootNode = $treeBuilder->getRootNode();
$treeBuilder = new TreeBuilder();
$rootNode = $treeBuilder->root('vcrvcr');

$this->addCassetteNode($rootNode);

Expand Down
2 changes: 0 additions & 2 deletions VCRVCRBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
use Symfony\Component\Filesystem\Filesystem;
use Symfony\Component\HttpKernel\Bundle\Bundle;

use VCR\VCRBundle\VCR\VCRFactory;

class VCRVCRBundle extends Bundle
{
public function boot()
Expand Down
9 changes: 7 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,13 @@
}
],
"require": {
"symfony/framework-bundle": "~3.0||~4.0||~5.0",
"php-vcr/php-vcr": "^1.5"
"php-vcr/php-vcr": "^1.2",
"symfony/config": "^2.6|^3|^4",
"symfony/dependency-injection": "^2.6|^3|^4",
"symfony/event-dispatcher": "^2.6|^3|^4",
"symfony/http-foundation": "^2.6|^3|^4",
"symfony/http-kernel": "^2.6|^3|^4",
"symfony/yaml": "^2.6|^3|^4"
},
"autoload": {
"psr-4": {
Expand Down

0 comments on commit 078a0d9

Please sign in to comment.