diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.json index 340141bbd2..283ed13fa3 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.json @@ -1 +1,4 @@ -{"service":"service_1","public":true} +{ + "service": "service_1", + "public": true +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.json index da360b6a94..6998dae282 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.json @@ -1 +1,4 @@ -{"service":"service_2","public":false} +{ + "service": "service_2", + "public": false +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json index cfa40ef5b9..33c5ed71d4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json @@ -1 +1,27 @@ -{"definitions":{"definition_1":{"class":"Full\\Qualified\\Class1","scope":"container","public":true,"synthetic":false,"file":null,"tags":[]}},"aliases":{"alias_1":{"service":"service_1","public":true},"alias_2":{"service":"service_2","public":false}},"services":{"service_container":"Symfony\\Component\\DependencyInjection\\ContainerBuilder"}} +{ + "definitions": { + "definition_1": { + "class": "Full\\Qualified\\Class1", + "scope": "container", + "public": true, + "synthetic": false, + "file": null, + "tags": [ + + ] + } + }, + "aliases": { + "alias_1": { + "service": "service_1", + "public": true + }, + "alias_2": { + "service": "service_2", + "public": false + } + }, + "services": { + "service_container": "Symfony\\Component\\DependencyInjection\\ContainerBuilder" + } +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md index d6caefabea..196757b13b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md @@ -4,23 +4,31 @@ Public services Definitions ----------- -**`definition_1`:** +definition_1 +~~~~~~~~~~~~ + - Class: `Full\Qualified\Class1` - Scope: `container` - Public: yes - Synthetic: no + Aliases ------- -**`alias_1`:** +alias_1 +~~~~~~~ + - Service: `service_1` - Public: yes -**`alias_2`:** +alias_2 +~~~~~~~ + - Service: `service_2` - Public: no + Services -------- diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt index a5de9506f0..58380fdf4d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt @@ -1,9 +1,6 @@ [container] Public services -+-------------------+-----------+--------------------------------------------------------+ -| Service ID | Scope | Class name | -+-------------------+-----------+--------------------------------------------------------+ -| alias_1 | n/a | alias for "service_1" | -| alias_2 | n/a | alias for "service_2" | -| definition_1 | container | Full\Qualified\Class1 | -| service_container | | Symfony\Component\DependencyInjection\ContainerBuilder | -+-------------------+-----------+--------------------------------------------------------+ + Service ID Scope Class name + alias_1 n/a alias for "service_1" + alias_2 n/a alias for "service_2" + definition_1 container Full\Qualified\Class1 + service_container Symfony\Component\DependencyInjection\ContainerBuilder diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json index dd5d577cf0..6dd5929838 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json @@ -1 +1,55 @@ -{"definitions":{"definition_1":{"class":"Full\\Qualified\\Class1","scope":"container","public":true,"synthetic":false,"file":null,"tags":[]},"definition_2":{"class":"Full\\Qualified\\Class2","scope":"container","public":false,"synthetic":true,"file":"\/path\/to\/file","tags":[{"name":"tag1","parameters":{"attr1":"val1","attr2":"val2"}},{"name":"tag1","parameters":{"attr3":"val3"}},{"name":"tag2","parameters":[]}]}},"aliases":{"alias_1":{"service":"service_1","public":true},"alias_2":{"service":"service_2","public":false}},"services":{"service_container":"Symfony\\Component\\DependencyInjection\\ContainerBuilder"}} +{ + "definitions": { + "definition_1": { + "class": "Full\\Qualified\\Class1", + "scope": "container", + "public": true, + "synthetic": false, + "file": null, + "tags": [ + + ] + }, + "definition_2": { + "class": "Full\\Qualified\\Class2", + "scope": "container", + "public": false, + "synthetic": true, + "file": "\/path\/to\/file", + "tags": [ + { + "name": "tag1", + "parameters": { + "attr1": "val1", + "attr2": "val2" + } + }, + { + "name": "tag1", + "parameters": { + "attr3": "val3" + } + }, + { + "name": "tag2", + "parameters": [ + + ] + } + ] + } + }, + "aliases": { + "alias_1": { + "service": "service_1", + "public": true + }, + "alias_2": { + "service": "service_2", + "public": false + } + }, + "services": { + "service_container": "Symfony\\Component\\DependencyInjection\\ContainerBuilder" + } +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md index b31db8fb64..33cb0a93a7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md @@ -4,13 +4,17 @@ Public and private services Definitions ----------- -**`definition_1`:** +definition_1 +~~~~~~~~~~~~ + - Class: `Full\Qualified\Class1` - Scope: `container` - Public: yes - Synthetic: no -**`definition_2`:** +definition_2 +~~~~~~~~~~~~ + - Class: `Full\Qualified\Class2` - Scope: `container` - Public: no @@ -23,17 +27,23 @@ Definitions - Attr3: val3 - Tag: `tag2` + Aliases ------- -**`alias_1`:** +alias_1 +~~~~~~~ + - Service: `service_1` - Public: yes -**`alias_2`:** +alias_2 +~~~~~~~ + - Service: `service_2` - Public: no + Services -------- diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt index c6c1b4f9d7..98a1f27aeb 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt @@ -1,10 +1,8 @@ [container] Public and private services -+-------------------+-----------+--------------------------------------------------------+ -| Service ID | Scope | Class name | -+-------------------+-----------+--------------------------------------------------------+ -| alias_1 | n/a | alias for "service_1" | -| alias_2 | n/a | alias for "service_2" | -| definition_1 | container | Full\Qualified\Class1 | -| definition_2 | container | Full\Qualified\Class2 | -| service_container | | Symfony\Component\DependencyInjection\ContainerBuilder | -+-------------------+-----------+--------------------------------------------------------+ + Service ID Scope Class name + alias_1 n/a alias for "service_1" + alias_2 n/a alias for "service_2" + definition_1 container Full\Qualified\Class1 + definition_2 container Full\Qualified\Class2 + service_container Symfony\Component\DependencyInjection\ContainerBuilder + \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json index c1d40540b1..d9a351b90b 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json @@ -1 +1,38 @@ -{"definitions":{"definition_2":{"class":"Full\\Qualified\\Class2","scope":"container","public":false,"synthetic":true,"file":"\/path\/to\/file","tags":[{"name":"tag1","parameters":{"attr1":"val1","attr2":"val2"}},{"name":"tag1","parameters":{"attr3":"val3"}},{"name":"tag2","parameters":[]}]}},"aliases":[],"services":[]} +{ + "definitions": { + "definition_2": { + "class": "Full\\Qualified\\Class2", + "scope": "container", + "public": false, + "synthetic": true, + "file": "\/path\/to\/file", + "tags": [ + { + "name": "tag1", + "parameters": { + "attr1": "val1", + "attr2": "val2" + } + }, + { + "name": "tag1", + "parameters": { + "attr3": "val3" + } + }, + { + "name": "tag2", + "parameters": [ + + ] + } + ] + } + }, + "aliases": [ + + ], + "services": [ + + ] +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md index bf7c7fac37..2b32f9e843 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.md @@ -4,7 +4,9 @@ Public and private services with tag `tag1` Definitions ----------- -**`definition_2`:** +definition_2 +~~~~~~~~~~~~ + - Class: `Full\Qualified\Class2` - Scope: `container` - Public: no diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt index 368ece8834..f2d6135b0a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt @@ -1,7 +1,4 @@ [container] Public and private services with tag tag1 -+--------------+-------+-------+-------+-----------+-----------------------+ -| Service ID | attr1 | attr2 | attr3 | Scope | Class name | -+--------------+-------+-------+-------+-----------+-----------------------+ -| definition_2 | val1 | val2 | | container | Full\Qualified\Class2 | -| " | | | val3 | | | -+--------------+-------+-------+-------+-----------+-----------------------+ + Service ID attr1 attr2 attr3 Scope Class name + definition_2 val1 val2 container Full\Qualified\Class2 + " val3 diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json index bcff44f9cc..e0a3c0f31c 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json @@ -1 +1,20 @@ -{"tag1":[{"class":"Full\\Qualified\\Class2","scope":"container","public":false,"synthetic":true,"file":"\/path\/to\/file"}],"tag2":[{"class":"Full\\Qualified\\Class2","scope":"container","public":false,"synthetic":true,"file":"\/path\/to\/file"}]} +{ + "tag1": [ + { + "class": "Full\\Qualified\\Class2", + "scope": "container", + "public": false, + "synthetic": true, + "file": "\/path\/to\/file" + } + ], + "tag2": [ + { + "class": "Full\\Qualified\\Class2", + "scope": "container", + "public": false, + "synthetic": true, + "file": "\/path\/to\/file" + } + ] +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md index e6fa387ef6..b69cf69ac7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.md @@ -4,17 +4,22 @@ Container tags tag1 ---- -**`definition_2`:** +definition_2 +~~~~~~~~~~~~ + - Class: `Full\Qualified\Class2` - Scope: `container` - Public: no - Synthetic: yes - File: `/path/to/file` + tag2 ---- -**`definition_2`:** +definition_2 +~~~~~~~~~~~~ + - Class: `Full\Qualified\Class2` - Scope: `container` - Public: no diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json index 902b02f8c9..00a553ce23 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json @@ -1 +1,10 @@ -{"class":"Full\\Qualified\\Class1","scope":"container","public":true,"synthetic":false,"file":null,"tags":[]} +{ + "class": "Full\\Qualified\\Class1", + "scope": "container", + "public": true, + "synthetic": false, + "file": null, + "tags": [ + + ] +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json index 5acb29e418..d31f146a6a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json @@ -1 +1,28 @@ -{"class":"Full\\Qualified\\Class2","scope":"container","public":false,"synthetic":true,"file":"\/path\/to\/file","tags":[{"name":"tag1","parameters":{"attr1":"val1","attr2":"val2"}},{"name":"tag1","parameters":{"attr3":"val3"}},{"name":"tag2","parameters":[]}]} +{ + "class": "Full\\Qualified\\Class2", + "scope": "container", + "public": false, + "synthetic": true, + "file": "\/path\/to\/file", + "tags": [ + { + "name": "tag1", + "parameters": { + "attr1": "val1", + "attr2": "val2" + } + }, + { + "name": "tag1", + "parameters": { + "attr3": "val3" + } + }, + { + "name": "tag2", + "parameters": [ + + ] + } + ] +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.json index 89a5a820ad..686cbc9e52 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.json @@ -1 +1,10 @@ -{"array":[12,"Hello world!",true],"boolean":true,"integer":12,"string":"Hello world!"} +{ + "array": [ + 12, + "Hello world!", + true + ], + "boolean": true, + "integer": 12, + "string": "Hello world!" +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt index 7d32e7764c..1c9a2739ca 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt @@ -1,9 +1,7 @@ [container] List of parameters -+-----------+--------------------------+ -| Parameter | Value | -+-----------+--------------------------+ -| array | [12,"Hello world!",true] | -| boolean | true | -| integer | 12 | -| string | Hello world! | -+-----------+--------------------------+ + Parameter Value + array [12,"Hello world!",true] + boolean true + integer 12 + string Hello world! + \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json index 90de86589b..7da10ed861 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.json @@ -1 +1,19 @@ -{"path":"\/hello\/{name}","host":"localhost","scheme":"http|https","method":"GET|HEAD","class":"Symfony\\Component\\Routing\\Route","defaults":{"name":"Joseph"},"requirements":{"name":"[a-z]+"},"options":{"compiler_class":"Symfony\\Component\\Routing\\RouteCompiler","opt1":"val1","opt2":"val2"},"pathRegex":"#^\/hello(?:\/(?P[a-z]+))?$#s"} \ No newline at end of file +{ + "path": "\/hello\/{name}", + "host": "localhost", + "scheme": "http|https", + "method": "GET|HEAD", + "class": "Symfony\\Component\\Routing\\Route", + "defaults": { + "name": "Joseph" + }, + "requirements": { + "name": "[a-z]+" + }, + "options": { + "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler", + "opt1": "val1", + "opt2": "val2" + }, + "pathRegex": "#^\/hello(?:\/(?P[a-z]+))?$#s" +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json index 3734787bc5..276f8ca42a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.json @@ -1 +1,17 @@ -{"path":"\/name\/add","host":"localhost","scheme":"http|https","method":"PUT|POST","class":"Symfony\\Component\\Routing\\Route","defaults":[],"requirements":"NO CUSTOM","options":{"compiler_class":"Symfony\\Component\\Routing\\RouteCompiler","opt1":"val1","opt2":"val2"},"pathRegex":"#^\/name\/add$#s"} \ No newline at end of file +{ + "path": "\/name\/add", + "host": "localhost", + "scheme": "http|https", + "method": "PUT|POST", + "class": "Symfony\\Component\\Routing\\Route", + "defaults": [ + + ], + "requirements": "NO CUSTOM", + "options": { + "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler", + "opt1": "val1", + "opt2": "val2" + }, + "pathRegex": "#^\/name\/add$#s" +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json index 1e56513381..0cd1610f20 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.json @@ -1 +1,38 @@ -{"route_1":{"path":"\/hello\/{name}","host":"localhost","scheme":"http|https","method":"GET|HEAD","class":"Symfony\\Component\\Routing\\Route","defaults":{"name":"Joseph"},"requirements":{"name":"[a-z]+"},"options":{"compiler_class":"Symfony\\Component\\Routing\\RouteCompiler","opt1":"val1","opt2":"val2"},"pathRegex":"#^\/hello(?:\/(?P[a-z]+))?$#s"},"route_2":{"path":"\/name\/add","host":"localhost","scheme":"http|https","method":"PUT|POST","class":"Symfony\\Component\\Routing\\Route","defaults":[],"requirements":"NO CUSTOM","options":{"compiler_class":"Symfony\\Component\\Routing\\RouteCompiler","opt1":"val1","opt2":"val2"},"pathRegex":"#^\/name\/add$#s"}} \ No newline at end of file +{ + "route_1": { + "path": "\/hello\/{name}", + "host": "localhost", + "scheme": "http|https", + "method": "GET|HEAD", + "class": "Symfony\\Component\\Routing\\Route", + "defaults": { + "name": "Joseph" + }, + "requirements": { + "name": "[a-z]+" + }, + "options": { + "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler", + "opt1": "val1", + "opt2": "val2" + }, + "pathRegex": "#^\/hello(?:\/(?P[a-z]+))?$#s" + }, + "route_2": { + "path": "\/name\/add", + "host": "localhost", + "scheme": "http|https", + "method": "PUT|POST", + "class": "Symfony\\Component\\Routing\\Route", + "defaults": [ + + ], + "requirements": "NO CUSTOM", + "options": { + "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler", + "opt1": "val1", + "opt2": "val2" + }, + "pathRegex": "#^\/name\/add$#s" + } +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md index 98889a0ab9..a148c23210 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md @@ -1,5 +1,6 @@ route_1 ------- + - Path: /hello/{name} - Host: localhost - Scheme: http|https @@ -10,12 +11,14 @@ route_1 - Requirements: - `name`: [a-z]+ + route_2 ------- + - Path: /name/add - Host: localhost - Scheme: http|https - Method: PUT|POST - Class: Symfony\Component\Routing\Route - Defaults: NONE -- Requirements: NONE \ No newline at end of file +- Requirements: NONE diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt index c9f99bbff4..e0ade43e2a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt @@ -1,7 +1,5 @@ [router] Current routes -+---------+----------+------------+-----------+---------------+ -| Name | Method | Scheme | Host | Path | -+---------+----------+------------+-----------+---------------+ -| route_1 | GET|HEAD | http|https | localhost | /hello/{name} | -| route_2 | PUT|POST | http|https | localhost | /name/add | -+---------+----------+------------+-----------+---------------+ + Name Method Scheme Host Path + route_1 GET|HEAD http|https localhost /hello/{name} + route_2 PUT|POST http|https localhost /name/add + \ No newline at end of file