Skip to content

Commit cb32a7e

Browse files
committed
adjust to correct lowest requirements
1 parent 52dade0 commit cb32a7e

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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

2121
branches:
2222
only:

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@
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
},

src/SymfonyCache/PurgeSubscriber.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff 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,

0 commit comments

Comments
 (0)