Skip to content

Commit 1c53b34

Browse files
TobionTobion
committed
Merge branch '2.8'
Conflicts: composer.json src/Symfony/Bundle/FrameworkBundle/Command/RouterApacheDumperCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php src/Symfony/Bundle/SecurityBundle/Resources/config/security.xml src/Symfony/Bundle/SecurityBundle/Resources/config/security_listeners.xml src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php src/Symfony/Component/ClassLoader/ApcUniversalClassLoader.php src/Symfony/Component/ClassLoader/DebugClassLoader.php src/Symfony/Component/ClassLoader/UniversalClassLoader.php src/Symfony/Component/Console/Input/StringInput.php src/Symfony/Component/Debug/DebugClassLoader.php src/Symfony/Component/DependencyInjection/Container.php src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/DependencyInjection/ContainerInterface.php src/Symfony/Component/DependencyInjection/Definition.php src/Symfony/Component/DependencyInjection/DefinitionDecorator.php src/Symfony/Component/DependencyInjection/Scope.php src/Symfony/Component/DependencyInjection/ScopeInterface.php src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/Event.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/Security/Core/composer.json src/Symfony/Component/Security/Resources/translations/security.tr.xlf src/Symfony/Component/Security/composer.json src/Symfony/Component/Translation/Translator.php
2 parents bd4dbf9 + dc8feb8 commit 1c53b34

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
@@ -34,8 +34,6 @@
3434
* $finder = Finder::create()->files()->name('*.php')->in(__DIR__);
3535
*
3636
* @author Fabien Potencier <[email protected]>
37-
*
38-
* @api
3937
*/
4038
class Finder implements \IteratorAggregate, \Countable
4139
{
@@ -75,8 +73,6 @@ public function __construct()
7573
* Creates a new Finder.
7674
*
7775
* @return Finder A new Finder instance
78-
*
79-
* @api
8076
*/
8177
public static function create()
8278
{
@@ -87,8 +83,6 @@ public static function create()
8783
* Restricts the matching to directories only.
8884
*
8985
* @return Finder The current Finder instance
90-
*
91-
* @api
9286
*/
9387
public function directories()
9488
{
@@ -101,8 +95,6 @@ public function directories()
10195
* Restricts the matching to files only.
10296
*
10397
* @return Finder The current Finder instance
104-
*
105-
* @api
10698
*/
10799
public function files()
108100
{
@@ -125,8 +117,6 @@ public function files()
125117
*
126118
* @see DepthRangeFilterIterator
127119
* @see NumberComparator
128-
*
129-
* @api
130120
*/
131121
public function depth($level)
132122
{
@@ -152,8 +142,6 @@ public function depth($level)
152142
* @see strtotime
153143
* @see DateRangeFilterIterator
154144
* @see DateComparator
155-
*
156-
* @api
157145
*/
158146
public function date($date)
159147
{
@@ -176,8 +164,6 @@ public function date($date)
176164
* @return Finder The current Finder instance
177165
*
178166
* @see FilenameFilterIterator
179-
*
180-
* @api
181167
*/
182168
public function name($pattern)
183169
{
@@ -194,8 +180,6 @@ public function name($pattern)
194180
* @return Finder The current Finder instance
195181
*
196182
* @see FilenameFilterIterator
197-
*
198-
* @api
199183
*/
200184
public function notName($pattern)
201185
{
@@ -305,8 +289,6 @@ public function notPath($pattern)
305289
*
306290
* @see SizeRangeFilterIterator
307291
* @see NumberComparator
308-
*
309-
* @api
310292
*/
311293
public function size($size)
312294
{
@@ -323,8 +305,6 @@ public function size($size)
323305
* @return Finder The current Finder instance
324306
*
325307
* @see ExcludeDirectoryFilterIterator
326-
*
327-
* @api
328308
*/
329309
public function exclude($dirs)
330310
{
@@ -341,8 +321,6 @@ public function exclude($dirs)
341321
* @return Finder The current Finder instance
342322
*
343323
* @see ExcludeDirectoryFilterIterator
344-
*
345-
* @api
346324
*/
347325
public function ignoreDotFiles($ignoreDotFiles)
348326
{
@@ -363,8 +341,6 @@ public function ignoreDotFiles($ignoreDotFiles)
363341
* @return Finder The current Finder instance
364342
*
365343
* @see ExcludeDirectoryFilterIterator
366-
*
367-
* @api
368344
*/
369345
public function ignoreVCS($ignoreVCS)
370346
{
@@ -405,8 +381,6 @@ public static function addVCSPattern($pattern)
405381
* @return Finder The current Finder instance
406382
*
407383
* @see SortableIterator
408-
*
409-
* @api
410384
*/
411385
public function sort(\Closure $closure)
412386
{
@@ -423,8 +397,6 @@ public function sort(\Closure $closure)
423397
* @return Finder The current Finder instance
424398
*
425399
* @see SortableIterator
426-
*
427-
* @api
428400
*/
429401
public function sortByName()
430402
{
@@ -441,8 +413,6 @@ public function sortByName()
441413
* @return Finder The current Finder instance
442414
*
443415
* @see SortableIterator
444-
*
445-
* @api
446416
*/
447417
public function sortByType()
448418
{
@@ -461,8 +431,6 @@ public function sortByType()
461431
* @return Finder The current Finder instance
462432
*
463433
* @see SortableIterator
464-
*
465-
* @api
466434
*/
467435
public function sortByAccessedTime()
468436
{
@@ -483,8 +451,6 @@ public function sortByAccessedTime()
483451
* @return Finder The current Finder instance
484452
*
485453
* @see SortableIterator
486-
*
487-
* @api
488454
*/
489455
public function sortByChangedTime()
490456
{
@@ -503,8 +469,6 @@ public function sortByChangedTime()
503469
* @return Finder The current Finder instance
504470
*
505471
* @see SortableIterator
506-
*
507-
* @api
508472
*/
509473
public function sortByModifiedTime()
510474
{
@@ -524,8 +488,6 @@ public function sortByModifiedTime()
524488
* @return Finder The current Finder instance
525489
*
526490
* @see CustomFilterIterator
527-
*
528-
* @api
529491
*/
530492
public function filter(\Closure $closure)
531493
{
@@ -538,8 +500,6 @@ public function filter(\Closure $closure)
538500
* Forces the following of symlinks.
539501
*
540502
* @return Finder The current Finder instance
541-
*
542-
* @api
543503
*/
544504
public function followLinks()
545505
{
@@ -572,8 +532,6 @@ public function ignoreUnreadableDirs($ignore = true)
572532
* @return Finder The current Finder instance
573533
*
574534
* @throws \InvalidArgumentException if one of the directories does not exist
575-
*
576-
* @api
577535
*/
578536
public function in($dirs)
579537
{

0 commit comments

Comments
 (0)