--- modules/system/tests/fixtures/update/drupal-8.bare.standard.php-old	2015-09-09 11:07:52.000000000 +0200
+++ modules/system/tests/fixtures/update/drupal-8.bare.standard.php	2015-09-09 21:59:54.000000000 +0200
@@ -7775,7 +7775,7 @@
   'path' => '/<current>',
   'pattern_outline' => '/<current>',
   'fit' => '1',
-  'route' => 'C:31:"Symfony\Component\Routing\Route":845:{a:9:{s:4:"path";s:10:"/<current>";s:4:"host";s:0:"";s:8:"defaults";a:0:{}s:12:"requirements";a:1:{s:7:"_method";s:8:"GET|POST";}s:7:"options";a:3:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:1:{i:0;s:31:"route_enhancer.param_conversion";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":338:{a:11:{s:4:"vars";a:0:{}s:11:"path_prefix";s:10:"/<current>";s:10:"path_regex";s:17:"#^/<current\>$#s";s:11:"path_tokens";a:1:{i:0;a:2:{i:0;s:4:"text";i:1;s:10:"/<current>";}}s:9:"path_vars";a:0:{}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:1;s:14:"patternOutline";s:10:"/<current>";s:8:"numParts";i:1;}}}}',
+  'route' => 'C:31:"Symfony\Component\Routing\Route":845:{a:9:{s:4:"path";s:10:"/<current>";s:4:"host";s:0:"";s:8:"defaults";a:0:{}s:12:"requirements";a:1:{s:7:"_method";s:8:"GET|POST";}s:7:"options";a:3:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:1:{i:0;s:31:"route_enhancer.param_conversion";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":338:{a:11:{s:4:"vars";a:0:{}s:11:"path_prefix";s:10:"/<current>";s:10:"path_regex";s:17:"#^/\<current\>$#s";s:11:"path_tokens";a:1:{i:0;a:2:{i:0;s:4:"text";i:1;s:10:"/<current>";}}s:9:"path_vars";a:0:{}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:1;s:14:"patternOutline";s:10:"/<current>";s:8:"numParts";i:1;}}}}',
   'number_parts' => '1',
 ))
 ->values(array(
@@ -7879,7 +7879,7 @@
   'path' => '/comment/{comment}/approve',
   'pattern_outline' => '/comment/%/approve',
   'fit' => '5',
-  'route' => 'C:31:"Symfony\Component\Routing\Route":1475:{a:9:{s:4:"path";s:26:"/comment/{comment}/approve";s:4:"host";s:0:"";s:8:"defaults";a:3:{s:6:"_title";s:7:"Approve";s:11:"_controller";s:60:"\Drupal\comment\Controller\CommentController::commentApprove";s:11:"entity_type";s:7:"comment";}s:12:"requirements";a:3:{s:14:"_entity_access";s:15:"comment.approve";s:11:"_csrf_token";s:4:"TRUE";s:7:"_method";s:8:"GET|POST";}s:7:"options";a:5:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:10:"parameters";a:1:{s:7:"comment";a:2:{s:4:"type";s:14:"entity:comment";s:9:"converter";s:21:"paramconverter.entity";}}s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:1:{i:0;s:31:"route_enhancer.param_conversion";}s:14:"_access_checks";a:2:{i:0;s:19:"access_check.entity";i:1;s:17:"access_check.csrf";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":520:{a:11:{s:4:"vars";a:1:{i:0;s:7:"comment";}s:11:"path_prefix";s:8:"/comment";s:10:"path_regex";s:41:"#^/comment/(?P[^/]++)/approve$#s";s:11:"path_tokens";a:3:{i:0;a:2:{i:0;s:4:"text";i:1;s:8:"/approve";}i:1;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:6:"[^/]++";i:3;s:7:"comment";}i:2;a:2:{i:0;s:4:"text";i:1;s:8:"/comment";}}s:9:"path_vars";a:1:{i:0;s:7:"comment";}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:5;s:14:"patternOutline";s:18:"/comment/%/approve";s:8:"numParts";i:3;}}}}',
+  'route' => 'C:31:"Symfony\Component\Routing\Route":1475:{a:9:{s:4:"path";s:26:"/comment/{comment}/approve";s:4:"host";s:0:"";s:8:"defaults";a:3:{s:6:"_title";s:7:"Approve";s:11:"_controller";s:60:"\Drupal\comment\Controller\CommentController::commentApprove";s:11:"entity_type";s:7:"comment";}s:12:"requirements";a:3:{s:14:"_entity_access";s:15:"comment.approve";s:11:"_csrf_token";s:4:"TRUE";s:7:"_method";s:8:"GET|POST";}s:7:"options";a:5:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:10:"parameters";a:1:{s:7:"comment";a:2:{s:4:"type";s:14:"entity:comment";s:9:"converter";s:21:"paramconverter.entity";}}s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:1:{i:0;s:31:"route_enhancer.param_conversion";}s:14:"_access_checks";a:2:{i:0;s:19:"access_check.entity";i:1;s:17:"access_check.csrf";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":520:{a:11:{s:4:"vars";a:1:{i:0;s:7:"comment";}s:11:"path_prefix";s:8:"/comment";s:10:"path_regex";s:41:"#^/comment/(?P<comment>[^/]++)/approve$#s";s:11:"path_tokens";a:3:{i:0;a:2:{i:0;s:4:"text";i:1;s:8:"/approve";}i:1;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:6:"[^/]++";i:3;s:7:"comment";}i:2;a:2:{i:0;s:4:"text";i:1;s:8:"/comment";}}s:9:"path_vars";a:1:{i:0;s:7:"comment";}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:5;s:14:"patternOutline";s:18:"/comment/%/approve";s:8:"numParts";i:3;}}}}',
   'number_parts' => '3',
 ))
 ->values(array(
@@ -8167,7 +8167,7 @@
   'path' => '/comment/{comment}',
   'pattern_outline' => '/comment/%',
   'fit' => '2',
-  'route' => 'C:31:"Symfony\Component\Routing\Route":1385:{a:9:{s:4:"path";s:18:"/comment/{comment}";s:4:"host";s:0:"";s:8:"defaults";a:2:{s:15:"_title_callback";s:67:"\Drupal\comment\Controller\CommentController::commentPermalinkTitle";s:11:"_controller";s:62:"\Drupal\comment\Controller\CommentController::commentPermalink";}s:12:"requirements";a:2:{s:14:"_entity_access";s:12:"comment.view";s:7:"_method";s:8:"GET|POST";}s:7:"options";a:5:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:10:"parameters";a:1:{s:7:"comment";a:2:{s:4:"type";s:14:"entity:comment";s:9:"converter";s:21:"paramconverter.entity";}}s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:1:{i:0;s:31:"route_enhancer.param_conversion";}s:14:"_access_checks";a:1:{i:0;s:19:"access_check.entity";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":460:{a:11:{s:4:"vars";a:1:{i:0;s:7:"comment";}s:11:"path_prefix";s:8:"/comment";s:10:"path_regex";s:33:"#^/comment/(?P[^/]++)$#s";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:6:"[^/]++";i:3;s:7:"comment";}i:1;a:2:{i:0;s:4:"text";i:1;s:8:"/comment";}}s:9:"path_vars";a:1:{i:0;s:7:"comment";}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:2;s:14:"patternOutline";s:10:"/comment/%";s:8:"numParts";i:2;}}}}',
+  'route' => 'C:31:"Symfony\Component\Routing\Route":1385:{a:9:{s:4:"path";s:18:"/comment/{comment}";s:4:"host";s:0:"";s:8:"defaults";a:2:{s:15:"_title_callback";s:67:"\Drupal\comment\Controller\CommentController::commentPermalinkTitle";s:11:"_controller";s:62:"\Drupal\comment\Controller\CommentController::commentPermalink";}s:12:"requirements";a:2:{s:14:"_entity_access";s:12:"comment.view";s:7:"_method";s:8:"GET|POST";}s:7:"options";a:5:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:10:"parameters";a:1:{s:7:"comment";a:2:{s:4:"type";s:14:"entity:comment";s:9:"converter";s:21:"paramconverter.entity";}}s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:1:{i:0;s:31:"route_enhancer.param_conversion";}s:14:"_access_checks";a:1:{i:0;s:19:"access_check.entity";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":460:{a:11:{s:4:"vars";a:1:{i:0;s:7:"comment";}s:11:"path_prefix";s:8:"/comment";s:10:"path_regex";s:33:"#^/comment/(?P<comment>[^/]++)$#s";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:6:"[^/]++";i:3;s:7:"comment";}i:1;a:2:{i:0;s:4:"text";i:1;s:8:"/comment";}}s:9:"path_vars";a:1:{i:0;s:7:"comment";}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:2;s:14:"patternOutline";s:10:"/comment/%";s:8:"numParts";i:2;}}}}',
   'number_parts' => '2',
 ))
 ->values(array(
@@ -8175,7 +8175,7 @@
   'path' => '/comment/{comment}/delete',
   'pattern_outline' => '/comment/%/delete',
   'fit' => '5',
-  'route' => 'C:31:"Symfony\Component\Routing\Route":1365:{a:9:{s:4:"path";s:25:"/comment/{comment}/delete";s:4:"host";s:0:"";s:8:"defaults";a:2:{s:6:"_title";s:6:"Delete";s:12:"_entity_form";s:14:"comment.delete";}s:12:"requirements";a:2:{s:14:"_entity_access";s:14:"comment.delete";s:7:"_method";s:8:"GET|POST";}s:7:"options";a:5:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:10:"parameters";a:1:{s:7:"comment";a:2:{s:4:"type";s:14:"entity:comment";s:9:"converter";s:21:"paramconverter.entity";}}s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:2:{i:0;s:31:"route_enhancer.param_conversion";i:1;s:21:"route_enhancer.entity";}s:14:"_access_checks";a:1:{i:0;s:19:"access_check.entity";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":517:{a:11:{s:4:"vars";a:1:{i:0;s:7:"comment";}s:11:"path_prefix";s:8:"/comment";s:10:"path_regex";s:40:"#^/comment/(?P[^/]++)/delete$#s";s:11:"path_tokens";a:3:{i:0;a:2:{i:0;s:4:"text";i:1;s:7:"/delete";}i:1;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:6:"[^/]++";i:3;s:7:"comment";}i:2;a:2:{i:0;s:4:"text";i:1;s:8:"/comment";}}s:9:"path_vars";a:1:{i:0;s:7:"comment";}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:5;s:14:"patternOutline";s:17:"/comment/%/delete";s:8:"numParts";i:3;}}}}',
+  'route' => 'C:31:"Symfony\Component\Routing\Route":1365:{a:9:{s:4:"path";s:25:"/comment/{comment}/delete";s:4:"host";s:0:"";s:8:"defaults";a:2:{s:6:"_title";s:6:"Delete";s:12:"_entity_form";s:14:"comment.delete";}s:12:"requirements";a:2:{s:14:"_entity_access";s:14:"comment.delete";s:7:"_method";s:8:"GET|POST";}s:7:"options";a:5:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:10:"parameters";a:1:{s:7:"comment";a:2:{s:4:"type";s:14:"entity:comment";s:9:"converter";s:21:"paramconverter.entity";}}s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:2:{i:0;s:31:"route_enhancer.param_conversion";i:1;s:21:"route_enhancer.entity";}s:14:"_access_checks";a:1:{i:0;s:19:"access_check.entity";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":517:{a:11:{s:4:"vars";a:1:{i:0;s:7:"comment";}s:11:"path_prefix";s:8:"/comment";s:10:"path_regex";s:40:"#^/comment/(?P<comment>[^/]++)/delete$#s";s:11:"path_tokens";a:3:{i:0;a:2:{i:0;s:4:"text";i:1;s:7:"/delete";}i:1;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:6:"[^/]++";i:3;s:7:"comment";}i:2;a:2:{i:0;s:4:"text";i:1;s:8:"/comment";}}s:9:"path_vars";a:1:{i:0;s:7:"comment";}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:5;s:14:"patternOutline";s:17:"/comment/%/delete";s:8:"numParts";i:3;}}}}',
   'number_parts' => '3',
 ))
 ->values(array(
@@ -8183,7 +8183,7 @@
   'path' => '/comment/{comment}/edit',
   'pattern_outline' => '/comment/%/edit',
   'fit' => '5',
-  'route' => 'C:31:"Symfony\Component\Routing\Route":1356:{a:9:{s:4:"path";s:23:"/comment/{comment}/edit";s:4:"host";s:0:"";s:8:"defaults";a:2:{s:6:"_title";s:4:"Edit";s:12:"_entity_form";s:15:"comment.default";}s:12:"requirements";a:2:{s:14:"_entity_access";s:14:"comment.update";s:7:"_method";s:8:"GET|POST";}s:7:"options";a:5:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:10:"parameters";a:1:{s:7:"comment";a:2:{s:4:"type";s:14:"entity:comment";s:9:"converter";s:21:"paramconverter.entity";}}s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:2:{i:0;s:31:"route_enhancer.param_conversion";i:1;s:21:"route_enhancer.entity";}s:14:"_access_checks";a:1:{i:0;s:19:"access_check.entity";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":511:{a:11:{s:4:"vars";a:1:{i:0;s:7:"comment";}s:11:"path_prefix";s:8:"/comment";s:10:"path_regex";s:38:"#^/comment/(?P[^/]++)/edit$#s";s:11:"path_tokens";a:3:{i:0;a:2:{i:0;s:4:"text";i:1;s:5:"/edit";}i:1;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:6:"[^/]++";i:3;s:7:"comment";}i:2;a:2:{i:0;s:4:"text";i:1;s:8:"/comment";}}s:9:"path_vars";a:1:{i:0;s:7:"comment";}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:5;s:14:"patternOutline";s:15:"/comment/%/edit";s:8:"numParts";i:3;}}}}',
+  'route' => 'C:31:"Symfony\Component\Routing\Route":1356:{a:9:{s:4:"path";s:23:"/comment/{comment}/edit";s:4:"host";s:0:"";s:8:"defaults";a:2:{s:6:"_title";s:4:"Edit";s:12:"_entity_form";s:15:"comment.default";}s:12:"requirements";a:2:{s:14:"_entity_access";s:14:"comment.update";s:7:"_method";s:8:"GET|POST";}s:7:"options";a:5:{s:14:"compiler_class";s:34:"\Drupal\Core\Routing\RouteCompiler";s:10:"parameters";a:1:{s:7:"comment";a:2:{s:4:"type";s:14:"entity:comment";s:9:"converter";s:21:"paramconverter.entity";}}s:14:"_route_filters";a:1:{i:0;s:27:"content_type_header_matcher";}s:16:"_route_enhancers";a:2:{i:0;s:31:"route_enhancer.param_conversion";i:1;s:21:"route_enhancer.entity";}s:14:"_access_checks";a:1:{i:0;s:19:"access_check.entity";}}s:7:"schemes";a:0:{}s:7:"methods";a:2:{i:0;s:3:"GET";i:1;s:4:"POST";}s:9:"condition";s:0:"";s:8:"compiled";C:33:"Drupal\Core\Routing\CompiledRoute":511:{a:11:{s:4:"vars";a:1:{i:0;s:7:"comment";}s:11:"path_prefix";s:8:"/comment";s:10:"path_regex";s:38:"#^/comment/(?P<comment>[^/]++)/edit$#s";s:11:"path_tokens";a:3:{i:0;a:2:{i:0;s:4:"text";i:1;s:5:"/edit";}i:1;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:6:"[^/]++";i:3;s:7:"comment";}i:2;a:2:{i:0;s:4:"text";i:1;s:8:"/comment";}}s:9:"path_vars";a:1:{i:0;s:7:"comment";}s:10:"host_regex";N;s:11:"host_tokens";a:0:{}s:9:"host_vars";a:0:{}s:3:"fit";i:5;s:14:"patternOutline";s:15:"/comment/%/edit";s:8:"numParts";i:3;}}}}',
   'number_parts' => '3',
 ))
 ->values(array(