Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit e7bdb5b

Browse filesBrowse files
fabpotfabpot
committed
minor #13197 [2.7][FrameworkBundle] Removed the use of TableHelper (saro0h)
This PR was merged into the 2.7 branch. Discussion ---------- [2.7][FrameworkBundle] Removed the use of TableHelper | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | ~ | License | MIT | Doc PR | ~ The PR #13121 on 3.0 removed the ``TableHelper `` class. Now the tests don't pass when using ``components=high`` version of dependencis, because of the use of the deprecated TableHelper. This one removes the use of ``TableHelper`` without the removal of the ``TableHelper`` class, and adapt the existing code to use the Table class instead. Commits ------- 08a5b5a [FrameworkBundle] Removed the use of TableHelper
2 parents b3b4f50 + 08a5b5a commit e7bdb5b
Copy full SHA for e7bdb5b
Expand file treeCollapse file tree

35 files changed

+40
-35
lines changed

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php
+6-5Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ protected function describeRouteCollection(RouteCollection $routes, array $optio
5959
}
6060

6161
$this->writeText($this->formatSection('router', 'Current routes')."\n", $options);
62-
$this->renderTable($table, !(isset($options['raw_output']) && $options['raw_output']));
62+
$table->render();
6363
}
6464

6565
/**
@@ -109,7 +109,7 @@ protected function describeContainerParameters(ParameterBag $parameters, array $
109109
}
110110

111111
$this->writeText($this->formatSection('container', 'List of parameters')."\n", $options);
112-
$this->renderTable($table, !(isset($options['raw_output']) && $options['raw_output']));
112+
$table->render();
113113
}
114114

115115
/**
@@ -232,7 +232,7 @@ protected function describeContainerServices(ContainerBuilder $builder, array $o
232232
}
233233
}
234234

235-
$this->renderTable($table);
235+
$table->render();
236236
}
237237

238238
/**
@@ -302,6 +302,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
302302
$this->writeText($this->formatSection('event_dispatcher', $label)."\n", $options);
303303

304304
$registeredListeners = $eventDispatcher->getListeners($event);
305+
305306
if (null !== $event) {
306307
$this->writeText("\n");
307308
$table = new Table($this->getOutput());
@@ -312,7 +313,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
312313
$table->addRow(array(sprintf('#%d', $order + 1), $this->formatCallable($listener)));
313314
}
314315

315-
$this->renderTable($table, true);
316+
$table->render();
316317
} else {
317318
ksort($registeredListeners);
318319
foreach ($registeredListeners as $eventListened => $eventListeners) {
@@ -326,7 +327,7 @@ protected function describeEventDispatcherListeners(EventDispatcherInterface $ev
326327
$table->addRow(array(sprintf('#%d', $order + 1), $this->formatCallable($eventListener)));
327328
}
328329

329-
$this->renderTable($table, true);
330+
$table->render();
330331
}
331332
}
332333
}

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_1.md

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
- Service: `service_1`
2-
- Public: yes
2+
- Public: yes

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/alias_2.md

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
- Service: `service_2`
2-
- Public: no
2+
- Public: no

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,4 @@ alias_2
3232
Services
3333
--------
3434
35-
- `service_container`: `Symfony\Component\DependencyInjection\ContainerBuilder`
35+
- `service_container`: `Symfony\Component\DependencyInjection\ContainerBuilder`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<info>[container]</info> <comment>Public</comment> services
2-
Service ID Class name
2+
Service ID  Class name 
33
alias_1 alias for "service_1"
44
alias_2 alias for "service_2"
55
definition_1 Full\Qualified\Class1

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ alias_2
4747
Services
4848
--------
4949

50-
- `service_container`: `Symfony\Component\DependencyInjection\ContainerBuilder`
50+
- `service_container`: `Symfony\Component\DependencyInjection\ContainerBuilder`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt

Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<info>[container]</info> <comment>Public</comment> and <comment>private</comment> services
2-
Service ID Class name
2+
Service ID  Class name 
33
alias_1 alias for "service_1"
44
alias_2 alias for "service_2"
55
definition_1 Full\Qualified\Class1
66
definition_2 Full\Qualified\Class2
77
service_container Symfony\Component\DependencyInjection\ContainerBuilder
8-

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<info>[container]</info> <comment>Public</comment> and <comment>private</comment> services with tag <info>tag1</info>
2-
Service ID attr1 attr2 attr3 Class name
2+
Service ID  attr1 attr2 attr3 Class name 
33
definition_2 val1 val2 Full\Qualified\Class2
44
" val3

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_1.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
12
- Type: `function`
23
- Name: `array_key_exists`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_1.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
array_key_exists()
1+
array_key_exists()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_2.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_2.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
- Type: `function`
23
- Name: `staticMethod`
34
- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_2.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::staticMethod()
1+
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::staticMethod()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_3.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
- Type: `function`
23
- Name: `method`
34
- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_3.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::method()
1+
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::method()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_4.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_4.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
- Type: `function`
23
- Name: `staticMethod`
34
- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_4.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::staticMethod()
1+
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::staticMethod()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_5.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_5.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
- Type: `function`
23
- Name: `staticMethod`
34
- Class: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\ExtendedCallableClass`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_5.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\ExtendedCallableClass::parent::staticMethod()
1+
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\ExtendedCallableClass::parent::staticMethod()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_6.md

Copy file name to clipboard
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1+
12
- Type: `closure`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_6.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
\Closure()
1+
\Closure()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_7.md

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1+
12
- Type: `object`
23
- Name: `Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass`
3-

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/callable_7.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke()
1+
Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke()

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.md

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
- Class: `Full\Qualified\Class1`
22
- Scope: `container`
33
- Public: yes
4-
- Synthetic: no
4+
- Synthetic: no

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
- Attr2: val2
99
- Tag: `tag1`
1010
- Attr3: val3
11-
- Tag: `tag2`
11+
- Tag: `tag2`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.md

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
database_name
22
=============
33

4-
symfony
4+
symfony

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt

Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
symfony
1+
symfony

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ Container parameters
44
- `array`: `[12,"Hello world!",true]`
55
- `boolean`: `true`
66
- `integer`: `12`
7-
- `string`: `Hello world!`
7+
- `string`: `Hello world!`

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt

Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<info>[container]</info> List of parameters
2-
Parameter Value
2+
Parameter Value 
33
array [12,"Hello world!",true]
44
boolean true
55
integer 12
66
string Hello world!
7-

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
- Defaults:
77
- `name`: Joseph
88
- Requirements:
9-
- `name`: [a-z]+
9+
- `name`: [a-z]+

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_1.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
opt1: val1
1010
opt2: val2
1111
<comment>Path-Regex</comment> #^/hello(?:/(?P<name>[a-z]+))?$#s
12-
<comment>Host-Regex</comment> #^localhost$#s
12+
<comment>Host-Regex</comment> #^localhost$#s

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
- Method: PUT|POST
55
- Class: Symfony\Component\Routing\Route
66
- Defaults: NONE
7-
- Requirements: NONE
7+
- Requirements: NONE

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_2.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@
99
opt1: val1
1010
opt2: val2
1111
<comment>Path-Regex</comment> #^/name/add$#s
12-
<comment>Host-Regex</comment> #^localhost$#s
12+
<comment>Host-Regex</comment> #^localhost$#s

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.md
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ route_2
2222
- Class: Symfony\Component\Routing\Route
2323
- Defaults: NONE
2424
- Requirements: NONE
25+

‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt

Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<info>[router]</info> Current routes
2-
Name Method Scheme Host Path
2+
Name  Method  Scheme  Host  Path 
33
route_1 GET|HEAD http|https localhost /hello/{name}
44
route_2 PUT|POST http|https localhost /name/add
5-

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/composer.json
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
},
3434
"require-dev": {
3535
"symfony/browser-kit": "~2.4|~3.0.0",
36-
"symfony/console": "~2.5|~3.0.0",
36+
"symfony/console": "~2.6|~3.0.0",
3737
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
3838
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
3939
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.