Merge branch '2.8' into 3.3

nicolas-grekas · nicolas-grekas · commit 08182c7659d4 · 2017-10-24T16:05:06.000+02:00
* 2.8:
  [DI] minor docblock fixes
diff --git a/Catalogue/AbstractOperation.php b/Catalogue/AbstractOperation.php
@@ -26,19 +26,8 @@
  */
 abstract class AbstractOperation implements OperationInterface
 {
-    /**
-     * @var MessageCatalogueInterface The source catalogue
-     */
     protected $source;
-
-    /**
-     * @var MessageCatalogueInterface The target catalogue
-     */
     protected $target;
-
-    /**
-     * @var MessageCatalogue The result catalogue
-     */
     protected $result;
 
     /**
@@ -71,9 +60,6 @@ abstract class AbstractOperation implements OperationInterface
     protected $messages;
 
     /**
-     * @param MessageCatalogueInterface $source The source catalogue
-     * @param MessageCatalogueInterface $target The target catalogue
-     *
      * @throws LogicException
      */
     public function __construct(MessageCatalogueInterface $source, MessageCatalogueInterface $target)
diff --git a/DataCollector/TranslationDataCollector.php b/DataCollector/TranslationDataCollector.php
@@ -22,14 +22,8 @@
  */
 class TranslationDataCollector extends DataCollector implements LateDataCollectorInterface
 {
-    /**
-     * @var DataCollectorTranslator
-     */
     private $translator;
 
-    /**
-     * @param DataCollectorTranslator $translator
-     */
     public function __construct(DataCollectorTranslator $translator)
     {
         $this->translator = $translator;
diff --git a/DataCollectorTranslator.php b/DataCollectorTranslator.php
@@ -27,9 +27,6 @@ class DataCollectorTranslator implements TranslatorInterface, TranslatorBagInter
      */
     private $translator;
 
-    /**
-     * @var array
-     */
     private $messages = array();
 
     /**
diff --git a/Loader/PoFileLoader.php b/Loader/PoFileLoader.php
@@ -123,9 +123,6 @@ protected function loadResource($resource)
      *
      * A .po file could contain by error missing plural indexes. We need to
      * fix these before saving them.
-     *
-     * @param array $messages
-     * @param array $item
      */
     private function addMessage(array &$messages, array $item)
     {
diff --git a/MessageCatalogueInterface.php b/MessageCatalogueInterface.php
@@ -104,8 +104,6 @@ public function add($messages, $domain = 'messages');
      * Merges translations from the given Catalogue into the current one.
      *
      * The two catalogues must have the same locale.
-     *
-     * @param self $catalogue
      */
     public function addCatalogue(MessageCatalogueInterface $catalogue);
 
@@ -114,8 +112,6 @@ public function addCatalogue(MessageCatalogueInterface $catalogue);
      * only when the translation does not exist.
      *
      * This is used to provide default translations when they do not exist for the current locale.
-     *
-     * @param self $catalogue
      */
     public function addFallbackCatalogue(MessageCatalogueInterface $catalogue);
 
@@ -135,8 +131,6 @@ public function getResources();
 
     /**
      * Adds a resource for this collection.
-     *
-     * @param ResourceInterface $resource A resource instance
      */
     public function addResource(ResourceInterface $resource);
 }
diff --git a/Translator.php b/Translator.php
@@ -85,11 +85,6 @@ public function __construct($locale, MessageSelector $selector = null, $cacheDir
         $this->debug = $debug;
     }
 
-    /**
-     * Sets the ConfigCache factory to use.
-     *
-     * @param ConfigCacheFactoryInterface $configCacheFactory
-     */
     public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)
     {
         $this->configCacheFactory = $configCacheFactory;
diff --git a/Writer/TranslationWriter.php b/Writer/TranslationWriter.php
@@ -23,11 +23,6 @@
  */
 class TranslationWriter
 {
-    /**
-     * Dumpers used for export.
-     *
-     * @var array
-     */
     private $dumpers = array();
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,8 @@`
`22`	`22`	`*/`
`23`	`23`	`class TranslationDataCollector extends DataCollector implements LateDataCollectorInterface`
`24`	`24`	`{`
`25`		`- /**`
`26`		`- * @var DataCollectorTranslator`
`27`		`- */`
`28`	`25`	`private $translator;`
`29`	`26`
`30`		`- /**`
`31`		`- * @param DataCollectorTranslator $translator`
`32`		`- */`
`33`	`27`	`public function __construct(DataCollectorTranslator $translator)`
`34`	`28`	`{`
`35`	`29`	`$this->translator = $translator;`
Original file line number	Diff line number	Diff line change
`@@ -123,9 +123,6 @@ protected function loadResource($resource)`
`123`	`123`	`*`
`124`	`124`	`* A .po file could contain by error missing plural indexes. We need to`
`125`	`125`	`* fix these before saving them.`
`126`		`- *`
`127`		`- * @param array $messages`
`128`		`- * @param array $item`
`129`	`126`	`*/`
`130`	`127`	`private function addMessage(array &$messages, array $item)`
`131`	`128`	`{`
Original file line number	Diff line number	Diff line change
`@@ -85,11 +85,6 @@ public function __construct($locale, MessageSelector $selector = null, $cacheDir`
`85`	`85`	`$this->debug = $debug;`
`86`	`86`	`}`
`87`	`87`
`88`		`- /**`
`89`		`- * Sets the ConfigCache factory to use.`
`90`		`- *`
`91`		`- * @param ConfigCacheFactoryInterface $configCacheFactory`
`92`		`- */`
`93`	`88`	`public function setConfigCacheFactory(ConfigCacheFactoryInterface $configCacheFactory)`
`94`	`89`	`{`
`95`	`90`	`$this->configCacheFactory = $configCacheFactory;`