Fixed some issues with deprecated code, added a listener that will no…

…t spit out deprecation notices while tests are running because it was causing an issue with CI

Makefile

@@ -29,7 +29,7 @@ infection: vendor database
 	php -d zend_extension=xdebug.so vendor/bin/infection
 
 integration: test-env vendor database cache
-	vendor/bin/phpunit --testsuite integration
+	SYMFONY_DEPRECATIONS_HELPER=disabled vendor/bin/phpunit --testsuite integration
 
 stan: vendor
 	vendor/bin/phpstan analyse

phpunit.xml.dist

@@ -37,4 +37,7 @@
             <directory>tests/Integration</directory>
         </testsuite>
     </testsuites>
+    <listeners>
+        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
+    </listeners>
 </phpunit>

src/Domain/Services/ResetEmailer.php

@@ -14,6 +14,7 @@
 namespace OpenCFP\Domain\Services;
 
 use OpenCFP\Infrastructure\Templating\Template;
+use Twig\Environment;
 
 class ResetEmailer
 {
@@ -23,7 +24,7 @@ class ResetEmailer
     private $swiftMailer;
 
     /**
-     * @var \Twig_Environment
+     * @var \Twig\Environment
      */
     private $twig;
 
@@ -39,11 +40,11 @@ class ResetEmailer
 
     /**
      * @param \Swift_Mailer     $swiftMailer
-     * @param \Twig_Environment $twig
+     * @param Environment $twig
      * @param string            $configEmail
      * @param string            $configTitle
      */
-    public function __construct(\Swift_Mailer $swiftMailer, \Twig_Environment $twig, string $configEmail, string $configTitle)
+    public function __construct(\Swift_Mailer $swiftMailer, Environment $twig, string $configEmail, string $configTitle)
     {
         $this->swiftMailer = $swiftMailer;
         $this->twig        = $twig;

src/Http/Action/Talk/CreateProcessAction.php

@@ -24,7 +24,7 @@
 use Swift_Message;
 use Symfony\Component\HttpFoundation;
 use Symfony\Component\Routing;
-use Twig_Environment;
+use Twig\Environment;
 
 final class CreateProcessAction
 {
@@ -69,7 +69,7 @@ final class CreateProcessAction
     private $applicationEndDate;
 
     /**
-     * @var Twig_Environment
+     * @var Environment
      */
     private $twig;
 
@@ -87,7 +87,7 @@ public function __construct(
         string $applicationEmail,
         string $applicationTitle,
         string $applicationEndDate,
-        Twig_Environment $twig,
+        Environment $twig,
         Routing\Generator\UrlGeneratorInterface $urlGenerator
     ) {
         $this->authentication     = $authentication;

src/Infrastructure/Templating/Template.php

@@ -13,7 +13,7 @@
 
 namespace OpenCFP\Infrastructure\Templating;
 
-abstract class Template extends \Twig_Template
+abstract class Template extends \Twig\Template
 {
     /**
      * Renders a block, including global context variables, so it can be used directly

tests/Unit/Domain/Services/ResetEmailerTest.php

@@ -18,7 +18,7 @@
 use OpenCFP\Domain\Services\ResetEmailer;
 use Swift_Mailer;
 use Swift_Message;
-use Twig_Template;
+use Twig\Template;
 
 final class ResetEmailerTest extends \PHPUnit\Framework\TestCase
 {
@@ -40,10 +40,10 @@ public function it_sends_the_expected_email()
             }))
             ->getMock();
 
-        /* @var Twig_Template $template */
-        $template = Mockery::mock(Twig_Template::class)->shouldIgnoreMissing();
+        /* @var Twig\Template $template */
+        $template = Mockery::mock(Twig\Template::class)->shouldIgnoreMissing();
 
-        $twig = Mockery::mock(\Twig_Environment::class);
+        $twig = Mockery::mock(\Twig\Environment::class);
         $twig->shouldReceive('loadTemplate')
             ->withArgs(['emails/reset_password.twig'])
             ->andReturn($template);