Skip to content

Commit 4ce0d99

Browse files
TobionTobion
committed
Merge branch '2.3' into 2.7
Conflicts: src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php src/Symfony/Component/ClassLoader/DebugClassLoader.php src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Console/Command/Command.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/DefinitionDecorator.php src/Symfony/Component/EventDispatcher/Event.php src/Symfony/Component/Filesystem/Exception/IOException.php src/Symfony/Component/HttpFoundation/File/File.php src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php src/Symfony/Component/HttpFoundation/Session/SessionInterface.php src/Symfony/Component/HttpFoundation/StreamedResponse.php src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php src/Symfony/Component/HttpKernel/HttpKernel.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/HttpKernel/KernelInterface.php src/Symfony/Component/HttpKernel/Log/LoggerInterface.php src/Symfony/Component/HttpKernel/Log/NullLogger.php src/Symfony/Component/Process/Process.php src/Symfony/Component/Routing/RequestContext.php src/Symfony/Component/Routing/Route.php src/Symfony/Component/Templating/EngineInterface.php src/Symfony/Component/Templating/PhpEngine.php src/Symfony/Component/Templating/TemplateNameParser.php src/Symfony/Component/Templating/TemplateReference.php src/Symfony/Component/Templating/TemplateReferenceInterface.php src/Symfony/Component/Translation/IdentityTranslator.php src/Symfony/Component/Translation/Translator.php src/Symfony/Component/Validator/ConstraintViolationInterface.php src/Symfony/Component/Validator/Constraints/False.php src/Symfony/Component/Validator/Constraints/FalseValidator.php src/Symfony/Component/Validator/Constraints/GroupSequence.php src/Symfony/Component/Validator/Constraints/Image.php src/Symfony/Component/Validator/Constraints/Null.php src/Symfony/Component/Validator/Constraints/NullValidator.php src/Symfony/Component/Validator/Constraints/True.php src/Symfony/Component/Validator/Constraints/TrueValidator.php src/Symfony/Component/Validator/ExecutionContextInterface.php src/Symfony/Component/Validator/ValidatorInterface.php
2 parents c687b65 + ef938da commit 4ce0d99

File tree

1 file changed

+0
-42
lines changed

1 file changed

+0
-42
lines changed

‎Finder.php

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
* $finder = Finder::create()->files()->name('*.php')->in(__DIR__);
4040
*
4141
* @author Fabien Potencier <[email protected]>
42-
*
43-
* @api
4442
*/
4543
class Finder implements \IteratorAggregate, \Countable
4644
{
@@ -88,8 +86,6 @@ public function __construct()
8886
* Creates a new Finder.
8987
*
9088
* @return Finder A new Finder instance
91-
*
92-
* @api
9389
*/
9490
public static function create()
9591
{
@@ -176,8 +172,6 @@ public function getAdapters()
176172
* Restricts the matching to directories only.
177173
*
178174
* @return Finder The current Finder instance
179-
*
180-
* @api
181175
*/
182176
public function directories()
183177
{
@@ -190,8 +184,6 @@ public function directories()
190184
* Restricts the matching to files only.
191185
*
192186
* @return Finder The current Finder instance
193-
*
194-
* @api
195187
*/
196188
public function files()
197189
{
@@ -214,8 +206,6 @@ public function files()
214206
*
215207
* @see DepthRangeFilterIterator
216208
* @see NumberComparator
217-
*
218-
* @api
219209
*/
220210
public function depth($level)
221211
{
@@ -241,8 +231,6 @@ public function depth($level)
241231
* @see strtotime
242232
* @see DateRangeFilterIterator
243233
* @see DateComparator
244-
*
245-
* @api
246234
*/
247235
public function date($date)
248236
{
@@ -265,8 +253,6 @@ public function date($date)
265253
* @return Finder The current Finder instance
266254
*
267255
* @see FilenameFilterIterator
268-
*
269-
* @api
270256
*/
271257
public function name($pattern)
272258
{
@@ -283,8 +269,6 @@ public function name($pattern)
283269
* @return Finder The current Finder instance
284270
*
285271
* @see FilenameFilterIterator
286-
*
287-
* @api
288272
*/
289273
public function notName($pattern)
290274
{
@@ -394,8 +378,6 @@ public function notPath($pattern)
394378
*
395379
* @see SizeRangeFilterIterator
396380
* @see NumberComparator
397-
*
398-
* @api
399381
*/
400382
public function size($size)
401383
{
@@ -412,8 +394,6 @@ public function size($size)
412394
* @return Finder The current Finder instance
413395
*
414396
* @see ExcludeDirectoryFilterIterator
415-
*
416-
* @api
417397
*/
418398
public function exclude($dirs)
419399
{
@@ -430,8 +410,6 @@ public function exclude($dirs)
430410
* @return Finder The current Finder instance
431411
*
432412
* @see ExcludeDirectoryFilterIterator
433-
*
434-
* @api
435413
*/
436414
public function ignoreDotFiles($ignoreDotFiles)
437415
{
@@ -452,8 +430,6 @@ public function ignoreDotFiles($ignoreDotFiles)
452430
* @return Finder The current Finder instance
453431
*
454432
* @see ExcludeDirectoryFilterIterator
455-
*
456-
* @api
457433
*/
458434
public function ignoreVCS($ignoreVCS)
459435
{
@@ -494,8 +470,6 @@ public static function addVCSPattern($pattern)
494470
* @return Finder The current Finder instance
495471
*
496472
* @see SortableIterator
497-
*
498-
* @api
499473
*/
500474
public function sort(\Closure $closure)
501475
{
@@ -512,8 +486,6 @@ public function sort(\Closure $closure)
512486
* @return Finder The current Finder instance
513487
*
514488
* @see SortableIterator
515-
*
516-
* @api
517489
*/
518490
public function sortByName()
519491
{
@@ -530,8 +502,6 @@ public function sortByName()
530502
* @return Finder The current Finder instance
531503
*
532504
* @see SortableIterator
533-
*
534-
* @api
535505
*/
536506
public function sortByType()
537507
{
@@ -550,8 +520,6 @@ public function sortByType()
550520
* @return Finder The current Finder instance
551521
*
552522
* @see SortableIterator
553-
*
554-
* @api
555523
*/
556524
public function sortByAccessedTime()
557525
{
@@ -572,8 +540,6 @@ public function sortByAccessedTime()
572540
* @return Finder The current Finder instance
573541
*
574542
* @see SortableIterator
575-
*
576-
* @api
577543
*/
578544
public function sortByChangedTime()
579545
{
@@ -592,8 +558,6 @@ public function sortByChangedTime()
592558
* @return Finder The current Finder instance
593559
*
594560
* @see SortableIterator
595-
*
596-
* @api
597561
*/
598562
public function sortByModifiedTime()
599563
{
@@ -613,8 +577,6 @@ public function sortByModifiedTime()
613577
* @return Finder The current Finder instance
614578
*
615579
* @see CustomFilterIterator
616-
*
617-
* @api
618580
*/
619581
public function filter(\Closure $closure)
620582
{
@@ -627,8 +589,6 @@ public function filter(\Closure $closure)
627589
* Forces the following of symlinks.
628590
*
629591
* @return Finder The current Finder instance
630-
*
631-
* @api
632592
*/
633593
public function followLinks()
634594
{
@@ -661,8 +621,6 @@ public function ignoreUnreadableDirs($ignore = true)
661621
* @return Finder The current Finder instance
662622
*
663623
* @throws \InvalidArgumentException if one of the directories does not exist
664-
*
665-
* @api
666624
*/
667625
public function in($dirs)
668626
{

0 commit comments

Comments
 (0)