minor #360 Fix tests for php7 (dbrumann)

This PR was merged into the 3.x-dev branch.

Discussion
----------

Fix tests for php7

Combines previous PRs #358 and #359 together with fixes for failing tests on Travis.

 * Updates travis test matrix:
   * Adds PHP 7.4 to test matrix
   * Expands test matrix for PHP 7.2+ to check against both monolog 1 & 2
 * Fixes PHPUnit deprecations:
   * Fixes invalid method signature for `setUp()`
   * Replaces deprecated assertions (assertContains, assertNotContains)
   * Replaces deprecated expectedExceptions annotations
 * Fixes missing service definitions in container configurations

Closes #351 as well

Commits
-------

e71163a Fix tests failing in PHP 7.1+

Author: lyrixx

.travis.yml

@@ -24,17 +24,32 @@ matrix:
     - php: 7.1
       # There is a bug in PHPUnit 5.7
       env: SYMFONY_PHPUNIT_VERSION=6.5
+    # Test against seldaek/monolog 1.x
     - php: 7.2
+      env: MONOLOG_VERSION=1.*
     - php: 7.3
+      env: MONOLOG_VERSION=1.*
+    - php: 7.4
+      env: MONOLOG_VERSION=1.*
+    # Test against seldaek/monolog 2.x
+    - php: 7.2
+      env: MONOLOG_VERSION=2.*
+    - php: 7.3
+      env: MONOLOG_VERSION=2.*
+    - php: 7.4
+      env: MONOLOG_VERSION=2.*
     # Test against dev versions
     - php: nightly
-      env: DEPENDENCIES=dev
+      env: DEPENDENCIES=dev MONOLOG_VERSION=1.*
+    - php: nightly
+      env: DEPENDENCIES=dev MONOLOG_VERSION=2.*
   allow_failures:
-    - env: DEPENDENCIES=dev
+    - php: nightly
 
 before_install:
     - composer self-update
     - if [ "$DEPENDENCIES" = "dev" ]; then perl -pi -e 's/^}$/,"minimum-stability":"dev"}/' composer.json; fi;
+    - if [ "$MONOLOG_VERSION" != "" ]; then composer require --dev --no-update monolog/monolog:"$MONOLOG_VERSION"; fi;
     - if [ "$SYMFONY_VERSION" != "" ]; then composer require --dev --no-update symfony/symfony:"$SYMFONY_VERSION"; fi
 
 install:

Tests/DependencyInjection/Compiler/AddSwiftMailerTransportPassTest.php

@@ -26,7 +26,10 @@ class AddSwiftMailerTransportPassTest extends TestCase
 
     private $definition;
 
-    protected function setUp()
+    /**
+     * @before
+     */
+    protected function doSetUp()
     {
         $this->compilerPass = new AddSwiftMailerTransportPass();
         $this->definition = $this->getMockBuilder('\Symfony\Component\DependencyInjection\Definition')->getMock();

Tests/DependencyInjection/ConfigurationTest.php

@@ -14,6 +14,7 @@
 use Monolog\Logger;
 use PHPUnit\Framework\TestCase;
 use Symfony\Bundle\MonologBundle\DependencyInjection\Configuration;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -143,9 +144,6 @@ public function testArrays()
         $this->assertEquals('D', $config['handlers']['bar']['channels']['elements'][1]);
     }
 
-    /**
-     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     */
     public function testInvalidArrays()
     {
         $configs = [
@@ -160,12 +158,11 @@ public function testInvalidArrays()
             ]
         ];
 
+        $this->expectException(InvalidConfigurationException::class);
+
         $config = $this->process($configs);
     }
 
-    /**
-     * @expectedException Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
-     */
     public function testMergingInvalidChannels()
     {
         $configs = [
@@ -187,6 +184,8 @@ public function testMergingInvalidChannels()
             ]
         ];
 
+        $this->expectException(InvalidConfigurationException::class);
+
         $config = $this->process($configs);
     }
 

Tests/DependencyInjection/FixtureMonologExtensionTest.php

@@ -202,7 +202,7 @@ public function testPsr3MessageProcessingEnabled()
 
         $methodCalls = $logger->getMethodCalls();
 
-        $this->assertContains(['pushProcessor', [new Reference('monolog.processor.psr_log_message')]], $methodCalls, 'The PSR-3 processor should be enabled', false, false);
+        $this->assertContainsEquals(['pushProcessor', [new Reference('monolog.processor.psr_log_message')]], $methodCalls, 'The PSR-3 processor should be enabled');
     }
 
     public function testPsr3MessageProcessingDisabled()
@@ -213,7 +213,7 @@ public function testPsr3MessageProcessingDisabled()
 
         $methodCalls = $logger->getMethodCalls();
 
-        $this->assertNotContains(['pushProcessor', [new Reference('monolog.processor.psr_log_message')]], $methodCalls, 'The PSR-3 processor should not be enabled', false, false);
+        $this->assertNotContainsEquals(['pushProcessor', [new Reference('monolog.processor.psr_log_message')]], $methodCalls, 'The PSR-3 processor should not be enabled');
     }
 
     public function testNativeMailer()

Tests/DependencyInjection/Fixtures/yml/multiple_handlers.yml

@@ -5,7 +5,7 @@ monolog:
             path: /tmp/symfony.log
             bubble: false
             level: ERROR
-            file_permission: 0666
+            file_permission: 438 # decimal representation of 0666 octal
         main:
             type: fingers_crossed
             action_level: ERROR