Skip to content

Commit fc754d5

Browse files
Merge branch '2.7' into 2.8
* 2.7: [DI] minor docblock fixes
2 parents a945724 + 17773f1 commit fc754d5

File tree

6 files changed

+1
-60
lines changed

6 files changed

+1
-60
lines changed

Adapter/AdapterInterface.php

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -33,64 +33,46 @@ public function setFollowLinks($followLinks);
3333
public function setMode($mode);
3434

3535
/**
36-
* @param array $exclude
37-
*
3836
* @return $this
3937
*/
4038
public function setExclude(array $exclude);
4139

4240
/**
43-
* @param array $depths
44-
*
4541
* @return $this
4642
*/
4743
public function setDepths(array $depths);
4844

4945
/**
50-
* @param array $names
51-
*
5246
* @return $this
5347
*/
5448
public function setNames(array $names);
5549

5650
/**
57-
* @param array $notNames
58-
*
5951
* @return $this
6052
*/
6153
public function setNotNames(array $notNames);
6254

6355
/**
64-
* @param array $contains
65-
*
6656
* @return $this
6757
*/
6858
public function setContains(array $contains);
6959

7060
/**
71-
* @param array $notContains
72-
*
7361
* @return $this
7462
*/
7563
public function setNotContains(array $notContains);
7664

7765
/**
78-
* @param array $sizes
79-
*
8066
* @return $this
8167
*/
8268
public function setSizes(array $sizes);
8369

8470
/**
85-
* @param array $dates
86-
*
8771
* @return $this
8872
*/
8973
public function setDates(array $dates);
9074

9175
/**
92-
* @param array $filters
93-
*
9476
* @return $this
9577
*/
9678
public function setFilters(array $filters);
@@ -103,15 +85,11 @@ public function setFilters(array $filters);
10385
public function setSort($sort);
10486

10587
/**
106-
* @param array $paths
107-
*
10888
* @return $this
10989
*/
11090
public function setPath(array $paths);
11191

11292
/**
113-
* @param array $notPaths
114-
*
11593
* @return $this
11694
*/
11795
public function setNotPath(array $notPaths);

Exception/AdapterFailureException.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
*/
2525
class AdapterFailureException extends \RuntimeException implements ExceptionInterface
2626
{
27-
/**
28-
* @var \Symfony\Component\Finder\Adapter\AdapterInterface
29-
*/
3027
private $adapter;
3128

3229
/**

Exception/ShellCommandFailureException.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,8 @@
2323
*/
2424
class ShellCommandFailureException extends AdapterFailureException
2525
{
26-
/**
27-
* @var Command
28-
*/
2926
private $command;
3027

31-
/**
32-
* @param AdapterInterface $adapter
33-
* @param Command $command
34-
* @param \Exception|null $previous
35-
*/
3628
public function __construct(AdapterInterface $adapter, Command $command, \Exception $previous = null)
3729
{
3830
$this->command = $command;

Expression/Regex.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Regex implements ValueInterface
3030
private $pattern;
3131

3232
/**
33-
* @var array
33+
* @var string
3434
*/
3535
private $options;
3636

@@ -279,8 +279,6 @@ public function hasEndJoker()
279279
}
280280

281281
/**
282-
* @param array $replacement
283-
*
284282
* @return $this
285283
*/
286284
public function replaceJokers($replacement)

Finder.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,6 @@ public static function addVCSPattern($pattern)
483483
*
484484
* This can be slow as all the matching files and directories must be retrieved for comparison.
485485
*
486-
* @param \Closure $closure An anonymous function
487-
*
488486
* @return $this
489487
*
490488
* @see SortableIterator
@@ -590,8 +588,6 @@ public function sortByModifiedTime()
590588
* The anonymous function receives a \SplFileInfo and must return false
591589
* to remove files.
592590
*
593-
* @param \Closure $closure An anonymous function
594-
*
595591
* @return $this
596592
*
597593
* @see CustomFilterIterator
@@ -851,8 +847,6 @@ private function searchInDirectory($dir)
851847
}
852848

853849
/**
854-
* @param AdapterInterface $adapter
855-
*
856850
* @return AdapterInterface
857851
*/
858852
private function buildAdapter(AdapterInterface $adapter)

Shell/Command.php

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,15 @@
2020
*/
2121
class Command
2222
{
23-
/**
24-
* @var Command|null
25-
*/
2623
private $parent;
27-
28-
/**
29-
* @var array
30-
*/
3124
private $bits = array();
32-
33-
/**
34-
* @var array
35-
*/
3625
private $labels = array();
3726

3827
/**
3928
* @var \Closure|null
4029
*/
4130
private $errorHandler;
4231

43-
/**
44-
* @param Command|null $parent Parent command
45-
*/
4632
public function __construct(Command $parent = null)
4733
{
4834
$this->parent = $parent;
@@ -61,8 +47,6 @@ public function __toString()
6147
/**
6248
* Creates a new Command instance.
6349
*
64-
* @param Command|null $parent Parent command
65-
*
6650
* @return self
6751
*/
6852
public static function create(Command $parent = null)
@@ -220,8 +204,6 @@ public function length()
220204
}
221205

222206
/**
223-
* @param \Closure $errorHandler
224-
*
225207
* @return $this
226208
*/
227209
public function setErrorHandler(\Closure $errorHandler)

0 commit comments

Comments
 (0)