From da57e09434ff4d21b4196ae7b7fa349e504bae96 Mon Sep 17 00:00:00 2001 From: Luuk Scholten Date: Thu, 30 Apr 2015 10:37:35 +0200 Subject: [PATCH 1/9] Fix contradicting merge policy rules --- contributing/code/core_team.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst index b5c3179c7ed..4068bcdb936 100644 --- a/contributing/code/core_team.rst +++ b/contributing/code/core_team.rst @@ -117,11 +117,10 @@ Pull Request Merging Policy A pull request **can be merged** if: -* Enough time was given for peer reviews (a few minutes for typos or minor - changes, at least 2 days for "regular" pull requests, and 4 days for pull - requests with "a significant impact"); +* It is a minor change [1]_; -* It is a minor change [1]_, regardless of the number of votes; +* Enough time was given for peer reviews (at least 2 days for "regular" + pull requests, and 4 days for pull requests with "a significant impact"); * At least the component's **Merger** or two other Core members voted ``+1`` and no Core member voted ``-1``. From 83e2616e0ba861976dbf2c506278ec773b264131 Mon Sep 17 00:00:00 2001 From: Thierry Thuon Date: Sat, 2 May 2015 11:04:54 +0200 Subject: [PATCH 2/9] Fix example namespace --- components/security/authentication.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/security/authentication.rst b/components/security/authentication.rst index bf29ac98287..00425a5d8f3 100644 --- a/components/security/authentication.rst +++ b/components/security/authentication.rst @@ -71,7 +71,7 @@ The default authentication manager is an instance of use Symfony\Component\Security\Core\Authentication\AuthenticationProviderManager; - // instances of Symfony\Component\Security\Core\Authentication\AuthenticationProviderInterface + // instances of Symfony\Component\Security\Core\Authentication\Provider\AuthenticationProviderInterface $providers = array(...); $authenticationManager = new AuthenticationProviderManager($providers); From b1e8d544faf87257563e8f9280dee9b621431fa3 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Thu, 7 May 2015 19:54:55 +0200 Subject: [PATCH 3/9] revert #4808 --- cookbook/email/email.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cookbook/email/email.rst b/cookbook/email/email.rst index 4d97ec31b62..5db319c538a 100644 --- a/cookbook/email/email.rst +++ b/cookbook/email/email.rst @@ -93,9 +93,8 @@ an email is pretty straightforward:: public function indexAction($name) { - $mailer = $this->get('mailer'); - $message = $mailer->createMessage() - ->setSubject('You have Completed Registration!') + $message = \Swift_Message::newInstance() + ->setSubject('Hello Email') ->setFrom('send@example.com') ->setTo('recipient@example.com') ->setBody( @@ -117,7 +116,7 @@ an email is pretty straightforward:: ) */ ; - $mailer->send($message); + $this->get('mailer')->send($message); return $this->render(...); } From fe77d49a8c1f4e2d03f5b58c5da9beca5bbc3c34 Mon Sep 17 00:00:00 2001 From: Carlos Buenosvinos Date: Wed, 22 Apr 2015 15:33:49 +0200 Subject: [PATCH 4/9] Order has one param without spaces --- cookbook/configuration/web_server_configuration.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst index 8aea0992cff..f00c0a2fbae 100644 --- a/cookbook/configuration/web_server_configuration.rst +++ b/cookbook/configuration/web_server_configuration.rst @@ -45,7 +45,7 @@ The **minimum configuration** to get your application running under Apache is: DocumentRoot /var/www/project/web AllowOverride All - Order allow, deny + Order Allow,Deny Allow from All @@ -76,7 +76,7 @@ and increase web server performance: DocumentRoot /var/www/project/web AllowOverride None - Order allow, deny + Order Allow,Deny Allow from All @@ -110,7 +110,7 @@ and increase web server performance: Using mod_php/PHP-CGI with Apache 2.4 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -In Apache 2.4, ``Order allow,deny`` has been replaced by ``Require all granted``. +In Apache 2.4, ``Order Allow,Deny`` has been replaced by ``Require all granted``. Hence, you need to modify your ``Directory`` permission settings as follows: .. code-block:: apache @@ -223,7 +223,7 @@ should look something like this: # enable the .htaccess rewrites AllowOverride All - Order allow, deny + Order Allow,Deny Allow from all From 22d003fa7932722cd0e229bb39a096593de9e0c1 Mon Sep 17 00:00:00 2001 From: "Mario A. Alvarez Garcia" Date: Wed, 6 May 2015 21:31:13 -0500 Subject: [PATCH 5/9] Fixed typo and removed outdated imports --- cookbook/configuration/using_parameters_in_dic.rst | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cookbook/configuration/using_parameters_in_dic.rst b/cookbook/configuration/using_parameters_in_dic.rst index c2eef5b0ab1..55d6656b244 100644 --- a/cookbook/configuration/using_parameters_in_dic.rst +++ b/cookbook/configuration/using_parameters_in_dic.rst @@ -93,9 +93,8 @@ Now, examine the results to see this closely: In order to support this use case, the ``Configuration`` class has to be injected with this parameter via the extension as follows:: - namespace Acme\DemoBundle\DependencyInjection; + namespace AppBundle\DependencyInjection; - use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition; use Symfony\Component\Config\Definition\Builder\TreeBuilder; use Symfony\Component\Config\Definition\ConfigurationInterface; @@ -130,9 +129,7 @@ And set it in the constructor of ``Configuration`` via the ``Extension`` class:: namespace AppBundle\DependencyInjection; use Symfony\Component\DependencyInjection\ContainerBuilder; - use Symfony\Component\DependencyInjection\Loader\XmlFileLoader; use Symfony\Component\HttpKernel\DependencyInjection\Extension; - use Symfony\Component\Config\FileLocator; class AppExtension extends Extension { From 909f94b09309debdfc6faa88a2623cffbe5ab18c Mon Sep 17 00:00:00 2001 From: assoum891 Date: Mon, 4 May 2015 08:45:16 +0100 Subject: [PATCH 6/9] Update http_cache.rst --- book/http_cache.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/http_cache.rst b/book/http_cache.rst index 46ac1dd1208..8b7661d8a94 100644 --- a/book/http_cache.rst +++ b/book/http_cache.rst @@ -384,7 +384,7 @@ This has two very reasonable consequences: * You should *never* change the state of your application when responding to a GET or HEAD request. Even if you don't use a gateway cache, the presence - of proxy caches mean that any GET or HEAD request may or may not actually + of proxy caches means that any GET or HEAD request may or may not actually hit your server; * Don't expect PUT, POST or DELETE methods to cache. These methods are meant From c8c3c99f3f86a7d9a4cf8e10a1b0206dadfc2599 Mon Sep 17 00:00:00 2001 From: Bram van Leur Date: Wed, 29 Apr 2015 12:09:28 +0200 Subject: [PATCH 7/9] Update _payload-option.rst.inc --- reference/constraints/_payload-option.rst.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/reference/constraints/_payload-option.rst.inc b/reference/constraints/_payload-option.rst.inc index 5ffe4f8664a..30c6d46bbc8 100644 --- a/reference/constraints/_payload-option.rst.inc +++ b/reference/constraints/_payload-option.rst.inc @@ -8,9 +8,9 @@ payload This option can be used to attach arbitrary domain-specific data to a constraint. The configured payload is not used by the Validator component, but its processing -is completely up to. +is completely up to you. -For example, you may want to used +For example, you may want to use :doc:`several error levels ` to present failed -constraint differently in the front-end depending on the severity of the +constraints differently in the front-end depending on the severity of the error. From 0f95bb5056511f09ded0c8a5a6c7906be20864c2 Mon Sep 17 00:00:00 2001 From: assoum891 Date: Sat, 2 May 2015 18:43:54 +0200 Subject: [PATCH 8/9] Update Uglifyjs.rst a spelling correction --- cookbook/assetic/uglifyjs.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/assetic/uglifyjs.rst b/cookbook/assetic/uglifyjs.rst index 533a005bd10..182447629bf 100644 --- a/cookbook/assetic/uglifyjs.rst +++ b/cookbook/assetic/uglifyjs.rst @@ -40,7 +40,7 @@ Local Installation ~~~~~~~~~~~~~~~~~~ It's also possible to install UglifyJS inside your project only, which is useful -when your project requires an specific UglifyJS version. To do this, install it +when your project requires a specific UglifyJS version. To do this, install it without the ``-g`` option and specify the path where to put the module: .. code-block:: bash From 11862655405cca134cd6afe3268f7c9de7028449 Mon Sep 17 00:00:00 2001 From: assoum891 Date: Sun, 3 May 2015 13:43:10 +0200 Subject: [PATCH 9/9] Update service_container.rst --- book/service_container.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/service_container.rst b/book/service_container.rst index 83c47a709e1..7d50adc019d 100644 --- a/book/service_container.rst +++ b/book/service_container.rst @@ -817,7 +817,7 @@ Core Symfony and Third-Party Bundle Services Since Symfony and all third-party bundles configure and retrieve their services via the container, you can easily access them or even use them in your own services. To keep things simple, Symfony by default does not require that -controllers be defined as services. Furthermore, Symfony injects the entire +controllers must be defined as services. Furthermore, Symfony injects the entire service container into your controller. For example, to handle the storage of information on a user's session, Symfony provides a ``session`` service, which you can access inside a standard controller as follows::