diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Finder] fix merge

Browse Source
This commit is contained in:
Nicolas Grekas 2018-09-05 19:51:25 +02:00
parent e4d7c74845
commit 55def78682
1 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/Symfony/Component/Finder/Finder.php
View File

@ -158,16 +158,10 @@ class Finder implements \IteratorAggregate, \Countable
*
* You can use patterns (delimited with / sign), globs or simple strings.
*
<<<<<<< HEAD
* $finder->name('*.php')
* $finder->name('/\.php$/') // same as above
* $finder->name('test.php')
* $finder->name(['test.py', 'test.php'])
=======
* $finder->name('*.php')
* $finder->name('/\.php$/') // same as above
* $finder->name('test.php')
>>>>>>> 4.1
* $finder->name(['test.py', 'test.php'])
*
* @param string|string[] $patterns A pattern (a regexp, a glob, or a string) or an array of patterns
*
@ -203,14 +197,9 @@ class Finder implements \IteratorAggregate, \Countable
*
* Strings or PCRE patterns can be used:
*
<<<<<<< HEAD
* $finder->contains('Lorem ipsum')
* $finder->contains('/Lorem ipsum/i')
* $finder->contains(['dolor', '/ipsum/i'])
=======
* $finder->contains('Lorem ipsum')
* $finder->contains('/Lorem ipsum/i')
>>>>>>> 4.1
* $finder->contains(['dolor', '/ipsum/i'])
*
* @param string|string[] $patterns A pattern (string or regexp) or an array of patterns
*
@ -230,14 +219,9 @@ class Finder implements \IteratorAggregate, \Countable
*
* Strings or PCRE patterns can be used:
*
<<<<<<< HEAD
* $finder->notContains('Lorem ipsum')
* $finder->notContains('/Lorem ipsum/i')
* $finder->notContains(['lorem', '/dolor/i'])
=======
* $finder->notContains('Lorem ipsum')
* $finder->notContains('/Lorem ipsum/i')
>>>>>>> 4.1
* $finder->notContains(['lorem', '/dolor/i'])
*
* @param string|string[] $patterns A pattern (string or regexp) or an array of patterns
*
@ -257,14 +241,9 @@ class Finder implements \IteratorAggregate, \Countable
*
* You can use patterns (delimited with / sign) or simple strings.
*
<<<<<<< HEAD
* $finder->path('some/special/dir')
* $finder->path('/some\/special\/dir/') // same as above
* $finder->path(['some dir', 'another/dir'])
=======
* $finder->path('some/special/dir')
* $finder->path('/some\/special\/dir/') // same as above
>>>>>>> 4.1
* $finder->path(['some dir', 'another/dir'])
*
* Use only / as dirname separator.
*
@ -286,14 +265,9 @@ class Finder implements \IteratorAggregate, \Countable
*
* You can use patterns (delimited with / sign) or simple strings.
*
<<<<<<< HEAD
* $finder->notPath('some/special/dir')
* $finder->notPath('/some\/special\/dir/') // same as above
* $finder->notPath(['some/file.txt', 'another/file.log'])
=======
* $finder->notPath('some/special/dir')
* $finder->notPath('/some\/special\/dir/') // same as above
>>>>>>> 4.1
* $finder->notPath(['some/file.txt', 'another/file.log'])
*
* Use only / as dirname separator.
*
@ -313,16 +287,10 @@ class Finder implements \IteratorAggregate, \Countable
/**
* Adds tests for file sizes.
*
<<<<<<< HEAD
* $finder->size('> 10K');
* $finder->size('<= 1Ki');
* $finder->size(4);
* $finder->size(['> 10K', '< 20K'])
=======
* $finder->size('> 10K');
* $finder->size('<= 1Ki');
* $finder->size(4);
>>>>>>> 4.1
* $finder->size(['> 10K', '< 20K'])
*
* @param string|int|string[]|int[] $sizes A size range string or an integer or an array of size ranges
*