From 9db81b4f84083ea5dfba0f687fdbcbb4087699da Mon Sep 17 00:00:00 2001
From: SmeagolWorms4 <smeagolworms4@gmail.com>
Date: Fri, 9 Nov 2018 17:13:36 +0100
Subject: [PATCH] symfony 3.4

---
 .travis.yml                   | 20 ++------------------
 Builder/EmailBuilder.php      | 11 +++++++----
 Model/Email.php               |  2 +-
 Resources/config/services.yml | 27 ++++++++++-----------------
 Sender/EmailSender.php        |  5 ++++-
 composer.json                 |  4 ++--
 6 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 977ed8f..00ae361 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,30 +1,14 @@
 language: php
 
 php:
-    - 5.6
-    - 7.0
-    - hhvm
+    - 7.1
     
 matrix:
   fast_finish: true
-  include:
-    - php: 5.6
-      env: SYMFONY_VERSION=2.7.*
-    - php: 5.6
-      env: SYMFONY_VERSION=2.8.*
-    - php: 5.6
-      env: SYMFONY_VERSION=3.0.*
-  allow_failures:
-    - php: hhvm
 
 before_install:
-    # If PHP >= 7.0, force use of PHPunit 5.7
-    - mkdir ~/bin ; if php -r "exit( (int)! version_compare( '$TRAVIS_PHP_VERSION', '7.0', '>=' ) );"; then wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.1.3.phar; else wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-5.7.phar; fi ; chmod +x ~/bin/phpunit
+    - mkdir ~/bin; wget -O ~/bin/phpunit https://phar.phpunit.de/phpunit-6.1.3.phar; chmod +x ~/bin/phpunit
   
-before_script:
-    - if [ "$SYMFONY_VERSION" != "" ]; then composer require "symfony/symfony:${SYMFONY_VERSION}" --no-update; fi;
-    - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
-    
 install: composer update --prefer-dist --no-interaction $COMPOSER_FLAGS
 
 script: ~/bin/phpunit  --coverage-text
diff --git a/Builder/EmailBuilder.php b/Builder/EmailBuilder.php
index 1660354..a91f078 100644
--- a/Builder/EmailBuilder.php
+++ b/Builder/EmailBuilder.php
@@ -6,7 +6,6 @@
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\RequestStack;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\HttpKernel;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 use Symfony\Component\Translation\TranslatorInterface;
 
@@ -21,7 +20,7 @@ class EmailBuilder implements EmailBuilderInterface{
 	const HEADER_ALT_TEXT = 'mail-text';
 	
 	/**
-	 * @var HttpKernel
+	 * @var HttpKernelInterface
 	 */
 	private $httpKernel;
 	
@@ -35,7 +34,11 @@ class EmailBuilder implements EmailBuilderInterface{
 	 */
 	private $translator;
 	
-	public function __construct(HttpKernel $httpKernel, RequestStack $requestStack, TranslatorInterface $translator) {
+	public function __construct(
+		HttpKernelInterface $httpKernel,
+		RequestStack $requestStack,
+		TranslatorInterface $translator
+	) {
 		$this->httpKernel = $httpKernel;
 		$this->requestStack = $requestStack;
 		$this->translator = $translator;
@@ -100,7 +103,7 @@ public function build($subject, $body, $to, $cc = NULL, $bcc = NULL, $from = NUL
 			->setCc  ($cc)
 			->setBcc ($bcc)
 			->setFrom($from)
-			;
+		;
 	}
 	
 	/**
diff --git a/Model/Email.php b/Model/Email.php
index 6ded951..c164ae1 100644
--- a/Model/Email.php
+++ b/Model/Email.php
@@ -217,7 +217,7 @@ public function addFrom($mail, $name = NULL) {
 	 * @return \Swift_Message
 	 */
 	public function toSwiftMessage() {
-		$message = \Swift_Message::newInstance();
+		$message = new \Swift_Message();
 		
 		$message->setSubject($this->getSubject());
 		$message->setBody($this->getBody(), 'text/html');
diff --git a/Resources/config/services.yml b/Resources/config/services.yml
index d70694b..e1a9108 100644
--- a/Resources/config/services.yml
+++ b/Resources/config/services.yml
@@ -1,18 +1,11 @@
-parameters:
-    gsf_email.senderemailsender_class:   GollumSF\EmailBundle\Sender\EmailSender
-    gsf_email.builderemailbuilder_class: GollumSF\EmailBundle\Builder\EmailBuilder
-
 services:
-    
-    gsf_email.sender:
-        class: '%gsf_email.senderemailsender_class%'
-        arguments:
-            - '@gsf_email.builder'
-            - '@mailer'
-    
-    gsf_email.builder:
-        class: '%gsf_email.builderemailbuilder_class%'
-        arguments:
-            - '@http_kernel'
-            - '@request_stack'
-            - '@translator'
\ No newline at end of file
+    _defaults:
+        autowire: true
+        autoconfigure: true
+        public: true
+
+    GollumSF\EmailBundle\Builder\EmailBuilderInterface:
+        class: GollumSF\EmailBundle\Builder\EmailBuilder
+
+    GollumSF\EmailBundle\Sender\EmailSenderInterface:
+        class: GollumSF\EmailBundle\Sender\EmailSender
diff --git a/Sender/EmailSender.php b/Sender/EmailSender.php
index 3d7799d..686a402 100644
--- a/Sender/EmailSender.php
+++ b/Sender/EmailSender.php
@@ -21,7 +21,10 @@ class EmailSender implements EmailSenderInterface {
 	 */
 	private $mailer;
 	
-	public function __construct(EmailBuilderInterface $emailBuilder, \Swift_Mailer $mailer) {
+	public function __construct(
+		EmailBuilderInterface $emailBuilder,
+		\Swift_Mailer $mailer
+	) {
 		$this->emailBuilder = $emailBuilder;
 		$this->mailer = $mailer;
 	}
diff --git a/composer.json b/composer.json
index c0b8351..dff1ba1 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,8 @@
 		"wiki" : "https://github.com/GollumSF/email-bundle/blob/master/README.md"
 	},
 	"require" : {
-		"php" : ">=5.5",
-		"symfony/framework-bundle" : ">=2.7"
+		"php" : ">=7.1",
+		"symfony/framework-bundle" : ">=3.4"
 	},
 	"autoload" : {
 		"psr-0" : {