Skip to content

Commit 66e69b8

Browse files
committed
Merge pull request #4 from scaytrase/feature/sf3
Sf3 compatibility
2 parents 25ce32d + a1c1a5b commit 66e69b8

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

.travis.yml

+9-7
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,24 @@ php:
44
- 5.4
55
- 5.5
66
- 5.6
7+
- 7
78
- hhvm
89

910
env:
1011
- SYMFONY_VERSION='2.3.*' deps='no'
11-
- SYMFONY_VERSION='2.5.*' deps='no'
12-
- SYMFONY_VERSION='2.6.*' deps='no'
13-
- SYMFONY_VERSION='2.7.*@dev' deps='no'
12+
- SYMFONY_VERSION='2.7.*' deps='no'
13+
- SYMFONY_VERSION='2.8.*' deps='no'
1414

1515
matrix:
1616
include:
17-
- php: 5.5
18-
env: SYMFONY_VERSION='~2.8@dev' deps='no'
19-
- php: 5.5
20-
env: SYMFONY_VERSION='~2.8|~3.0@dev' deps='no'
2117
- php: 5.4
2218
env: SYMFONY_VERSION='2.3.*' deps='low'
19+
- php: 5.5
20+
env: SYMFONY_VERSION='3.0.*' deps='no'
21+
- php: 5.6
22+
env: SYMFONY_VERSION='3.0.*' deps='no'
23+
- php: 7
24+
env: SYMFONY_VERSION='3.0.*' deps='no'
2325

2426
allow_failures:
2527
- php: hhvm

composer.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
],
1212
"require": {
1313
"php": ">=5.3.3",
14-
"symfony/http-kernel": "~2.3",
15-
"symfony/dependency-injection": "~2.3",
16-
"symfony/http-foundation": "~2.3",
17-
"symfony/config": "~2.3"
14+
"symfony/http-kernel": "~2.3|~3.0",
15+
"symfony/dependency-injection": "~2.3|~3.0",
16+
"symfony/http-foundation": "~2.3|~3.0",
17+
"symfony/config": "~2.3|~3.0"
1818
},
1919
"require-dev": {
20-
"phpunit/phpunit": "~4.6@stable",
21-
"symfony/framework-bundle": "~2.3"
20+
"phpunit/phpunit": "~4.6@stable|~5.0@stable",
21+
"symfony/framework-bundle": "~2.3|~3.0"
2222
},
2323
"autoload": {
2424
"psr-0": {

src/ScayTrase/SmsDeliveryBundle/Resources/config/services.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ services:
2828
sms_delivery.data_collector:
2929
class: ScayTrase\SmsDeliveryBundle\DataCollector\MessageDeliveryDataCollector
3030
arguments:
31-
- @sms_delivery.sender
31+
- "@sms_delivery.sender"
3232
tags:
3333
- { name: data_collector, template: "SmsDeliveryBundle:DataCollector:data_collector", id: "sms_delivery.data_collector" }
3434

3535
sms_delivery.event_listener.memory_spool_listener:
3636
class: ScayTrase\SmsDeliveryBundle\EventListener\MemorySpoolListener
37-
arguments: [ @sms_delivery.sender, @?logger ]
37+
arguments: [ "@sms_delivery.sender", "@?logger" ]
3838
tags:
3939
- { name: kernel.event_subscriber }

0 commit comments

Comments
 (0)