Skip to content

More updates for DI types philosophy #7916

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

Closed
wants to merge 2 commits into from
Closed

More updates for DI types philosophy #7916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
607b694
More updating for types
weaverryan May 16, 2017
c8bb8dd
Updating more types, and basically rewriting the alias article
weaverryan May 18, 2017
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
1 change: 1 addition & 0 deletions _build/redirection_map
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,3 +335,4 @@
/testing/simulating_authentication /testing/http_authentication
/components/dependency_injection/autowiring /service_container/autowiring
/event_dispatcher/class_extension /event_dispatcher
/security/target_path /security
11 changes: 7 additions & 4 deletions routing/custom_route_loader.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,9 @@ Now define a service for the ``ExtraLoader``:

# app/config/services.yml
services:
app.routing_loader:
class: AppBundle\Routing\ExtraLoader
# ...

AppBundle\Routing\ExtraLoader:
tags: [routing.loader]

.. code-block:: xml
Expand All @@ -157,7 +158,9 @@ Now define a service for the ``ExtraLoader``:
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">

<services>
<service id="app.routing_loader" class="AppBundle\Routing\ExtraLoader">
<!-- ... -->

<service id="AppBundle\Routing\ExtraLoader">
<tag name="routing.loader" />
</service>
</services>
Expand All @@ -168,7 +171,7 @@ Now define a service for the ``ExtraLoader``:
use AppBundle\Routing\ExtraLoader;

$container
->register('app.routing_loader', ExtraLoader::class)
->autowire(ExtraLoader::class)
->addTag('routing.loader')
;

Expand Down
76 changes: 38 additions & 38 deletions routing/hostname_pattern.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ You can also match on the HTTP *host* of the incoming request.

.. code-block:: php-annotations

// src/Acme/DemoBundle/Controller/MainController.php
namespace Acme\DemoBundle\Controller;
// src/AppBundle/Controller/MainController.php
namespace AppBundle\Controller;

use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
Expand Down Expand Up @@ -40,11 +40,11 @@ You can also match on the HTTP *host* of the incoming request.
mobile_homepage:
path: /
host: m.example.com
defaults: { _controller: AcmeDemoBundle:Main:mobileHomepage }
defaults: { _controller: AppBundle:Main:mobileHomepage }

homepage:
path: /
defaults: { _controller: AcmeDemoBundle:Main:homepage }
defaults: { _controller: AppBundle:Main:homepage }

.. code-block:: xml

Expand All @@ -55,11 +55,11 @@ You can also match on the HTTP *host* of the incoming request.
http://symfony.com/schema/routing/routing-1.0.xsd">

<route id="mobile_homepage" path="/" host="m.example.com">
<default key="_controller">AcmeDemoBundle:Main:mobileHomepage</default>
<default key="_controller">AppBundle:Main:mobileHomepage</default>
</route>

<route id="homepage" path="/">
<default key="_controller">AcmeDemoBundle:Main:homepage</default>
<default key="_controller">AppBundle:Main:homepage</default>
</route>
</routes>

Expand All @@ -70,11 +70,11 @@ You can also match on the HTTP *host* of the incoming request.

$collection = new RouteCollection();
$collection->add('mobile_homepage', new Route('/', array(
'_controller' => 'AcmeDemoBundle:Main:mobileHomepage',
'_controller' => 'AppBundle:Main:mobileHomepage',
), array(), array(), 'm.example.com'));

$collection->add('homepage', new Route('/', array(
'_controller' => 'AcmeDemoBundle:Main:homepage',
'_controller' => 'AppBundle:Main:homepage',
)));

return $collection;
Expand All @@ -92,8 +92,8 @@ you can use placeholders in your hostname:

.. code-block:: php-annotations

// src/Acme/DemoBundle/Controller/MainController.php
namespace Acme\DemoBundle\Controller;
// src/AppBundle/Controller/MainController.php
namespace AppBundle\Controller;

use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
Expand Down Expand Up @@ -122,11 +122,11 @@ you can use placeholders in your hostname:
projects_homepage:
path: /
host: "{project_name}.example.com"
defaults: { _controller: AcmeDemoBundle:Main:projectsHomepage }
defaults: { _controller: AppBundle:Main:projectsHomepage }

homepage:
path: /
defaults: { _controller: AcmeDemoBundle:Main:homepage }
defaults: { _controller: AppBundle:Main:homepage }

.. code-block:: xml

Expand All @@ -137,11 +137,11 @@ you can use placeholders in your hostname:
http://symfony.com/schema/routing/routing-1.0.xsd">

<route id="projects_homepage" path="/" host="{project_name}.example.com">
<default key="_controller">AcmeDemoBundle:Main:projectsHomepage</default>
<default key="_controller">AppBundle:Main:projectsHomepage</default>
</route>

<route id="homepage" path="/">
<default key="_controller">AcmeDemoBundle:Main:homepage</default>
<default key="_controller">AppBundle:Main:homepage</default>
</route>
</routes>

Expand All @@ -152,11 +152,11 @@ you can use placeholders in your hostname:

$collection = new RouteCollection();
$collection->add('project_homepage', new Route('/', array(
'_controller' => 'AcmeDemoBundle:Main:projectsHomepage',
'_controller' => 'AppBundle:Main:projectsHomepage',
), array(), array(), '{project_name}.example.com'));

$collection->add('homepage', new Route('/', array(
'_controller' => 'AcmeDemoBundle:Main:homepage',
'_controller' => 'AppBundle:Main:homepage',
)));

return $collection;
Expand All @@ -169,8 +169,8 @@ instance, if you want to match both ``m.example.com`` and

.. code-block:: php-annotations

// src/Acme/DemoBundle/Controller/MainController.php
namespace Acme\DemoBundle\Controller;
// src/AppBundle/Controller/MainController.php
namespace AppBundle\Controller;

use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
Expand Down Expand Up @@ -206,14 +206,14 @@ instance, if you want to match both ``m.example.com`` and
path: /
host: "{subdomain}.example.com"
defaults:
_controller: AcmeDemoBundle:Main:mobileHomepage
_controller: AppBundle:Main:mobileHomepage
subdomain: m
requirements:
subdomain: m|mobile

homepage:
path: /
defaults: { _controller: AcmeDemoBundle:Main:homepage }
defaults: { _controller: AppBundle:Main:homepage }

.. code-block:: xml

Expand All @@ -224,13 +224,13 @@ instance, if you want to match both ``m.example.com`` and
http://symfony.com/schema/routing/routing-1.0.xsd">

<route id="mobile_homepage" path="/" host="{subdomain}.example.com">
<default key="_controller">AcmeDemoBundle:Main:mobileHomepage</default>
<default key="_controller">AppBundle:Main:mobileHomepage</default>
<default key="subdomain">m</default>
<requirement key="subdomain">m|mobile</requirement>
</route>

<route id="homepage" path="/">
<default key="_controller">AcmeDemoBundle:Main:homepage</default>
<default key="_controller">AppBundle:Main:homepage</default>
</route>
</routes>

Expand All @@ -241,14 +241,14 @@ instance, if you want to match both ``m.example.com`` and

$collection = new RouteCollection();
$collection->add('mobile_homepage', new Route('/', array(
'_controller' => 'AcmeDemoBundle:Main:mobileHomepage',
'_controller' => 'AppBundle:Main:mobileHomepage',
'subdomain' => 'm',
), array(
'subdomain' => 'm|mobile',
), array(), '{subdomain}.example.com'));

$collection->add('homepage', new Route('/', array(
'_controller' => 'AcmeDemoBundle:Main:homepage',
'_controller' => 'AppBundle:Main:homepage',
)));

return $collection;
Expand All @@ -262,8 +262,8 @@ instance, if you want to match both ``m.example.com`` and

.. code-block:: php-annotations

// src/Acme/DemoBundle/Controller/MainController.php
namespace Acme\DemoBundle\Controller;
// src/AppBundle/Controller/MainController.php
namespace AppBundle\Controller;

use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
Expand Down Expand Up @@ -299,14 +299,14 @@ instance, if you want to match both ``m.example.com`` and
path: /
host: "m.{domain}"
defaults:
_controller: AcmeDemoBundle:Main:mobileHomepage
_controller: AppBundle:Main:mobileHomepage
domain: '%domain%'
requirements:
domain: '%domain%'

homepage:
path: /
defaults: { _controller: AcmeDemoBundle:Main:homepage }
defaults: { _controller: AppBundle:Main:homepage }

.. code-block:: xml

Expand All @@ -317,13 +317,13 @@ instance, if you want to match both ``m.example.com`` and
http://symfony.com/schema/routing/routing-1.0.xsd">

<route id="mobile_homepage" path="/" host="m.{domain}">
<default key="_controller">AcmeDemoBundle:Main:mobileHomepage</default>
<default key="_controller">AppBundle:Main:mobileHomepage</default>
<default key="domain">%domain%</default>
<requirement key="domain">%domain%</requirement>
</route>

<route id="homepage" path="/">
<default key="_controller">AcmeDemoBundle:Main:homepage</default>
<default key="_controller">AppBundle:Main:homepage</default>
</route>
</routes>

Expand All @@ -334,14 +334,14 @@ instance, if you want to match both ``m.example.com`` and

$collection = new RouteCollection();
$collection->add('mobile_homepage', new Route('/', array(
'_controller' => 'AcmeDemoBundle:Main:mobileHomepage',
'_controller' => 'AppBundle:Main:mobileHomepage',
'domain' => '%domain%',
), array(
'domain' => '%domain%',
), array(), 'm.{domain}'));

$collection->add('homepage', new Route('/', array(
'_controller' => 'AcmeDemoBundle:Main:homepage',
'_controller' => 'AppBundle:Main:homepage',
)));

return $collection;
Expand All @@ -363,8 +363,8 @@ You can also set the host option on imported routes:

.. code-block:: php-annotations

// src/Acme/HelloBundle/Controller/MainController.php
namespace Acme\HelloBundle\Controller;
// src/AppBundle/Controller/MainController.php
namespace AppBundle\Controller;

use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
Expand All @@ -379,8 +379,8 @@ You can also set the host option on imported routes:

.. code-block:: yaml

acme_hello:
resource: '@AcmeHelloBundle/Resources/config/routing.yml'
app_hello:
resource: '@AppBundle/Resources/config/routing.yml'
host: "hello.example.com"

.. code-block:: xml
Expand All @@ -391,12 +391,12 @@ You can also set the host option on imported routes:
xsi:schemaLocation="http://symfony.com/schema/routing
http://symfony.com/schema/routing/routing-1.0.xsd">

<import resource="@AcmeHelloBundle/Resources/config/routing.xml" host="hello.example.com" />
<import resource="@AppBundle/Resources/config/routing.xml" host="hello.example.com" />
</routes>

.. code-block:: php

$collection = $loader->import("@AcmeHelloBundle/Resources/config/routing.php");
$collection = $loader->import("@AppBundle/Resources/config/routing.php");
$collection->setHost('hello.example.com');

return $collection;
Expand Down
1 change: 0 additions & 1 deletion security.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1289,7 +1289,6 @@ Authentication (Identifying/Logging in the User)
security/api_key_authentication
security/custom_authentication_provider
security/pre_authenticated
security/target_path
security/csrf_in_login_form
security/named_encoders
security/multiple_user_providers
Expand Down
Loading