Movatterモバイル変換

Skip to content

symfony/symfonyPublic

NotificationsYou must be signed in to change notification settings
Fork9.7k
Star30.8k

Commite770e2e

nicolas-grekas

committed

Merge branch '3.0' into 3.1

* 3.0: [FrameworkBundle] Fix fixtures [HttpKernel] Inline ValidateRequestListener logic into HttpKernel fixed HttpKernel dependencies after#18688Conflicts:src/Symfony/Component/HttpKernel/HttpKernel.phpsrc/Symfony/Component/HttpKernel/Tests/HttpKernelTest.php

2 parents5128cd3 +b4fbcb3 commite770e2eCopy full SHA for e770e2e

File tree

18 files changed

+50

-141

lines changed

src/Symfony
- Bundle/FrameworkBundle
  - Resources/config
    - web.xml
  - Tests/Fixtures/Descriptor
  - composer.json
- Component/HttpKernel
  - EventListener
    - ValidateRequestListener.php
  - HttpKernel.php
  - Tests
    - EventListener
      - ValidateRequestListenerTest.php
    - HttpKernelTest.php
  - composer.json

18 files changed

+50

-141

lines changed

`‎src/Symfony/Bundle/FrameworkBundle/Resources/config/web.xml‎`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,5 @@`
`61`	`61`	`<argumenttype="service"id="request_stack" />`
`62`	`62`	`<tagname="kernel.event_subscriber" />`
`63`	`63`	`</service>`
`64`		`-`
`65`		`- <serviceid="validate_request_listener"class="Symfony\Component\HttpKernel\EventListener\ValidateRequestListener">`
`66`		`- <tagname="kernel.event_subscriber" />`
`67`		`- </service>`
`68`	`64`	`</services>`
`69`	`65`	`</container>`

`‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/array_parameter.txt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`--------------------- -----------------------------------------------------------------`
`2`		`- [32mParameter[39m [32mValue[39m`
	`2`	`+[32m Parameter[39m [32m Value [39m`
`3`	`3`	`--------------------- -----------------------------------------------------------------`
`4`	`4`	`twig.form.resources ["bootstrap_3_horizontal_layout.html.twig","bootstrap_3_layo...`
`5`	`5`	`--------------------- -----------------------------------------------------------------`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`[33m=================================[39m`
`4`	`4`
`5`	`5`	`------------------- --------------------------------------------------------`
`6`		`- [32mService ID[39m [32mClass name[39m`
	`6`	`+[32m Service ID[39m [32m Class name [39m`
`7`	`7`	`------------------- --------------------------------------------------------`
`8`	`8`	`alias_1 alias for "service_1"`
`9`	`9`	`alias_2 alias for "service_2"`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`[33m=============================================[39m`
`4`	`4`
`5`	`5`	`------------------- --------------------------------------------------------`
`6`		`- [32mService ID[39m [32mClass name[39m`
	`6`	`+[32m Service ID[39m [32m Class name [39m`
`7`	`7`	`------------------- --------------------------------------------------------`
`8`	`8`	`alias_1 alias for "service_1"`
`9`	`9`	`alias_2 alias for "service_2"`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`[33m====================================================================[39m`
`4`	`4`
`5`	`5`	`-------------- ------- ------- ------- -----------------------`
`6`		`- [32mService ID[39m [32mattr1[39m [32mattr2[39m [32mattr3[39m [32mClass name[39m`
	`6`	`+[32m Service ID[39m [32m attr1 [39m [32m attr2 [39m [32m attr3 [39m [32m Class name [39m`
`7`	`7`	`-------------- ------- ------- ------- -----------------------`
`8`	`8`	`definition_2 val1 val2 Full\Qualified\Class2`
`9`	`9`	`" val3`

`‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.txt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`------------------ -----------------------------`
`2`		`- [32mOption[39m [32mValue[39m`
	`2`	`+[32m Option[39m [32m Value [39m`
`3`	`3`	`------------------ -----------------------------`
`4`	`4`	`Service ID -`
`5`	`5`	`Class Full\Qualified\Class1`

`‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.txt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`------------------ -------------------------------------------------------`
`2`		`- [32mOption[39m [32mValue[39m`
	`2`	`+[32m Option[39m [32m Value [39m`
`3`	`3`	`------------------ -------------------------------------------------------`
`4`	`4`	`Service ID -`
`5`	`5`	`Class Full\Qualified\Class2`

`‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_event1.txt‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`[33m=======================================[39m`
`4`	`4`
`5`	`5`	`------- ------------------- ----------`
`6`		`- [32mOrder[39m [32mCallable[39m [32mPriority[39m`
	`6`	`+[32m Order[39m[32m Callable[39m [32m Priority[39m`
`7`	`7`	`------- ------------------- ----------`
`8`	`8`	`#1 global_function() 255`
`9`	`9`	`#2 \Closure() -1`

`‎src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/event_dispatcher_1_events.txt‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`[33m--------------[39m`
`7`	`7`
`8`	`8`	`------- ------------------- ----------`
`9`		`- [32mOrder[39m [32mCallable[39m [32mPriority[39m`
	`9`	`+[32m Order[39m[32m Callable[39m [32m Priority[39m`
`10`	`10`	`------- ------------------- ----------`
`11`	`11`	`#1 global_function() 255`
`12`	`12`	`#2 \Closure() -1`
`@@ -16,7 +16,7 @@`
`16`	`16`	`[33m--------------[39m`
`17`	`17`
`18`	`18`	`------- ----------------------------------------------------------------------------------- ----------`
`19`		`- [32mOrder[39m [32mCallable[39m [32mPriority[39m`
	`19`	`+[32m Order[39m[32m Callable[39m [32m Priority[39m`
`20`	`20`	`------- ----------------------------------------------------------------------------------- ----------`
`21`	`21`	`#1 Symfony\Bundle\FrameworkBundle\Tests\Console\Descriptor\CallableClass::__invoke() 0`
`22`	`22`	`------- ----------------------------------------------------------------------------------- ----------`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`--------------- ---------`
`2`		`- [32mParameter[39m [32mValue[39m`
	`2`	`+[32m Parameter[39m [32m Value [39m`
`3`	`3`	`--------------- ---------`
`4`	`4`	`database_name symfony`
`5`	`5`	`--------------- ---------`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp