merged branch nomack84/fixed_docblocks (PR #6067)

This PR was merged into the master branch.

Commits
-------

c78b46f Fixed docblocks

Discussion
----------

Fixed docblocks

src/Symfony/Bridge/Propel1/DataCollector/PropelDataCollector.php

@@ -25,12 +25,14 @@ class PropelDataCollector extends DataCollector
 {
     /**
      * Propel logger
+     *
      * @var \Symfony\Bridge\Propel1\Logger\PropelLogger
      */
     private $logger;
 
     /**
      * Propel configuration
+     *
      * @var \PropelConfiguration
      */
     protected $propelConfiguration;

src/Symfony/Bridge/Propel1/Security/User/PropelUserProvider.php

@@ -25,18 +25,21 @@ class PropelUserProvider implements UserProviderInterface
 {
     /**
      * A Model class name.
+     *
      * @var string
      */
     protected $class;
 
     /**
      * A Query class name.
+     *
      * @var string
      */
     protected $queryClass;
 
     /**
      * A property to use to retrieve the user.
+     *
      * @var string
      */
     protected $property;

src/Symfony/Bridge/Twig/Translation/TwigExtractor.php

@@ -39,6 +39,7 @@ class TwigExtractor implements ExtractorInterface
 
     /**
      * The twig environment.
+     *
      * @var \Twig_Environment
      */
     private $twig;