Movatterモバイル変換

Skip to content

symfony/symfonyPublic

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

Commit08c2ee3

nicolas-grekas

committed

[*Bundle] Add autowiring aliases for common services

1 parenta96a997 commit08c2ee3Copy full SHA for 08c2ee3

File tree

54 files changed

+54

-63

lines changed

src/Symfony
- Bundle
  - FrameworkBundle
    - Controller
      - ControllerTrait.php
    - Resources/config
  - SecurityBundle/Resources/config
    - security.xml
    - security_acl_dbal.xml
  - TwigBundle/Resources/config
    - twig.xml
- Component/DependencyInjection
  - ContainerBuilder.php
  - Tests

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+54

-63

lines changed

`‎src/Symfony/Bundle/FrameworkBundle/Controller/ControllerTrait.php‎`

Lines changed: 7 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`useSymfony\Component\HttpFoundation\RedirectResponse;`
`24`	`24`	`useSymfony\Component\HttpFoundation\ResponseHeaderBag;`
`25`	`25`	`useSymfony\Component\HttpFoundation\Session\Session;`
	`26`	`+useSymfony\Component\HttpFoundation\Session\SessionInterface;`
`26`	`27`	`useSymfony\Component\HttpFoundation\StreamedResponse;`
`27`	`28`	`useSymfony\Component\HttpKernel\Exception\NotFoundHttpException;`
`28`	`29`	`useSymfony\Component\HttpKernel\HttpKernelInterface;`
`@@ -76,12 +77,9 @@ protected function getSerializer(): SerializerInterface`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`/**`
`79`		`- * An instance of the Session implementation (and not the interface) is returned because getFlashBag is not part of`
`80`		`- * the interface.`
`81`		`- *`
`82`	`80`	`* @required`
`83`	`81`	`*/`
`84`		`-protectedfunctiongetSession():Session`
	`82`	`+protectedfunctiongetSession():SessionInterface`
`85`	`83`	`{`
`86`	`84`	`}`
`87`	`85`
`@@ -235,7 +233,11 @@ protected function file($file, string $fileName = null, string $disposition = Re`
`235`	`233`	`*/`
`236`	`234`	`protectedfunctionaddFlash(string$type,string$message)`
`237`	`235`	`{`
`238`		`-$this->getSession()->getFlashBag()->add($type,$message);`
	`236`	`+$session =$this->getSession();`
	`237`	`+if (!$sessioninstanceof Session) {`
	`238`	`+thrownew \LogicException(sprintf('You can not use the addFlash method: "%s" is not an instance of "%s".',get_class($session), Session::class));`
	`239`	`+ }`
	`240`	`+$session->getFlashBag()->add($type,$message);`
`239`	`241`	`}`
`240`	`242`
`241`	`243`	`/**`
`@@ -245,8 +247,6 @@ protected function addFlash(string $type, string $message)`
`245`	`247`	`* @param mixed $object The object`
`246`	`248`	`*`
`247`	`249`	`* @return bool`
`248`		`- *`
`249`		`- * @throws \LogicException`
`250`	`250`	`*/`
`251`	`251`	`protectedfunctionisGranted($attributes,$object =null):bool`
`252`	`252`	`{`
`@@ -396,8 +396,6 @@ protected function createFormBuilder($data = null, array $options = array()): Fo`
`396`	`396`	`*`
`397`	`397`	`* @return mixed`
`398`	`398`	`*`
`399`		`- * @throws \LogicException If SecurityBundle is not available`
`400`		`- *`
`401`	`399`	`* @see TokenInterface::getUser()`
`402`	`400`	`*/`
`403`	`401`	`protectedfunctiongetUser()`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`<argumenttype="service"id="assets.empty_package" /><!-- default package-->`
`11`	`11`	`<argumenttype="collection" /><!-- named packages-->`
`12`	`12`	`</service>`
	`13`	`+ <serviceid="Symfony\Component\Asset\Packages"alias="assets.packages"public="false" />`
`13`	`14`
`14`	`15`	`<serviceid="assets.empty_package"class="Symfony\Component\Asset\Package"public="false">`
`15`	`16`	`<argumenttype="service"id="assets.empty_version_strategy" />`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,6 @@`
`26`	`26`	`<serviceid="debug.file_link_formatter"class="Symfony\Component\HttpKernel\Debug\FileLinkFormatter"public="false">`
`27`	`27`	`<argument>%debug.file_link_format%</argument>`
`28`	`28`	`</service>`
	`29`	`+ <serviceid="Symfony\Component\HttpKernel\Debug\FileLinkFormatter"alias="debug.file_link_formatter"public="false" />`
`29`	`30`	`</services>`
`30`	`31`	`</container>`

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

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`<services>`
`8`	`8`	`<!-- ResolvedFormTypeFactory-->`
`9`	`9`	`<serviceid="form.resolved_type_factory"class="Symfony\Component\Form\ResolvedFormTypeFactory" />`
	`10`	`+ <serviceid="Symfony\Component\Form\ResolvedFormTypeFactoryInterface"alias="form.resolved_type_factory"public="false" />`
`10`	`11`
`11`	`12`	`<!-- FormRegistry-->`
`12`	`13`	`<serviceid="form.registry"class="Symfony\Component\Form\FormRegistry">`
`@@ -21,12 +22,14 @@`
`21`	`22`	`</argument>`
`22`	`23`	`<argumenttype="service"id="form.resolved_type_factory" />`
`23`	`24`	`</service>`
	`25`	`+ <serviceid="Symfony\Component\Form\FormRegistryInterface"alias="form.registry"public="false" />`
`24`	`26`
`25`	`27`	`<!-- FormFactory-->`
`26`	`28`	`<serviceid="form.factory"class="Symfony\Component\Form\FormFactory">`
`27`	`29`	`<argumenttype="service"id="form.registry" />`
`28`	`30`	`<argumenttype="service"id="form.resolved_type_factory" />`
`29`	`31`	`</service>`
	`32`	`+ <serviceid="Symfony\Component\Form\FormFactoryInterface"alias="form.factory"public="false" />`
`30`	`33`
`31`	`34`	`<!-- DependencyInjectionExtension-->`
`32`	`35`	`<serviceid="form.extension"class="Symfony\Component\Form\Extension\DependencyInjection\DependencyInjectionExtension"public="false">`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`<serviceid="translator"class="Symfony\Component\Translation\IdentityTranslator">`
`8`	`8`	`<argumenttype="service"id="translator.selector" />`
`9`	`9`	`</service>`
	`10`	`+ <serviceid="Symfony\Component\Translation\TranslatorInterface"alias="translator"public="false" />`
`10`	`11`
`11`	`12`	`<serviceid="translator.selector"class="Symfony\Component\Translation\MessageSelector"public="false" />`
`12`	`13`	`</services>`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,6 @@`
`10`	`10`	`<argument /><!-- throwExceptionOnInvalidIndex, set by the extension-->`
`11`	`11`	`<argumenttype="service"id="cache.property_access"on-invalid="ignore" />`
`12`	`12`	`</service>`
	`13`	`+ <serviceid="Symfony\Component\PropertyAccess\PropertyAccessorInterface"alias="property_accessor"public="false" />`
`13`	`14`	`</services>`
`14`	`15`	`</container>`

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`<argumenttype="collection" />`
`12`	`12`	`<argumenttype="collection" />`
`13`	`13`	`</service>`
	`14`	`+ <serviceid="Symfony\Component\PropertyInfo\PropertyInfoExtractorInterface"alias="property_info"public="false" />`
`14`	`15`
`15`	`16`	`<!-- Extractor-->`
`16`	`17`	`<serviceid="property_info.reflection_extractor"class="Symfony\Component\PropertyInfo\Extractor\ReflectionExtractor"public="false">`

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

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,9 @@`
`80`	`80`	`</service>`
`81`	`81`
`82`	`82`	`<serviceid="router"alias="router.default" />`
	`83`	`+ <serviceid="Symfony\Component\Routing\RouterInterface"alias="router"public="false" />`
	`84`	`+ <serviceid="Symfony\Component\Routing\Generator\UrlGeneratorInterface"alias="router"public="false" />`
	`85`	`+ <serviceid="Symfony\Component\Routing\Matcher\UrlMatcherInterface"alias="router"public="false" />`
`83`	`86`
`84`	`87`	`<serviceid="router.request_context"class="Symfony\Component\Routing\RequestContext"public="false">`
`85`	`88`	`<argument>%router.request_context.base_url%</argument>`
`@@ -89,6 +92,7 @@`
`89`	`92`	`<argument>%request_listener.http_port%</argument>`
`90`	`93`	`<argument>%request_listener.https_port%</argument>`
`91`	`94`	`</service>`
	`95`	`+ <serviceid="Symfony\Component\Routing\RequestContext"alias="router.request_context"public="false" />`
`92`	`96`
`93`	`97`	`<serviceid="router.cache_warmer"class="Symfony\Bundle\FrameworkBundle\CacheWarmer\RouterCacheWarmer"public="false">`
`94`	`98`	`<tagname="kernel.cache_warmer" />`

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

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,17 @@`
`6`	`6`
`7`	`7`	`<services>`
`8`	`8`	`<serviceid="security.csrf.token_generator"class="Symfony\Component\Security\Csrf\TokenGenerator\UriSafeTokenGenerator"public="false" />`
	`9`	`+ <serviceid="Symfony\Component\Security\Csrf\TokenGenerator\TokenGeneratorInterface"alias="security.csrf.token_generator"public="false" />`
`9`	`10`
`10`	`11`	`<serviceid="security.csrf.token_storage"class="Symfony\Component\Security\Csrf\TokenStorage\SessionTokenStorage"public="false">`
`11`	`12`	`<argumenttype="service"id="session" />`
`12`	`13`	`</service>`
	`14`	`+ <serviceid="Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface"alias="security.csrf.token_storage"public="false" />`
`13`	`15`
`14`	`16`	`<serviceid="security.csrf.token_manager"class="Symfony\Component\Security\Csrf\CsrfTokenManager">`
`15`	`17`	`<argumenttype="service"id="security.csrf.token_generator" />`
`16`	`18`	`<argumenttype="service"id="security.csrf.token_storage" />`
`17`	`19`	`</service>`
	`20`	`+ <serviceid="Symfony\Component\Security\Csrf\CsrfTokenManagerInterface"alias="security.csrf.token_manager"public="false" />`
`18`	`21`	`</services>`
`19`	`22`	`</container>`

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

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,11 @@`
`14`	`14`	`<argumenttype="collection" />`
`15`	`15`	`<argumenttype="collection" />`
`16`	`16`	`</service>`
	`17`	`+ <serviceid="Symfony\Component\Serializer\SerializerInterface"alias="serializer"public="false" />`
	`18`	`+ <serviceid="Symfony\Component\Serializer\NormalizerInterface"alias="serializer"public="false" />`
	`19`	`+ <serviceid="Symfony\Component\Serializer\DenormalizerInterface"alias="serializer"public="false" />`
	`20`	`+ <serviceid="Symfony\Component\Serializer\EncoderInterface"alias="serializer"public="false" />`
	`21`	`+ <serviceid="Symfony\Component\Serializer\DecoderInterface"alias="serializer"public="false" />`
`17`	`22`
`18`	`23`	`<serviceid="serializer.property_accessor"alias="property_accessor"public="false" />`
`19`	`24`
`@@ -27,6 +32,7 @@`
`27`	`32`	`<!-- Run after all custom normalizers-->`
`28`	`33`	`<tagname="serializer.normalizer"priority="-1000" />`
`29`	`34`	`</service>`
	`35`	`+ <serviceid="Symfony\Component\Serializer\Normalizer\ObjectNormalizer"alias="serializer.normalizer.object"public="false" />`
`30`	`36`
`31`	`37`	`<serviceid="serializer.denormalizer.array"class="Symfony\Component\Serializer\Normalizer\ArrayDenormalizer"public="false">`
`32`	`38`	`<!-- Run before the object normalizer-->`

0 commit comments

Comments

(0)

[8]ページ先頭

©2009-2025 Movatter.jp