Skip to content

Commit ab58d03

Browse files
committed
Fix compatibility with external dependencies
1 parent 67d9d6a commit ab58d03

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ matrix:
3838
before_install:
3939
- if [[ $COVERAGE != true ]]; then phpenv config-rm xdebug.ini || true; fi
4040
- if ! [ -z "$STABILITY" ]; then composer config minimum-stability ${STABILITY}; fi;
41-
- composer require --no-update symfony/phpunit-bridge:* ${DEPENDENCIES}
41+
- composer require --no-update symfony/phpunit-bridge:~4.0 ${DEPENDENCIES}
4242

4343
install:
4444
# To be removed when this issue will be resolved: https://github.com/composer/composer/issues/5355

composer.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
"require": {
1818
"php": ">=5.6",
1919
"sendgrid/sendgrid": "^7.0",
20-
"symfony/swiftmailer-bundle": "~3.2"
20+
"symfony/swiftmailer-bundle": "~3.2",
21+
"symfony/framework-bundle": "~2.7|~3.3|~4.0",
22+
"symfony/yaml": "~2.7|~3.3|~4.0"
2123
},
2224
"require-dev": {
2325
"nyholm/symfony-bundle-test": "^1.3"
@@ -37,4 +39,4 @@
3739
"ExpertCoder\\Swiftmailer\\SendGridBundle\\Tests\\": "tests/"
3840
}
3941
}
40-
}
42+
}

src/Services/SendGridTransport.php

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
use SendGrid;
77
use Swift_Events_EventListener;
88
use Swift_Mime_Attachment;
9-
use Swift_Mime_Message;
9+
use Swift_Mime_SimpleMessage;
1010
use Swift_Transport;
1111
use Psr\Log\LoggerInterface;
1212

@@ -81,12 +81,12 @@ public function setLogger(LoggerInterface $logger)
8181
/**
8282
* WARNING : $failedRecipients and return value are faked.
8383
*
84-
* @param Swift_Mime_Message $message
85-
* @param array $failedRecipients
84+
* @param Swift_Mime_SimpleMessage $message
85+
* @param array $failedRecipients
8686
*
8787
* @return int
8888
*/
89-
public function send(Swift_Mime_Message $message, &$failedRecipients = null)
89+
public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
9090
{
9191
// prepare fake data.
9292
$sent = 0;
@@ -184,6 +184,11 @@ public function send(Swift_Mime_Message $message, &$failedRecipients = null)
184184
return $sent;
185185
}
186186

187+
public function ping()
188+
{
189+
return true;
190+
}
191+
187192
public function registerPlugin(Swift_Events_EventListener $plugin)
188193
{
189194
// unused

tests/manual-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if [ $# -eq 0 ] # check if argument exists
88
exit 0;
99
fi
1010

11-
composer require --dev --no-update symfony/phpunit-bridge:* dunglas/symfony-lock:^$1
11+
composer require --dev --no-update symfony/phpunit-bridge:~4.0 dunglas/symfony-lock:^$1
1212
composer update --prefer-dist --no-interaction --prefer-stable --quiet
1313
composer update --prefer-stable --prefer-lowest --prefer-dist --no-interaction
1414
./vendor/bin/simple-phpunit install

0 commit comments

Comments
 (0)