diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php index 54fb8db8c6bee..41e327cf1f930 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php @@ -27,7 +27,7 @@ public function testDebugAllRoutes() $ret = $tester->execute(array('name' => null), array('decorated' => false)); $this->assertEquals(0, $ret, 'Returns 0 in case of success'); - $this->assertContains('Name Method Scheme Host Path', $tester->getDisplay()); + $this->assertContains('Name │ Method │ Scheme │ Host │ Path', $tester->getDisplay()); } public function testDebugSingleRoute() diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_1.txt index 011ae42095b72..269123661d275 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_1.txt @@ -3,19 +3,19 @@ Information for Service "service_1" =================================== - ---------------- ----------------------------- -  Option   Value  - ---------------- ----------------------------- - Service ID service_1 - Class Full\Qualified\Class1 - Tags - - Public yes - Synthetic no - Lazy yes - Shared yes - Abstract yes - Autowired no - Autoconfigured no - Factory Class Full\Qualified\FactoryClass - Factory Method get - ---------------- ----------------------------- +┌────────────────┬─────────────────────────────┐ +│ Option │ Value │ +├────────────────┼─────────────────────────────┤ +│ Service ID │ service_1 │ +│ Class │ Full\Qualified\Class1 │ +│ Tags │ - │ +│ Public │ yes │ +│ Synthetic │ no │ +│ Lazy │ yes │ +│ Shared │ yes │ +│ Abstract │ yes │ +│ Autowired │ no │ +│ Autoconfigured │ no │ +│ Factory Class │ Full\Qualified\FactoryClass │ +│ Factory Method │ get │ +└────────────────┴─────────────────────────────┘ \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt index 735fe0130d1e1..99aef5bba8912 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_with_definition_2.txt @@ -3,23 +3,23 @@ Information for Service "service_2" =================================== - ----------------- --------------------------------- -  Option   Value  - ----------------- --------------------------------- - Service ID service_2 - Class Full\Qualified\Class2 - Tags tag1 (attr1: val1, attr2: val2)  - tag1 (attr3: val3)  - tag2 - Calls setMailer - Public no - Synthetic yes - Lazy no - Shared yes - Abstract no - Autowired no - Autoconfigured no - Required File /path/to/file - Factory Service factory.service - Factory Method get - ----------------- --------------------------------- +┌─────────────────┬─────────────────────────────────┐ +│ Option │ Value │ +├─────────────────┼─────────────────────────────────┤ +│ Service ID │ service_2 │ +│ Class │ Full\Qualified\Class2 │ +│ Tags │ tag1 (attr1: val1, attr2: val2) │ +│ │ tag1 (attr3: val3) │ +│ │ tag2 │ +│ Calls │ setMailer │ +│ Public │ no │ +│ Synthetic │ yes │ +│ Lazy │ no │ +│ Shared │ yes │ +│ Abstract │ no │ +│ Autowired │ no │ +│ Autoconfigured │ no │ +│ Required File │ /path/to/file │ +│ Factory Service │ factory.service │ +│ Factory Method │ get │ +└─────────────────┴─────────────────────────────────┘ \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt index 903717b620cff..d50e62400d0da 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt @@ -1,5 +1,5 @@ - --------------------- ----------------------------------------------------------------- -  Parameter   Value  - --------------------- ----------------------------------------------------------------- - twig.form.resources ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo... - --------------------- ----------------------------------------------------------------- +┌─────────────────────┬─────────────────────────────────────────────────────────────────┐ +│ Parameter │ Value │ +├─────────────────────┼─────────────────────────────────────────────────────────────────┤ +│ twig.form.resources │ ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo... │ +└─────────────────────┴─────────────────────────────────────────────────────────────────┘ \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt index 87f6b2125d764..c8db0bec6e405 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_arguments.txt @@ -2,11 +2,11 @@ Symfony Container Public Services ================================= - ------------------- -------------------------------------------------------- -  Service ID   Class name  - ------------------- -------------------------------------------------------- - alias_1 alias for "service_1" - definition_1 Full\Qualified\Class1 - service_container Symfony\Component\DependencyInjection\ContainerBuilder - ------------------- -------------------------------------------------------- +┌───────────────────┬────────────────────────────────────────────────────────┐ +│ Service ID │ Class name │ +├───────────────────┼────────────────────────────────────────────────────────┤ +│ alias_1 │ alias for "service_1" │ +│ definition_1 │ Full\Qualified\Class1 │ +│ service_container │ Symfony\Component\DependencyInjection\ContainerBuilder │ +└───────────────────┴────────────────────────────────────────────────────────┘ 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 87f6b2125d764..c2ada7fb35886 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 @@ -2,11 +2,11 @@ Symfony Container Public Services ================================= - ------------------- -------------------------------------------------------- -  Service ID   Class name  - ------------------- -------------------------------------------------------- - alias_1 alias for "service_1" - definition_1 Full\Qualified\Class1 - service_container Symfony\Component\DependencyInjection\ContainerBuilder - ------------------- -------------------------------------------------------- +┌───────────────────┬────────────────────────────────────────────────────────┐ +│ Service ID │ Class name │ +├───────────────────┼────────────────────────────────────────────────────────┤ +│ alias_1 │ alias for "service_1" │ +│ definition_1 │ Full\Qualified\Class1 │ +│ service_container │ Symfony\Component\DependencyInjection\ContainerBuilder │ +└───────────────────┴────────────────────────────────────────────────────────┘ 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 e23ea6d81f5ad..c7c69f7c1e4b9 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 @@ -2,13 +2,13 @@ Symfony Container Public and Private Services ============================================= - ------------------- -------------------------------------------------------- -  Service ID   Class name  - ------------------- -------------------------------------------------------- - alias_1 alias for "service_1" - alias_2 alias for "service_2" - definition_1 Full\Qualified\Class1 - definition_2 Full\Qualified\Class2 - service_container Symfony\Component\DependencyInjection\ContainerBuilder - ------------------- -------------------------------------------------------- +┌───────────────────┬────────────────────────────────────────────────────────┐ +│ Service ID │ Class name │ +├───────────────────┼────────────────────────────────────────────────────────┤ +│ alias_1 │ alias for "service_1" │ +│ alias_2 │ alias for "service_2" │ +│ definition_1 │ Full\Qualified\Class1 │ +│ definition_2 │ Full\Qualified\Class2 │ +│ service_container │ Symfony\Component\DependencyInjection\ContainerBuilder │ +└───────────────────┴────────────────────────────────────────────────────────┘ 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 b8b393266acda..f345e5b58262e 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 @@ -2,10 +2,10 @@ Symfony Container Public and Private Services Tagged with "tag1" Tag ==================================================================== - -------------- ------- ------- ------- ----------------------- -  Service ID   attr1   attr2   attr3   Class name  - -------------- ------- ------- ------- ----------------------- - definition_2 val1 val2 Full\Qualified\Class2 - " val3 - -------------- ------- ------- ------- ----------------------- +┌──────────────┬───────┬───────┬───────┬───────────────────────┐ +│ Service ID │ attr1 │ attr2 │ attr3 │ Class name │ +├──────────────┼───────┼───────┼───────┼───────────────────────┤ +│ definition_2 │ val1 │ val2 │ │ Full\Qualified\Class2 │ +│ " │ │ │ val3 │ │ +└──────────────┴───────┴───────┴───────┴───────────────────────┘ diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt index 88cf4cd553aef..5a2a82bf673c6 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt @@ -1,17 +1,16 @@ - ---------------- ----------------------------- -  Option   Value  - ---------------- ----------------------------- - Service ID - - Class Full\Qualified\Class1 - Tags - - Public yes - Synthetic no - Lazy yes - Shared yes - Abstract yes - Autowired no - Autoconfigured no - Factory Class Full\Qualified\FactoryClass - Factory Method get - ---------------- ----------------------------- - +┌────────────────┬─────────────────────────────┐ +│ Option │ Value │ +├────────────────┼─────────────────────────────┤ +│ Service ID │ - │ +│ Class │ Full\Qualified\Class1 │ +│ Tags │ - │ +│ Public │ yes │ +│ Synthetic │ no │ +│ Lazy │ yes │ +│ Shared │ yes │ +│ Abstract │ yes │ +│ Autowired │ no │ +│ Autoconfigured │ no │ +│ Factory Class │ Full\Qualified\FactoryClass │ +│ Factory Method │ get │ +└────────────────┴─────────────────────────────┘ \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt index 2d5b03794ea80..8988e2bee1377 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt @@ -1,21 +1,20 @@ - ----------------- --------------------------------- -  Option   Value  - ----------------- --------------------------------- - Service ID - - Class Full\Qualified\Class2 - Tags tag1 (attr1: val1, attr2: val2)  - tag1 (attr3: val3)  - tag2 - Calls setMailer - Public no - Synthetic yes - Lazy no - Shared yes - Abstract no - Autowired no - Autoconfigured no - Required File /path/to/file - Factory Service factory.service - Factory Method get - ----------------- --------------------------------- - +┌─────────────────┬─────────────────────────────────┐ +│ Option │ Value │ +├─────────────────┼─────────────────────────────────┤ +│ Service ID │ - │ +│ Class │ Full\Qualified\Class2 │ +│ Tags │ tag1 (attr1: val1, attr2: val2) │ +│ │ tag1 (attr3: val3) │ +│ │ tag2 │ +│ Calls │ setMailer │ +│ Public │ no │ +│ Synthetic │ yes │ +│ Lazy │ no │ +│ Shared │ yes │ +│ Abstract │ no │ +│ Autowired │ no │ +│ Autoconfigured │ no │ +│ Required File │ /path/to/file │ +│ Factory Service │ factory.service │ +│ Factory Method │ get │ +└─────────────────┴─────────────────────────────────┘ \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt index 989f96ee1369f..fb5e2c703aba5 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_1.txt @@ -1,22 +1,21 @@ - ---------------- ----------------------------- -  Option   Value  - ---------------- ----------------------------- - Service ID - - Class Full\Qualified\Class1 - Tags - - Public yes - Synthetic no - Lazy yes - Shared yes - Abstract yes - Autowired no - Autoconfigured no - Factory Class Full\Qualified\FactoryClass - Factory Method get - Arguments Service(definition2)  - %parameter%  - Inlined Service  - Array (3 element(s))  - Iterator (2 element(s)) - ---------------- ----------------------------- - +┌────────────────┬─────────────────────────────┐ +│ Option │ Value │ +├────────────────┼─────────────────────────────┤ +│ Service ID │ - │ +│ Class │ Full\Qualified\Class1 │ +│ Tags │ - │ +│ Public │ yes │ +│ Synthetic │ no │ +│ Lazy │ yes │ +│ Shared │ yes │ +│ Abstract │ yes │ +│ Autowired │ no │ +│ Autoconfigured │ no │ +│ Factory Class │ Full\Qualified\FactoryClass │ +│ Factory Method │ get │ +│ Arguments │ Service(definition2) │ +│ │ %parameter% │ +│ │ Inlined Service │ +│ │ Array (3 element(s)) │ +│ │ Iterator (2 element(s)) │ +└────────────────┴─────────────────────────────┘ \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt index 2d5b03794ea80..8988e2bee1377 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_arguments_2.txt @@ -1,21 +1,20 @@ - ----------------- --------------------------------- -  Option   Value  - ----------------- --------------------------------- - Service ID - - Class Full\Qualified\Class2 - Tags tag1 (attr1: val1, attr2: val2)  - tag1 (attr3: val3)  - tag2 - Calls setMailer - Public no - Synthetic yes - Lazy no - Shared yes - Abstract no - Autowired no - Autoconfigured no - Required File /path/to/file - Factory Service factory.service - Factory Method get - ----------------- --------------------------------- - +┌─────────────────┬─────────────────────────────────┐ +│ Option │ Value │ +├─────────────────┼─────────────────────────────────┤ +│ Service ID │ - │ +│ Class │ Full\Qualified\Class2 │ +│ Tags │ tag1 (attr1: val1, attr2: val2) │ +│ │ tag1 (attr3: val3) │ +│ │ tag2 │ +│ Calls │ setMailer │ +│ Public │ no │ +│ Synthetic │ yes │ +│ Lazy │ no │ +│ Shared │ yes │ +│ Abstract │ no │ +│ Autowired │ no │ +│ Autoconfigured │ no │ +│ Required File │ /path/to/file │ +│ Factory Service │ factory.service │ +│ Factory Method │ get │ +└─────────────────┴─────────────────────────────────┘ \ No newline at end of file diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt index 99c7cba66f343..bec34a0fe6c2f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt @@ -2,10 +2,10 @@ Registered Listeners for "event1" Event ======================================= - ------- ------------------- ---------- -  Order   Callable   Priority  - ------- ------------------- ---------- - #1 global_function() 255 - #2 \Closure() -1 - ------- ------------------- ---------- +┌───────┬───────────────────┬──────────┐ +│ Order │ Callable │ Priority │ +├───────┼───────────────────┼──────────┤ +│ #1 │ global_function() │ 255 │ +│ #2 │ \Closure() │ -1 │ +└───────┴───────────────────┴──────────┘ diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt index 687323e9ed8fb..be6496be10067 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt @@ -5,19 +5,18 @@ "event1" event -------------- - ------- ------------------- ---------- -  Order   Callable   Priority  - ------- ------------------- ---------- - #1 global_function() 255 - #2 \Closure() -1 - ------- ------------------- ---------- +┌───────┬───────────────────┬──────────┐ +│ Order │ Callable │ Priority │ +├───────┼───────────────────┼──────────┤ +│ #1 │ global_function() │ 255 │ +│ #2 │ \Closure() │ -1 │ +└───────┴───────────────────┴──────────┘ "event2" event -------------- - ------- ----------------------------------------------------------------------------------- ---------- -  Order   Callable   Priority  - ------- ----------------------------------------------------------------------------------- ---------- - #1 Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke() 0 - ------- ----------------------------------------------------------------------------------- ---------- - +┌───────┬───────────────────────────────────────────────────────────────────────────────────┬──────────┐ +│ Order │ Callable │ Priority │ +├───────┼───────────────────────────────────────────────────────────────────────────────────┼──────────┤ +│ #1 │ Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke() │ 0 │ +└───────┴───────────────────────────────────────────────────────────────────────────────────┴──────────┘ diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt index a3d4404f4a88f..54d197a368f47 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt @@ -1,6 +1,5 @@ - --------------- --------- -  Parameter   Value  - --------------- --------- - database_name symfony - --------------- --------- - +┌───────────────┬─────────┐ +│ Parameter │ Value │ +├───────────────┼─────────┤ +│ database_name │ symfony │ +└───────────────┴─────────┘ \ No newline at end of file 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 f5b8f1b2275d1..1505d7d54d144 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt @@ -2,12 +2,12 @@ Symfony Container 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! │ +└───────────┴──────────────────────────┘ 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 9d06562328908..e377ac0db6abe 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,6 @@ - --------- ---------- ------------ ----------- --------------- -  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 diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php index 629ff18a0cb6f..2170e4de2f7ae 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/UserPasswordEncoderCommandTest.php @@ -120,7 +120,7 @@ public function testEncodePasswordOutput() ); $this->assertContains('Password encoding succeeded', $this->passwordEncoderCommandTester->getDisplay()); - $this->assertContains(' Encoded password p@ssw0rd', $this->passwordEncoderCommandTester->getDisplay()); + $this->assertContains(' Encoded password │ p@ssw0rd', $this->passwordEncoderCommandTester->getDisplay()); $this->assertContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay()); } @@ -136,7 +136,7 @@ public function testEncodePasswordEmptySaltOutput() ); $this->assertContains('Password encoding succeeded', $this->passwordEncoderCommandTester->getDisplay()); - $this->assertContains(' Encoded password p@ssw0rd', $this->passwordEncoderCommandTester->getDisplay()); + $this->assertContains(' Encoded password │ p@ssw0rd', $this->passwordEncoderCommandTester->getDisplay()); $this->assertNotContains(' Generated salt ', $this->passwordEncoderCommandTester->getDisplay()); } @@ -208,7 +208,7 @@ public function testNonInteractiveEncodePasswordUsesFirstUserClass() 'password' => 'password', ), array('interactive' => false)); - $this->assertContains('Encoder used Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder', $this->passwordEncoderCommandTester->getDisplay()); + $this->assertContains('Encoder used │ Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder', $this->passwordEncoderCommandTester->getDisplay()); } /** diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/emptysalt.txt b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/emptysalt.txt index 9c8d3deb1b462..2b4d10d3904c5 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/emptysalt.txt +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/PasswordEncode/emptysalt.txt @@ -2,12 +2,12 @@ Symfony Password Encoder Utility ================================ - ------------------ ------------------------------------------------------------------ - Key Value - ------------------ ------------------------------------------------------------------ - Encoder used Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder - Encoded password password - ------------------ ------------------------------------------------------------------ +┌──────────────────┬──────────────────────────────────────────────────────────────────┐ +│ Key │ Value │ +├──────────────────┼──────────────────────────────────────────────────────────────────┤ +│ Encoder used │ Symfony\Component\Security\Core\Encoder\PlaintextPasswordEncoder │ +│ Encoded password │ password │ +└──────────────────┴──────────────────────────────────────────────────────────────────┘ [OK] Password encoding succeeded diff --git a/src/Symfony/Component/Console/Helper/Table.php b/src/Symfony/Component/Console/Helper/Table.php index 60a2d4cbc5c59..2b88ab5353ff3 100644 --- a/src/Symfony/Component/Console/Helper/Table.php +++ b/src/Symfony/Component/Console/Helper/Table.php @@ -130,6 +130,10 @@ public static function getStyleDefinition($name) */ public function setStyle($name) { + if ('symfony-style-guide' === $name) { + @trigger_error(sprintf('Style symfony-style-guide is deprecated since Symfony 4.1.', __METHOD__), E_USER_DEPRECATED); + } + $this->style = $this->resolveStyle($name); return $this; @@ -672,7 +676,7 @@ private static function initStyles() 'default' => new TableStyle(), 'borderless' => $borderless, 'compact' => $compact, - 'symfony-style-guide' => $styleGuide, + 'symfony-style-guide' => $styleGuide, // deprecated 'box' => $box, ); } diff --git a/src/Symfony/Component/Console/Style/SymfonyStyle.php b/src/Symfony/Component/Console/Style/SymfonyStyle.php index 311d0675b552e..69f363aefa4c7 100644 --- a/src/Symfony/Component/Console/Style/SymfonyStyle.php +++ b/src/Symfony/Component/Console/Style/SymfonyStyle.php @@ -178,7 +178,7 @@ public function caution($message) */ public function table(array $headers, array $rows) { - $style = clone Table::getStyleDefinition('symfony-style-guide'); + $style = clone Table::getStyleDefinition('box'); $style->setCellHeaderFormat('%s'); $table = new Table($this); diff --git a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt index 005b846eae491..45ff63e49e83a 100644 --- a/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt +++ b/src/Symfony/Component/Console/Tests/Fixtures/Style/SymfonyStyle/output/output_8.txt @@ -1,9 +1,9 @@ - ---------------- --------------- --------------------- - Main table title - ---------------- --------------- --------------------- - ISBN Title Author - ---------------- --------------- --------------------- - 978-0521567817 De Monarchia Dante Alighieri - 978-0804169127 Divine Comedy spans multiple rows - ---------------- --------------- --------------------- +┌────────────────┬───────────────┬─────────────────────┐ +│ Main table title │ +┌────────────────┬───────────────┬─────────────────────┐ +│ ISBN │ Title │ Author │ +├────────────────┼───────────────┼─────────────────────┤ +│ 978-0521567817 │ De Monarchia │ Dante Alighieri │ +│ 978-0804169127 │ Divine Comedy │ spans multiple rows │ +└────────────────┴───────────────┴─────────────────────┘ diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt index c622057cdbdfd..396fb5461e8e7 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/default_option_with_normalizer.txt @@ -2,23 +2,22 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (choice_translation_domain) ================================================================================= - ---------------- --------------------%s - Required false %s - ---------------- --------------------%s - Default true %s - ---------------- --------------------%s - Allowed types [ %s - "null", %s - "bool", %s - "string" %s - ] %s - ---------------- --------------------%s - Allowed values - %s - ---------------- --------------------%s - Normalizer Closure { %s - parameters: 2 %s - file: "%s%eExtension%eCore%eType%eChoiceType.php" - line: "%s to %s" %s - } %s - ---------------- --------------------%s - +├────────────────┼────────────────────%s +│ Required │ false %s +├────────────────┼────────────────────%s +│ Default │ true %s +├────────────────┼────────────────────%s +│ Allowed types │ [ %s +│ │ "null", %s +│ │ "bool", %s +│ │ "string" %s +│ │ ] %s +├────────────────┼────────────────────%s +│ Allowed values │ - %s +├────────────────┼────────────────────%s +│ Normalizer │ Closure { %s +│ │ parameters: 2 %s +│ │ file: "%s%eExtension%eCore%eType%eChoiceType.php"%s +│ │ line: "%s to %s" %s +│ │ } %s +└────────────────┴────────────────────%s diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt index 231d1319bbeff..c11d3f24e3513 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/overridden_option_with_default_closures.txt @@ -2,28 +2,27 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (empty_data) ==================================================================== - ---------------- ----------------------%s - Required false %s - ---------------- ----------------------%s - Default Value: null %s - %s - Closure(s): [ %s - Closure { %s - parameters: 1 %s - file: "%s%eExtension%eCore%eType%eFormType.php" - line: "%s to %s" %s - }, %s - Closure { %s - parameters: 2 %s - file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php" - line: "%s to %s" %s - } %s - ] %s - ---------------- ----------------------%s - Allowed types - %s - ---------------- ----------------------%s - Allowed values - %s - ---------------- ----------------------%s - Normalizer - %s - ---------------- ----------------------%s - +├────────────────┼──────────────────────%s +│ Required │ false %s +├────────────────┼──────────────────────%s +│ Default │ Value: null %s +│ │ %s +│ │ Closure(s): [ %s +│ │ Closure { %s +│ │ parameters: 1 %s +│ │ file: "%s%eExtension%eCore%eType%eFormType.php" %s +│ │ line: "%s to %s" %s +│ │ }, %s +│ │ Closure { %s +│ │ parameters: 2 %s +│ │ file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php" %s +│ │ line: "%s to %s" %s +│ │ } %s +│ │ ] %s +├────────────────┼──────────────────────%s +│ Allowed types │ - %s +├────────────────┼──────────────────────%s +│ Allowed values │ - %s +├────────────────┼──────────────────────%s +│ Normalizer │ - %s +└────────────────┴──────────────────────%s \ No newline at end of file diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt index da3e6c82d8b1a..c3ea5a3e276de 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/required_option_with_allowed_values.txt @@ -2,24 +2,23 @@ Symfony\Component\Form\Tests\Console\Descriptor\FooType (foo) ============================================================= - ---------------- --------------------%s - Required true %s - ---------------- --------------------%s - Default - %s - ---------------- --------------------%s - Allowed types [ %s - "string" %s - ] %s - ---------------- --------------------%s - Allowed values [ %s - "bar", %s - "baz" %s - ] %s - ---------------- --------------------%s - Normalizer Closure { %s - parameters: 2 %s - file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php" - line: "%s to %s" %s - } %s - ---------------- --------------------%s - +├────────────────┼────────────────────%s +│ Required │ true %s +├────────────────┼────────────────────%s +│ Default │ - %s +├────────────────┼────────────────────%s +│ Allowed types │ [ %s +│ │ "string" %s +│ │ ] %s +├────────────────┼────────────────────%s +│ Allowed values │ [ %s +│ │ "bar", %s +│ │ "baz" %s +│ │ ] %s +├────────────────┼────────────────────%s +│ Normalizer │ Closure { %s +│ │ parameters: 2 %s +│ │ file: "%s%eTests%eConsole%eDescriptor%eAbstractDescriptorTest.php" %s +│ │ line: "%s to %s" %s +│ │ } %s +└────────────────┴────────────────────%s \ No newline at end of file diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt index 6d698a6171f15..af1835d0f66ab 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_1.txt @@ -2,31 +2,31 @@ Symfony\Component\Form\Extension\Core\Type\ChoiceType (Block prefix: "choice") ============================================================================== - --------------------------- -------------------- ------------------------- ----------------------- - Options Overridden options Parent options Extension options - --------------------------- -------------------- ------------------------- ----------------------- - choice_attr FormType FormType FormTypeCsrfExtension - choice_label -------------------- ------------------------- ----------------------- - choice_loader compound action csrf_field_name - choice_name data_class attr csrf_message - choice_translation_domain empty_data auto_initialize csrf_protection - choice_value error_bubbling block_name csrf_token_id - choices by_reference csrf_token_manager - expanded data - group_by disabled - multiple inherit_data - placeholder label - preferred_choices label_attr - label_format - mapped - method - post_max_size_message - property_path - required - translation_domain - trim - upload_max_size_message - --------------------------- -------------------- ------------------------- ----------------------- +┌───────────────────────────┬────────────────────┬─────────────────────────┬───────────────────────┐ +│ Options │ Overridden options │ Parent options │ Extension options │ +├───────────────────────────┼────────────────────┼─────────────────────────┼───────────────────────┤ +│ choice_attr │ FormType │ FormType │ FormTypeCsrfExtension │ +│ choice_label │────────────────────│─────────────────────────│───────────────────────│ +│ choice_loader │ compound │ action │ csrf_field_name │ +│ choice_name │ data_class │ attr │ csrf_message │ +│ choice_translation_domain │ empty_data │ auto_initialize │ csrf_protection │ +│ choice_value │ error_bubbling │ block_name │ csrf_token_id │ +│ choices │ │ by_reference │ csrf_token_manager │ +│ expanded │ │ data │ │ +│ group_by │ │ disabled │ │ +│ multiple │ │ inherit_data │ │ +│ placeholder │ │ label │ │ +│ preferred_choices │ │ label_attr │ │ +│ │ │ label_format │ │ +│ │ │ mapped │ │ +│ │ │ method │ │ +│ │ │ post_max_size_message │ │ +│ │ │ property_path │ │ +│ │ │ required │ │ +│ │ │ translation_domain │ │ +│ │ │ trim │ │ +│ │ │ upload_max_size_message │ │ +└───────────────────────────┴────────────────────┴─────────────────────────┴───────────────────────┘ Parent types ------------ diff --git a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_2.txt b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_2.txt index 72b13dfef75aa..cee0159a0900d 100644 --- a/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_2.txt +++ b/src/Symfony/Component/Form/Tests/Fixtures/Descriptor/resolved_form_type_2.txt @@ -2,31 +2,31 @@ Symfony\Component\Form\Extension\Core\Type\FormType (Block prefix: "form") ========================================================================== - ------------------------- - Options - ------------------------- - action - attr - auto_initialize - block_name - by_reference - compound - data - data_class - disabled - empty_data - error_bubbling - inherit_data - label - label_attr - label_format - mapped - method - post_max_size_message - property_path - required - translation_domain - trim - upload_max_size_message - ------------------------- +┌─────────────────────────┐ +│ Options │ +├─────────────────────────┤ +│ action │ +│ attr │ +│ auto_initialize │ +│ block_name │ +│ by_reference │ +│ compound │ +│ data │ +│ data_class │ +│ disabled │ +│ empty_data │ +│ error_bubbling │ +│ inherit_data │ +│ label │ +│ label_attr │ +│ label_format │ +│ mapped │ +│ method │ +│ post_max_size_message │ +│ property_path │ +│ required │ +│ translation_domain │ +│ trim │ +│ upload_max_size_message │ +└─────────────────────────┘