Fix tests

dunglas · dunglas · commit e5e9eb8da91a · 2017-09-29T10:05:17.000+02:00
diff --git a/composer.json b/composer.json
@@ -101,9 +101,6 @@
         "symfony/security-acl": "~2.8|~3.0",
         "phpdocumentor/reflection-docblock": "^3.0|^4.0"
     },
-    "provide": {
-        "psr/log-implementation": "1.0.0"
-    },
     "conflict": {
         "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
         "phpdocumentor/type-resolver": "<0.2.0",
@@ -112,6 +109,7 @@
     "provide": {
         "psr/cache-implementation": "1.0",
         "psr/container-implementation": "1.0",
+        "psr/log-implementation": "1.0",
         "psr/simple-cache-implementation": "1.0"
     },
     "autoload": {
diff --git a/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php b/src/Symfony/Bundle/FrameworkBundle/FrameworkBundle.php
@@ -18,7 +18,6 @@
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolClearerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\CachePoolPrunerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\DataCollectorTranslatorPass;
-use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\TemplatingPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\ProfilerPass;
 use Symfony\Bundle\FrameworkBundle\DependencyInjection\Compiler\LoggingTranslatorPass;
@@ -32,6 +31,7 @@
 use Symfony\Component\HttpKernel\DependencyInjection\AddCacheClearerPass;
 use Symfony\Component\HttpKernel\DependencyInjection\AddCacheWarmerPass;
 use Symfony\Component\HttpKernel\DependencyInjection\ControllerArgumentValueResolverPass;
+use Symfony\Component\HttpKernel\DependencyInjection\LoggerPass;
 use Symfony\Component\HttpKernel\DependencyInjection\RegisterControllerArgumentLocatorsPass;
 use Symfony\Component\HttpKernel\DependencyInjection\RemoveEmptyControllerArgumentLocatorsPass;
 use Symfony\Component\HttpKernel\DependencyInjection\ResettableServicePass;
diff --git a/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php b/src/Symfony/Component/HttpKernel/Tests/Log/LoggerTest.php
@@ -34,21 +34,21 @@ class LoggerTest extends TestCase
 
     protected function setUp()
     {
-        $this->tmpFile = sys_get_temp_dir().'/log';
+        $this->tmpFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.'log';
         $this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile);
     }
 
     protected function tearDown()
     {
-        unlink($this->tmpFile);
+        if (!@unlink($this->tmpFile)) {
+            file_put_contents($this->tmpFile, '');
+        }
     }
 
-    private function assertLogsMatch(array $expected, array $given)
+    public static function assertLogsMatch(array $expected, array $given)
     {
         foreach ($given as $k => $line) {
-            if (!preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\+[0-9]{2}:[0-9]{2} '.preg_quote($expected[$k]).'/', $line)) {
-                throw new \Exception("$line do not match expected pattern $expected[$k]");
-            }
+            self::assertThat(1 === preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}[\+-][0-9]{2}:[0-9]{2} '.preg_quote($expected[$k]).'/', $line), self::isTrue(), "\"$line\" do not match expected pattern \"$expected[$k]\"");
         }
     }
 
@@ -104,7 +104,7 @@ public function testLogLevelDisabled()
         $this->logger->log(LogLevel::DEBUG, 'test', array('user' => 'Bob'));
 
         // Will always be true, but asserts than an exception isn't thrown
-        $this->assertLogsMatch(array(), $this->getLogs());
+        $this->assertSame(array(), $this->getLogs());
     }
 
     /**
diff --git a/src/Symfony/Component/HttpKernel/composer.json b/src/Symfony/Component/HttpKernel/composer.json
@@ -41,7 +41,7 @@
         "psr/cache": "~1.0"
     },
     "provide": {
-        "psr/log-implementation": "1.0.0"
+        "psr/log-implementation": "1.0"
     },
     "conflict": {
         "symfony/config": "<2.8",

Original file line number	Diff line number	Diff line change
`@@ -34,21 +34,21 @@ class LoggerTest extends TestCase`
`34`	`34`
`35`	`35`	`protected function setUp()`
`36`	`36`	`{`
`37`		`- $this->tmpFile = sys_get_temp_dir().'/log';`
	`37`	`+ $this->tmpFile = sys_get_temp_dir().DIRECTORY_SEPARATOR.'log';`
`38`	`38`	`$this->logger = new Logger(LogLevel::DEBUG, $this->tmpFile);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`protected function tearDown()`
`42`	`42`	`{`
`43`		`- unlink($this->tmpFile);`
	`43`	`+ if (!@unlink($this->tmpFile)) {`
	`44`	`+ file_put_contents($this->tmpFile, '');`
	`45`	`+ }`
`44`	`46`	`}`
`45`	`47`
`46`		`- private function assertLogsMatch(array $expected, array $given)`
	`48`	`+ public static function assertLogsMatch(array $expected, array $given)`
`47`	`49`	`{`
`48`	`50`	`foreach ($given as $k => $line) {`
`49`		`- if (!preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\+[0-9]{2}:[0-9]{2} '.preg_quote($expected[$k]).'/', $line)) {`
`50`		`- throw new \Exception("$line do not match expected pattern $expected[$k]");`
`51`		`- }`
	`51`	`+ self::assertThat(1 === preg_match('/[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}[\+-][0-9]{2}:[0-9]{2} '.preg_quote($expected[$k]).'/', $line), self::isTrue(), "\"$line\" do not match expected pattern \"$expected[$k]\"");`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`@@ -104,7 +104,7 @@ public function testLogLevelDisabled()`
`104`	`104`	`$this->logger->log(LogLevel::DEBUG, 'test', array('user' => 'Bob'));`
`105`	`105`
`106`	`106`	`// Will always be true, but asserts than an exception isn't thrown`
`107`		`- $this->assertLogsMatch(array(), $this->getLogs());`
	`107`	`+ $this->assertSame(array(), $this->getLogs());`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`/**`