feature #33621 Revert "feature #33507 [WebProfiler] Deprecated intercept_redirects in 4.4 (dorumd)" (lyrixx)

fabpot · fabpot · commit 3f96ef2b653c · 2019-09-23T17:45:42.000+02:00
This PR was squashed before being merged into the 4.4 branch (closes #33621). Discussion ---------- Revert "feature #33507 [WebProfiler] Deprecated intercept_redirects in 4.4 (dorumd)" This reverts commit 21a05de, reversing changes made to 24faadc. | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | yes | Deprecations? | | Tickets | Fix #33467 | License | MIT | Doc PR | Commits ------- e767bb1 Revert \"feature #33507 [WebProfiler] Deprecated intercept_redirects in 4.4 (dorumd)\"
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
@@ -323,8 +323,6 @@ WebProfilerBundle
 
  * Deprecated the `ExceptionController` class in favor of `ExceptionErrorController`
  * Deprecated the `TemplateManager::templateExists()` method
- * Deprecated the `web_profiler.intercept_redirects` config option,
-   toolbar for the redirected resource contains a link to the redirect response profile instead.
 
 WebServerBundle
 ---------------
diff --git a/UPGRADE-5.0.md b/UPGRADE-5.0.md
@@ -577,8 +577,6 @@ WebProfilerBundle
 
  * Removed the `ExceptionController::templateExists()` method
  * Removed the `TemplateManager::templateExists()` method
- * Removed the `web_profiler.intercept_redirects` config option,
-   toolbar for the redirected resource contains a link to the redirect response profile instead.
 
 Workflow
 --------
diff --git a/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md b/src/Symfony/Bundle/WebProfilerBundle/CHANGELOG.md
@@ -12,8 +12,6 @@ CHANGELOG
  * deprecated the `ExceptionController` in favor of `ExceptionPanelController`
  * marked all classes of the WebProfilerBundle as internal
  * added a section with the stamps of a message after it is dispatched in the Messenger panel
- * deprecated the `web_profiler.intercept_redirects` config option,
-   toolbar for the redirected resource contains a link to the redirect response profile instead.
 
 4.3.0
 -----
diff --git a/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/Configuration.php
@@ -36,7 +36,7 @@ public function getConfigTreeBuilder()
         $treeBuilder->getRootNode()
             ->children()
                 ->booleanNode('toolbar')->defaultFalse()->end()
-                ->booleanNode('intercept_redirects')->defaultFalse()->setDeprecated('The "intercept_redirects" option is deprecated since version 4.4 and will be removed in 5.0.')->end()
+                ->booleanNode('intercept_redirects')->defaultFalse()->end()
                 ->scalarNode('excluded_ajax_paths')->defaultValue('^/((index|app(_[\w]+)?)\.php/)?_wdt')->end()
             ->end()
         ;

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function getConfigTreeBuilder()`
`36`	`36`	`$treeBuilder->getRootNode()`
`37`	`37`	`->children()`
`38`	`38`	`->booleanNode('toolbar')->defaultFalse()->end()`
`39`		`- ->booleanNode('intercept_redirects')->defaultFalse()->setDeprecated('The "intercept_redirects" option is deprecated since version 4.4 and will be removed in 5.0.')->end()`
	`39`	`+ ->booleanNode('intercept_redirects')->defaultFalse()->end()`
`40`	`40`	`->scalarNode('excluded_ajax_paths')->defaultValue('^/((index\|app(_[\w]+)?)\.php/)?_wdt')->end()`
`41`	`41`	`->end()`
`42`	`42`	`;`