Skip to content

Commit

Permalink
Merge pull request #4 from ne0h12/master
Browse files Browse the repository at this point in the history
Update symfony dependencies
  • Loading branch information
Rastusik authored Oct 11, 2018
2 parents 6c71489 + 5e2430f commit 3e7d74f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 13 deletions.
8 changes: 8 additions & 0 deletions DataCollector/RequestLogDataCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,12 @@ public function getName()
{
return 'phystrix';
}

/**
* Resets this data collector to its initial state.
*/
public function reset()
{
$this->data = [];
}
}
20 changes: 10 additions & 10 deletions Resources/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,35 +15,35 @@ parameters:
services:

phystrix.configuration:
class: %phystrix.configuration.class%
class: "%phystrix.configuration.class%"
public: false
arguments:
- %phystrix.configuration.data%
- "%phystrix.configuration.data%"

phystrix.service_locator:
class: %phystrix.service_locator.class%
class: "%phystrix.service_locator.class%"

phystrix.state_storage:
class: %phystrix.state_storage.class%
class: "%phystrix.state_storage.class%"

phystrix.circuit_breaker_factory:
class: %phystrix.circuit_breaker_factory.class%
class: "%phystrix.circuit_breaker_factory.class%"
arguments:
- "@phystrix.state_storage"

phystrix.command_metrics_factory:
class: %phystrix.command_metrics_factory.class%
class: "%phystrix.command_metrics_factory.class%"
arguments:
- "@phystrix.state_storage"

phystrix.request_cache:
class: %phystrix.request_cache.class%
class: "%phystrix.request_cache.class%"

phystrix.request_log:
class: %phystrix.request_log.class%
class: "%phystrix.request_log.class%"

phystrix.command_factory:
class: %phystrix.command_factory.class%
class: "%phystrix.command_factory.class%"
arguments:
- "@phystrix.configuration"
- "@phystrix.service_locator"
Expand All @@ -53,7 +53,7 @@ services:
- "@phystrix.request_log"

phystrix.data_collector:
class: %phystrix.data_collector.class%
class: "%phystrix.data_collector.class%"
arguments:
- "@phystrix.request_log"
tags:
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"require": {
"php": ">=7.0",
"odesk/phystrix": "~1.0",
"symfony/http-kernel": "~2.5|~3.0",
"symfony/dependency-injection": "~2.5|~3.0",
"symfony/config": "~2.5|~3.0"
"symfony/http-kernel": "~2.5|~3.0|~4.0",
"symfony/dependency-injection": "~2.5|~3.0|~4.0",
"symfony/config": "~2.5|~3.0|~4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.2"
Expand Down

0 comments on commit 3e7d74f

Please sign in to comment.