Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit f8b4989e626e · 2017-11-05T16:25:56.000+01:00
* 2.7:
  [Intl] Make intl-data tests pass and save language aliases again
  Remove useless docblocks
diff --git a/Adapter/AbstractFindAdapter.php b/Adapter/AbstractFindAdapter.php
@@ -30,9 +30,6 @@
  */
 abstract class AbstractFindAdapter extends AbstractAdapter
 {
-    /**
-     * @var Shell
-     */
     protected $shell;
 
     public function __construct()
diff --git a/Expression/Glob.php b/Expression/Glob.php
@@ -20,9 +20,6 @@
  */
 class Glob implements ValueInterface
 {
-    /**
-     * @var string
-     */
     private $pattern;
 
     /**
diff --git a/Tests/Iterator/MockSplFileInfo.php b/Tests/Iterator/MockSplFileInfo.php
@@ -13,9 +13,9 @@
 
 class MockSplFileInfo extends \SplFileInfo
 {
-    const   TYPE_DIRECTORY = 1;
-    const   TYPE_FILE = 2;
-    const   TYPE_UNKNOWN = 3;
+    const TYPE_DIRECTORY = 1;
+    const TYPE_FILE = 2;
+    const TYPE_UNKNOWN = 3;
 
     private $contents = null;
     private $mode = null;

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,6 @@`
`30`	`30`	`*/`
`31`	`31`	`abstract class AbstractFindAdapter extends AbstractAdapter`
`32`	`32`	`{`
`33`		`- /**`
`34`		`- * @var Shell`
`35`		`- */`
`36`	`33`	`protected $shell;`
`37`	`34`
`38`	`35`	`public function __construct()`
Original file line number	Diff line number	Diff line change
`@@ -20,9 +20,6 @@`
`20`	`20`	`*/`
`21`	`21`	`class Glob implements ValueInterface`
`22`	`22`	`{`
`23`		`- /**`
`24`		`- * @var string`
`25`		`- */`
`26`	`23`	`private $pattern;`
`27`	`24`
`28`	`25`	`/**`