Merge branch '4.4'

nicolas-grekas · nicolas-grekas · commit 2937f3043d3e · 2019-08-06T14:20:58.000+02:00
* 4.4:
  add yceruto as code owner of the ErrorRenderer component
  [HttpClient] Relax max duration test assertion
  Ignore ErrorHandler DebugClassLoaderTest class in PHP-CS-Fixer config
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -2,6 +2,8 @@
 /src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
 # DependencyInjection
 /src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
+# ErrorRenderer
+/src/Symfony/Component/ErrorRenderer/* @yceruto
 # Form
 /src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
 /src/Symfony/Bridge/Twig/Form/* @xabbuh
@@ -33,6 +35,8 @@
 /src/Symfony/Bridge/Doctrine/PropertyInfo/* @dunglas
 # Serializer
 /src/Symfony/Component/Serializer/* @dunglas
+# TwigBundle
+/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
 # WebLink
 /src/Symfony/Component/WebLink/* @dunglas
 # Workflow
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -51,7 +51,7 @@ return PhpCsFixer\Config::create()
             // explicit heredoc test
             ->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')
             // explicit trigger_error tests
-            ->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')
+            ->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')
             // invalid annotations on purpose
             ->notPath('Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php')
     )
diff --git a/src/Symfony/Component/ErrorRenderer/composer.json b/src/Symfony/Component/ErrorRenderer/composer.json
@@ -10,6 +10,10 @@
             "name": "Fabien Potencier",
             "email": "fabien@symfony.com"
         },
+        {
+            "name": "Yonel Ceruto",
+            "email": "yonelceruto@gmail.com"
+        },
         {
             "name": "Symfony Community",
             "homepage": "https://symfony.com/contributors"
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -795,7 +795,6 @@ public function testMaxDuration()
 
         $duration = microtime(true) - $start;
 
-        $this->assertGreaterThanOrEqual(0.1, $duration);
-        $this->assertLessThan(0.2, $duration);
+        $this->assertLessThan(10, $duration);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ return PhpCsFixer\Config::create()`
`51`	`51`	`// explicit heredoc test`
`52`	`52`	`->notPath('Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Resources/views/translation.html.php')`
`53`	`53`	`// explicit trigger_error tests`
`54`		`- ->notPath('Symfony/Component/Debug/Tests/DebugClassLoaderTest.php')`
	`54`	`+ ->notPath('Symfony/Component/ErrorHandler/Tests/DebugClassLoaderTest.php')`
`55`	`55`	`// invalid annotations on purpose`
`56`	`56`	`->notPath('Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php')`
`57`	`57`	`)`
Original file line number	Diff line number	Diff line change
`@@ -795,7 +795,6 @@ public function testMaxDuration()`
`795`	`795`
`796`	`796`	`$duration = microtime(true) - $start;`
`797`	`797`
`798`		`- $this->assertGreaterThanOrEqual(0.1, $duration);`
`799`		`- $this->assertLessThan(0.2, $duration);`
	`798`	`+ $this->assertLessThan(10, $duration);`
`800`	`799`	`}`
`801`	`800`	`}`