Merge branch 'develop-ascraeus' into develop

tests/functional/fixtures/ext/foo/bar/config/routing.yml

@@ -1,35 +1,35 @@
 foo_bar_controller:
-    pattern: /foo/bar
+    path: /foo/bar
     defaults: { _controller: foo_bar.controller:handle }
 
 foo_baz_controller:
-    pattern: /foo/baz
+    path: /foo/baz
     defaults: { _controller: foo_bar.controller:baz }
 
 foo_template_controller:
-    pattern: /foo/template
+    path: /foo/template
     defaults: { _controller: foo_bar.controller:template }
 
 foo_exception_controller:
-    pattern: /foo/exception
+    path: /foo/exception
     defaults: { _controller: foo_bar.controller:exception }
 
 foo_login_redirect_controller:
-    pattern: /foo/login_redirect
+    path: /foo/login_redirect
     defaults: { _controller: foo_bar.controller:login_redirect }
 
 foo_redirect_controller:
-    pattern: /foo/redirect
+    path: /foo/redirect
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_index_controller:
-    pattern: /index
+    path: /index
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_tests_index_controller:
-    pattern: /tests/index
+    path: /tests/index
     defaults: { _controller: foo_bar.controller:redirect }
 
 foo_tests_dotdot_index_controller:
-    pattern: /tests/../index
+    path: /tests/../index
     defaults: { _controller: foo_bar.controller:redirect }

tests/functional/fixtures/ext/foo/foo/config/resource.yml

@@ -1,3 +1,3 @@
 foo_foo_controller:
-    pattern: /foo
+    path: /foo
     defaults: { _controller: foo_foo.controller:handle }