File tree Expand file tree Collapse file tree 3 files changed +10
-6
lines changed
Expand file tree Collapse file tree 3 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ matrix:
1616 - php : 5.5
1717 env : VARNISH_VERSION=3.0
1818 - php : 5.3.3
19- env : SYMFONY_VERSION=2.3.* COMPOSER_FLAGS="--prefer-lowest"
19+ env : SYMFONY_VERSION=2.3.* VARNISH_VERSION=4.0 COMPOSER_FLAGS="--prefer-lowest"
2020
2121branches :
2222 only :
Original file line number Diff line number Diff line change 2222 ],
2323 "require" : {
2424 "php" : " >=5.3.3" ,
25- "guzzle/guzzle" : " ~3.0 " ,
25+ "guzzle/guzzle" : " ~3.8 " ,
2626 "symfony/event-dispatcher" : " ~2.3" ,
2727 "symfony/options-resolver" : " ~2.3"
2828 },
2929 "require-dev" : {
30- "guzzle/plugin-mock" : " *" ,
31- "mockery/mockery" : " *" ,
32- "monolog/monolog" : " *" ,
30+ "mockery/mockery" : " ~0.9.1" ,
31+ "monolog/monolog" : " ~1.0" ,
3332 "symfony/process" : " ~2.3" ,
3433 "symfony/http-kernel" : " ~2.3"
3534 },
Original file line number Diff line number Diff line change @@ -50,7 +50,12 @@ class PurgeSubscriber extends AccessControlledSubscriber
5050 public function __construct (array $ options = array ())
5151 {
5252 $ resolver = new OptionsResolver ();
53- $ resolver ->setDefined (array ('purge_client_matcher ' , 'purge_client_ips ' , 'purge_method ' ));
53+ if (method_exists ($ resolver , 'setDefined ' )) {
54+ // this was only added in symfony 2.6
55+ $ resolver ->setDefined (array ('purge_client_matcher ' , 'purge_client_ips ' , 'purge_method ' ));
56+ } else {
57+ $ resolver ->setOptional (array ('purge_client_matcher ' , 'purge_client_ips ' , 'purge_method ' ));
58+ }
5459 $ resolver ->setDefaults (array (
5560 'purge_client_matcher ' => null ,
5661 'purge_client_ips ' => null ,
You can’t perform that action at this time.
0 commit comments