8000 [FrameworkBundle] Fix fixtures by nicolas-grekas · Pull Request #19223 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[FrameworkBundle] Fix fixtures #19223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 29, 2016
Merged

[FrameworkBundle] Fix fixtures #19223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------- -----------------------------------------------------------------
Parameter Value
 Parameter   Value 
--------------------- -----------------------------------------------------------------
twig.form.resources ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...
--------------------- -----------------------------------------------------------------
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
=================================

------------------- --------------------------------------------------------
Service ID Class name
 Service ID   Class name 
------------------- --------------------------------------------------------
alias_1 alias for "service_1"
alias_2 alias for "service_2"
Expand Down
4 changes: 2 additions & 2 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
=============================================

------------------- --------------------------------------------------------
Service ID Class name
 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
------------------- --------------------------------------------------------
------------------- --------------------------------------------------------
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
====================================================================

-------------- ------- ------- ------- -----------------------
Service ID attr1 attr2 attr3 Class name
 Service ID   attr1   attr2   attr3   Class name 
-------------- ------- ------- ------- -----------------------
definition_2 val1 val2 Full\Qualified\Class2
" val3
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
------------------ -----------------------------
Option Value
 Option   Value 
------------------ -----------------------------
Service ID -
Class Full\Qualified\Class1
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
------------------ -------------------------------------------------------
Option Value
 Option   Value 
------------------ -------------------------------------------------------
Service ID -
Class Full\Qualified\Class2
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
=======================================

------- ------------------- ----------
Order Callable Priority
 Order   Callable   Priority 
------- ------------------- ----------
#1 global_function() 255
#2 \Closure() -1
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
--------------

------- ------------------- ----------
Order Callable Priority
 Order   Callable   Priority 
------- ------------------- ----------
#1 global_function() 255
#2 \Closure() -1
Expand All @@ -15,7 +15,7 @@
--------------

------- ----------------------------------------------------------------------------------- ----------
Order Callable Priority
 Order   Callable   Priority 
------- ----------------------------------------------------------------------------------- ----------
#1 Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke() 0
------- ----------------------------------------------------------------------------------- ----------
------- ----------------------------------------------------------------------------------- ----------
2 changes: 1 addition & 1 deletion ...le/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
------------------ -----------------------------
Option Value
 Option   Value 
------------------ -----------------------------
Service ID -
Class Full\Qualified\Class1
Expand Down
2 changes: 1 addition & 1 deletion ...le/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
------------------ -------------------------------------------------------
Option Value
 Option   Value 
------------------ -------------------------------------------------------
Service ID -
Class Full\Qualified\Class2
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameter.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------- ---------
Parameter Value
 Parameter   Value 
--------------- ---------
database_name symfony
--------------- ---------
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/parameters_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
============================

----------- --------------------------
Parameter Value
 Parameter   Value 
----------- --------------------------
array [12,"Hello world!",true]
boolean true
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/route_collection_1.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------- ---------- ------------ ----------- ---------------
Name Method Scheme Host Path
 Name   Method   Scheme   Host   Path 
--------- ---------- ------------ ----------- ---------------
route_1 GET|HEAD http|https localhost /hello/{name}
route_2 PUT|POST http|https localhost /name/add
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"require-dev": {
"symfony/browser-kit": "~2.4|~3.0.0",
"symfony/console": "~2.8|~3.0.0",
"symfony/console": "~2.8.8|~3.0.8",
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
"symfony/polyfill-intl-icu": "~1.0",
Expand Down
0