Merge branch '3.3' into 3.4

fabpot · fabpot · commit 1f10bc6dbbd3 · 2017-09-11T13:45:17.000-07:00
* 3.3:
  [CS] Apply phpdoc_annotation_without_dot
  bumped Symfony version to 3.3.10
  updated VERSION for 3.3.9
  updated CHANGELOG for 3.3.9
  [DomCrawler] Fix conversion to int on GetPhpFiles
  Remove `protected_to_private` rule.
  Filtering empty uuids in ORMQueryBuilderLoader.
diff --git a/Compiler/CheckCircularReferencesPass.php b/Compiler/CheckCircularReferencesPass.php
@@ -51,7 +51,7 @@ public function process(ContainerBuilder $container)
      *
      * @param ServiceReferenceGraphEdge[] $edges An array of Edges
      *
-     * @throws ServiceCircularReferenceException When a circular reference is found.
+     * @throws ServiceCircularReferenceException when a circular reference is found
      */
     private function checkOutEdges(array $edges)
     {
diff --git a/Definition.php b/Definition.php
@@ -123,7 +123,7 @@ public function getFactory()
      *
      * @return $this
      *
-     * @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.
+     * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals
      */
     public function setDecoratedService($id, $renamedId = null, $priority = 0)
     {
diff --git a/ParameterBag/ParameterBag.php b/ParameterBag/ParameterBag.php
@@ -169,7 +169,7 @@ public function resolve()
      *
      * @throws ParameterNotFoundException          if a placeholder references a parameter that does not exist
      * @throws ParameterCircularReferenceException if a circular reference if detected
-     * @throws RuntimeException                    when a given parameter has a type problem.
+     * @throws RuntimeException                    when a given parameter has a type problem
      */
     public function resolveValue($value, array $resolving = array())
     {
@@ -199,7 +199,7 @@ public function resolveValue($value, array $resolving = array())
      *
      * @throws ParameterNotFoundException          if a placeholder references a parameter that does not exist
      * @throws ParameterCircularReferenceException if a circular reference if detected
-     * @throws RuntimeException                    when a given parameter has a type problem.
+     * @throws RuntimeException                    when a given parameter has a type problem
      */
     public function resolveString($value, array $resolving = array())
     {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function process(ContainerBuilder $container)`
`51`	`51`	`*`
`52`	`52`	`* @param ServiceReferenceGraphEdge[] $edges An array of Edges`
`53`	`53`	`*`
`54`		`- * @throws ServiceCircularReferenceException When a circular reference is found.`
	`54`	`+ * @throws ServiceCircularReferenceException when a circular reference is found`
`55`	`55`	`*/`
`56`	`56`	`private function checkOutEdges(array $edges)`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public function getFactory()`
`123`	`123`	`*`
`124`	`124`	`* @return $this`
`125`	`125`	`*`
`126`		`- * @throws InvalidArgumentException In case the decorated service id and the new decorated service id are equals.`
	`126`	`+ * @throws InvalidArgumentException in case the decorated service id and the new decorated service id are equals`
`127`	`127`	`*/`
`128`	`128`	`public function setDecoratedService($id, $renamedId = null, $priority = 0)`
`129`	`129`	`{`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public function resolve()`
`169`	`169`	`*`
`170`	`170`	`* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist`
`171`	`171`	`* @throws ParameterCircularReferenceException if a circular reference if detected`
`172`		`- * @throws RuntimeException when a given parameter has a type problem.`
	`172`	`+ * @throws RuntimeException when a given parameter has a type problem`
`173`	`173`	`*/`
`174`	`174`	`public function resolveValue($value, array $resolving = array())`
`175`	`175`	`{`
`@@ -199,7 +199,7 @@ public function resolveValue($value, array $resolving = array())`
`199`	`199`	`*`
`200`	`200`	`* @throws ParameterNotFoundException if a placeholder references a parameter that does not exist`
`201`	`201`	`* @throws ParameterCircularReferenceException if a circular reference if detected`
`202`		`- * @throws RuntimeException when a given parameter has a type problem.`
	`202`	`+ * @throws RuntimeException when a given parameter has a type problem`
`203`	`203`	`*/`
`204`	`204`	`public function resolveString($value, array $resolving = array())`
`205`	`205`	`{`