Merge branch '2.3' into 2.4

fabpot · fabpot · commit 7905f83e7914 · 2014-04-16T12:34:31.000+02:00
* 2.3:
  fixed types in phpdocs

Conflicts:
	src/Symfony/Bridge/Twig/TwigEngine.php
	src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
	src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
	src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
	src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
	src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
	src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
	src/Symfony/Component/Stopwatch/StopwatchEvent.php
	src/Symfony/Component/Templating/PhpEngine.php
diff --git a/DataCollector/SecurityDataCollector.php b/DataCollector/SecurityDataCollector.php
@@ -65,7 +65,7 @@ public function collect(Request $request, Response $response, \Exception $except
     /**
      * Checks if security is enabled.
      *
-     * @return Boolean true if security is enabled, false otherwise
+     * @return bool    true if security is enabled, false otherwise
      */
     public function isEnabled()
     {
@@ -95,7 +95,7 @@ public function getRoles()
     /**
      * Checks if the user is authenticated or not.
      *
-     * @return Boolean true if the user is authenticated, false otherwise
+     * @return bool    true if the user is authenticated, false otherwise
      */
     public function isAuthenticated()
     {
diff --git a/DependencyInjection/Security/Factory/AbstractFactory.php b/DependencyInjection/Security/Factory/AbstractFactory.php
@@ -146,7 +146,7 @@ protected function createEntryPoint($container, $id, $config, $defaultEntryPoint
      *
      * @param array $config
      *
-     * @return Boolean Whether a possibly configured RememberMeServices should be set for this listener
+     * @return bool    Whether a possibly configured RememberMeServices should be set for this listener
      */
     protected function isRememberMeAware($config)
     {

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function collect(Request $request, Response $response, \Exception $except`
`65`	`65`	`/**`
`66`	`66`	`* Checks if security is enabled.`
`67`	`67`	`*`
`68`		`- * @return Boolean true if security is enabled, false otherwise`
	`68`	`+ * @return bool true if security is enabled, false otherwise`
`69`	`69`	`*/`
`70`	`70`	`public function isEnabled()`
`71`	`71`	`{`
`@@ -95,7 +95,7 @@ public function getRoles()`
`95`	`95`	`/**`
`96`	`96`	`* Checks if the user is authenticated or not.`
`97`	`97`	`*`
`98`		`- * @return Boolean true if the user is authenticated, false otherwise`
	`98`	`+ * @return bool true if the user is authenticated, false otherwise`
`99`	`99`	`*/`
`100`	`100`	`public function isAuthenticated()`
`101`	`101`	`{`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ protected function createEntryPoint($container, $id, $config, $defaultEntryPoint`
`146`	`146`	`*`
`147`	`147`	`* @param array $config`
`148`	`148`	`*`
`149`		`- * @return Boolean Whether a possibly configured RememberMeServices should be set for this listener`
	`149`	`+ * @return bool Whether a possibly configured RememberMeServices should be set for this listener`
`150`	`150`	`*/`
`151`	`151`	`protected function isRememberMeAware($config)`
`152`	`152`	`{`