symfony
diff --git a/‎src/Symfony/Component/Routing/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/CHANGELOG.md
+6Lines changed: 6 additions & 0 deletions b/‎src/Symfony/Component/Routing/CHANGELOG.md
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/CHANGELOG.md
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Routing/RouteCompiler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/RouteCompiler.php
+2-4Lines changed: 2 additions & 4 deletions b/‎src/Symfony/Component/Routing/RouteCompiler.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/RouteCompiler.php
+2-4Lines changed: 2 additions & 4 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
+1-2Lines changed: 1 addition & 2 deletions b/‎src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
+1-2Lines changed: 1 addition & 2 deletions
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+4.0.0
+-----
+
+ * dropped support for using UTF-8 route patterns without using the `utf8` option
+ * dropped support for using UTF-8 route requirements without using the `utf8` option
+
 3.3.0
 -----
 
 
@@ -103,8 +103,7 @@ private static function compilePattern(Route $route, $pattern, $isHost)
         $needsUtf8 = $route->getOption('utf8');
 
         if (!$needsUtf8 && $useUtf8 && preg_match('/[\x80-\xFF]/', $pattern)) {
-            $needsUtf8 = true;
-            @trigger_error(sprintf('Using UTF-8 route patterns without setting the "utf8" option is deprecated since Symfony 3.2 and will throw a LogicException in 4.0. Turn on the "utf8" route option for pattern "%s".', $pattern), E_USER_DEPRECATED);
+            throw new \LogicException(sprintf('Cannot use UTF-8 route patterns without setting the "utf8" option for route "%s".', $route->getPath()));
         }
         if (!$useUtf8 && $needsUtf8) {
             throw new \LogicException(sprintf('Cannot mix UTF-8 requirements with non-UTF-8 pattern "%s".', $pattern));
@@ -176,8 +175,7 @@ private static function compilePattern(Route $route, $pattern, $isHost)
                 if (!preg_match('//u', $regexp)) {
                     $useUtf8 = false;
                 } elseif (!$needsUtf8 && preg_match('/[\x80-\xFF]|(?<!\\\\)\\\\(?:\\\\\\\\)*+(?-i:X|[pP][\{CLMNPSZ]|x\{[A-Fa-f0-9]{3})/', $regexp)) {
-                    $needsUtf8 = true;
-                    @trigger_error(sprintf('Using UTF-8 route requirements without setting the "utf8" option is deprecated since Symfony 3.2 and will throw a LogicException in 4.0. Turn on the "utf8" route option for variable "%s" in pattern "%s".', $varName, $pattern), E_USER_DEPRECATED);
+                    throw new \LogicException(sprintf('Cannot use UTF-8 route requirements without setting the "utf8" option for variable "%s" in pattern "%s".', $varName, $pattern));
                 }
                 if (!$useUtf8 && $needsUtf8) {
                     throw new \LogicException(sprintf('Cannot mix UTF-8 requirement with non-UTF-8 charset for variable "%s" in pattern "%s".', $varName, $pattern));
 
@@ -184,9 +184,8 @@ public function provideCompileData()
     }
 
     /**
-     * @group legacy
      * @dataProvider provideCompileImplicitUtf8Data
-     * @expectedDeprecation Using UTF-8 route %s without setting the "utf8" option is deprecated %s.
+     * @expectedException \LogicException
      */
     public function testCompileImplicitUtf8Data($name, $arguments, $prefix, $regex, $variables, $tokens, $deprecationType)
     {
Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,8 @@ public function provideCompileData()`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`/**`
`187`		`- * @group legacy`
`188`	`187`	`* @dataProvider provideCompileImplicitUtf8Data`
`189`		`- * @expectedDeprecation Using UTF-8 route %s without setting the "utf8" option is deprecated %s.`
	`188`	`+ * @expectedException \LogicException`
`190`	`189`	`*/`
`191`	`190`	`public function testCompileImplicitUtf8Data($name, $arguments, $prefix, $regex, $variables, $tokens, $deprecationType)`
`192`	`191`	`{`