Merge branch '3.3' into 3.4

fabpot · fabpot · commit 83abe4b4b903 · 2017-09-11T14:23:16.000-07:00
* 3.3:
  fixed CS
  fixed CS
diff --git a/Definition.php b/Definition.php
@@ -703,7 +703,7 @@ public function isAbstract()
      *
      * @return $this
      *
-     * @throws InvalidArgumentException When the message template is invalid.
+     * @throws InvalidArgumentException when the message template is invalid
      */
     public function setDeprecated($status = true, $template = null)
     {
diff --git a/Loader/DirectoryLoader.php b/Loader/DirectoryLoader.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\DirectoryResource;
-
 /**
  * DirectoryLoader is a recursive loader to go through directories.
  *
diff --git a/Loader/IniFileLoader.php b/Loader/IniFileLoader.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\Util\XmlUtils;
 use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
 
diff --git a/Loader/PhpFileLoader.php b/Loader/PhpFileLoader.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader;
 
-use Symfony\Component\Config\Resource\FileResource;
-
 /**
  * PhpFileLoader loads service definitions from a PHP file.
  *

Original file line number	Diff line number	Diff line change
`@@ -703,7 +703,7 @@ public function isAbstract()`
`703`	`703`	`*`
`704`	`704`	`* @return $this`
`705`	`705`	`*`
`706`		`- * @throws InvalidArgumentException When the message template is invalid.`
	`706`	`+ * @throws InvalidArgumentException when the message template is invalid`
`707`	`707`	`*/`
`708`	`708`	`public function setDeprecated($status = true, $template = null)`
`709`	`709`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@`
`11`	`11`
`12`	`12`	`namespace Symfony\Component\DependencyInjection\Loader;`
`13`	`13`
`14`		`-use Symfony\Component\Config\Resource\DirectoryResource;`
`15`		`-`
`16`	`14`	`/**`
`17`	`15`	`* DirectoryLoader is a recursive loader to go through directories.`
`18`	`16`	`*`