From 112184bcca1c43c6760de303dc3a3446caa3cf17 Mon Sep 17 00:00:00 2001 From: Oskar Stark Date: Thu, 11 Apr 2019 22:19:32 +0200 Subject: [PATCH] small improvements --- components/mime.rst | 12 ++-- components/property_access.rst | 2 +- components/routing.rst | 2 +- configuration/environment_variables.rst | 4 +- routing.rst | 2 +- service_container/configurators.rst | 88 +++++++++++++------------ service_container/factories.rst | 4 +- 7 files changed, 58 insertions(+), 56 deletions(-) diff --git a/components/mime.rst b/components/mime.rst index 34b06cd40de..62bb707ebdb 100644 --- a/components/mime.rst +++ b/components/mime.rst @@ -156,7 +156,7 @@ images inside the HTML contents:: ->embed(fopen('/path/to/images/logo.png', 'r'), 'logo') ->embedFromPath('/path/to/images/signature.gif', 'footer-signature') // reference images using the syntax 'cid:' + "image embed name" - ->html(' ... ...') + ->html(' ... ...') ; File Attachments @@ -251,7 +251,7 @@ email multiparts:: $textContent = new TextPart('Lorem ipsum...'); $htmlContent = new TextPart(sprintf( - '

Lorem ipsum

...

', $imageCid + '

Lorem ipsum

...

', $imageCid ), 'html'); $bodyContent = new AlternativePart($textContent, $htmlContent); $body = new RelatedPart($bodyContent, $embeddedImage); @@ -390,7 +390,7 @@ the ``TemplatedEmail`` class:: Embedding Images in Emails with Twig ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Instead of dealing with the ```` syntax explained in the +Instead of dealing with the ```` syntax explained in the previous sections, when using Twig to render email contents you can refer to image files as usual. First, define a Twig namespace called ``images`` to simplify things later:: @@ -407,7 +407,7 @@ the email contents: .. code-block:: html+twig {# '@images/' refers to the Twig namespace defined earlier #} - +

Welcome {{ username }}!

{# ... #} @@ -495,7 +495,7 @@ Now, enable the extension (this is done automatically in Symfony applications):: Finally, use the ``markdown`` filter to convert parts or the entire email contents from Markdown to HTML: -.. code-block:: html+twig +.. code-block:: twig {% filter markdown %} Welcome {{ username }}! @@ -560,7 +560,7 @@ contents from Inky to HTML: You can combine all filters to create complex email messages: -.. code-block:: html+twig +.. code-block:: twig {% filter inky|inline_css(source('@zurb/stylesheets/main.css')) %} {# ... #} diff --git a/components/property_access.rst b/components/property_access.rst index e0b13a6dca8..c362da2da22 100644 --- a/components/property_access.rst +++ b/components/property_access.rst @@ -176,7 +176,7 @@ Accessing a non Existing Property Path By default a :class:`Symfony\\Component\\PropertyAccess\\Exception\\NoSuchPropertyException` is thrown if the property path passed to :method:`PropertyAccessor::getValue` -does not exist. You can change this behaviour using the +does not exist. You can change this behavior using the :method:`Symfony\\Component\\PropertyAccess\\PropertyAccessorBuilder::disableExceptionOnInvalidPropertyPath` method:: diff --git a/components/routing.rst b/components/routing.rst index 4bd5297e858..2eaf0fbf294 100644 --- a/components/routing.rst +++ b/components/routing.rst @@ -482,7 +482,7 @@ routes with UTF-8 characters: + https://symfony.com/schema/routing/routing-1.0.xsd"> + https://symfony.com/schema/dic/services/services-1.0.xsd"> @@ -695,7 +695,7 @@ Symfony provides the following env var processors: + https://symfony.com/schema/dic/services/services-1.0.xsd"> diff --git a/routing.rst b/routing.rst index 696d2a4e5cf..b46ac124b93 100644 --- a/routing.rst +++ b/routing.rst @@ -805,7 +805,7 @@ You can also use special attributes to configure them (except ``_fragment``): + https://symfony.com/schema/routing/routing-1.0.xsd"> `. -.. code-block:: yaml +.. configuration-block:: - # config/services.yaml - services: - # ... + .. code-block:: yaml - # registers all classes as services, including App\Mail\EmailConfigurator - App\: - resource: '../src/*' + # config/services.yaml + services: # ... - # override the services to set the configurator - App\Mail\NewsletterManager: - configurator: '@App\Mail\EmailConfigurator' + # registers all classes as services, including App\Mail\EmailConfigurator + App\: + resource: '../src/*' + # ... - App\Mail\GreetingCardManager: - configurator: '@App\Mail\EmailConfigurator' + # override the services to set the configurator + App\Mail\NewsletterManager: + configurator: '@App\Mail\EmailConfigurator' -.. code-block:: xml + App\Mail\GreetingCardManager: + configurator: '@App\Mail\EmailConfigurator' - - - + .. code-block:: xml - - + + + - - - + + - - - - - + + + -.. code-block:: php + + + + + - // config/services.php - use App\Mail\GreetingCardManager; - use App\Mail\NewsletterManager; - use Symfony\Component\DependencyInjection\Definition; - use Symfony\Component\DependencyInjection\Reference; + .. code-block:: php - // Same as before - $definition = new Definition(); + // config/services.php + use App\Mail\GreetingCardManager; + use App\Mail\NewsletterManager; + use Symfony\Component\DependencyInjection\Definition; + use Symfony\Component\DependencyInjection\Reference; - $definition->setAutowired(true); + // Same as before + $definition = new Definition(); - $this->registerClasses($definition, 'App\\', '../src/*'); + $definition->setAutowired(true); - $container->getDefinition(NewsletterManager::class) - ->setConfigurator(new Reference(EmailConfigurator::class)); + $this->registerClasses($definition, 'App\\', '../src/*'); + + $container->getDefinition(NewsletterManager::class) + ->setConfigurator(new Reference(EmailConfigurator::class)); - $container->getDefinition(GreetingCardManager::class) - ->setConfigurator(new Reference(EmailConfigurator::class)); + $container->getDefinition(GreetingCardManager::class) + ->setConfigurator(new Reference(EmailConfigurator::class)); That's it! When requesting the ``App\Mail\NewsletterManager`` or ``App\Mail\GreetingCardManager`` service, the created instance will first be diff --git a/service_container/factories.rst b/service_container/factories.rst index e121f43aea9..3fc4a979336 100644 --- a/service_container/factories.rst +++ b/service_container/factories.rst @@ -202,14 +202,14 @@ method name, just as routes can reference + https://symfony.com/schema/dic/services/services-1.0.xsd"> - +