[2.2][Finder] ->pathContains(), ->pathNotContains() methods (with basic tests) #4739

gajdaw · 2012-07-04T09:12:50Z

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass:
Fixes the following tickets: #4581
Todo: -
License of the code: MIT
Documentation PR: -

Two additional methods: Finder->path() and Finder->notPath().
They allow filtering with paths, e.g. ->path('some/special/dir').

fabpot · 2012-07-18T14:50:37Z

src/Symfony/Component/Finder/Iterator/PathFilterIterator.php

+        if ($this->isRegex($str)) {
+            return $str;
+        }
+        return '/' . str_replace('/', '\/', $str) . '/';


You should use preg_quote to escape the string.

travisbot · 2012-08-01T14:50:33Z

This pull request fails (merged eddb35cd into b1618d2).

travisbot · 2012-08-01T15:02:39Z

This pull request passes (merged a39d8954 into b1618d2).

travisbot · 2012-08-06T15:19:07Z

This pull request passes (merged ce439cb3 into 842b599).

fabpot · 2012-09-18T13:52:46Z

src/Symfony/Component/Finder/Finder.php

+     *
+     * @api
+     */
+    public function pathContains($pattern)


What about just path() and notPath() for the method names? contains is used to check the file content, so it seems wrong to reuse the word here. And path() is more consistent with name() as well.

@fabpot: Done.

fabpot · 2012-09-21T05:52:01Z

Can you submit a PR on symfony/symfony-docs to update the documentation and reference it here before I merge? Thanks.

gajdaw · 2012-09-21T10:54:50Z

I've already done it in PR1527.

symfony/symfony-docs#1527

stof · 2012-09-21T22:15:46Z

Actually, to be BC in PHPUnit when switching to Finder (this feature is the reason why the switch was reverted in 3.7), they will need the support of the glob syntax. Should it be supported directly in the Finder or should we consider that PHPUnit will have to put the code converting globs to regexes themselves before calling the finder ?

fabpot · 2012-09-23T13:15:08Z

@stof what about supporting globs/patterns for the in() method?

stof · 2012-09-23T13:38:00Z

yeah, this could be a good idea too

gajdaw · 2012-09-26T06:11:56Z

Supporting globs in path(), notPath() methods is trivial: we have Glob::toRegex(). The only thing to do is to convert (when necessary) parameter sent to path(), notPath().

stof · 2012-10-13T17:19:08Z

@gajdaw can you update this PR with the glob support and rebase it ?

fabpot · 2012-10-29T11:18:52Z

src/Symfony/Component/Finder/Finder.php

+     * @see Symfony\Component\Finder\Iterator\FilenameFilterIterator
+     *
+     * @api
+     */


The @api tags must be removed.

fabpot · 2012-10-29T11:20:55Z

@gajdaw You also need to rebase and update the new adapters accordingly. Maybe @jfsimon can help.

jfsimon · 2012-10-29T16:22:25Z

With pleasure! @gajdaw let me know if I can do anything.

gajdaw · 2012-10-29T16:48:10Z

I have moved ->path() and ->notPath() methods to PhpAdapter.

This implementation passes all the tests on Windows, but Travis reports failures.

I think that similar methods should be implemented for GnuFindAdapter.

@jfsimon What do you think?

jfsimon · 2012-10-29T17:03:36Z

@gajdaw Travis says class 'Symfony\Component\HttpKernel\Exception\InternalServerErrorHttpException' not found in /home/travis/builds/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Exception/FlattenExceptionTest.php on line 83. This is weird.

And yes, AdapterInterface and GnuFindAdapter should be updated too. I can work on it if you like.

fabpot · 2012-10-29T17:07:46Z

I've just fixed the unit tests

gajdaw · 2012-10-29T17:25:43Z

@jfsimon Can implement path(), notPath() for GnuFindAdapter? I have no time to analyse Gnu's find command at the moment. Thanks!

jfsimon · 2012-10-29T17:30:13Z

@gajdaw okay.

jfsimon · 2012-10-29T19:05:26Z

@gajdaw work complete! I cant make a PR on your repos :-/ Could you merge my repos https://github.com/jfsimon/symfony/tree/component_finder_path_notPath please? Or maybe could I post a new PR on symfony/master.

gajdaw · 2012-10-30T05:34:17Z

@jfsimon I have pulled your changes. I don't know wheather you should post a new PR.

@stof

This PR was merged into the master branch. Commits ------- 4e21bf2 [Finder] Added path & notPath support to gnu find adapter. 6258d12 [Finder] Fixed expression classes. 5c6dbeb [Finder] Fixed tests. c36dfc1 [Component][Finder] ->path(), ->notPath() methods (with basic tests) Discussion ---------- [2.2][Finder] ->pathContains(), ->pathNotContains() methods (with basic tests) Bug fix: no Feature addition: yes Backwards compatibility break: no Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/gajdaw/symfony.png?branch=component_finder_path_notPath)](http://travis-ci.org/gajdaw/symfony) Fixes the following tickets: #4581 Todo: - License of the code: MIT Documentation PR: - Two additional methods: `Finder->path()` and `Finder->notPath()`. They allow filtering with paths, e.g. `->path('some/special/dir')`. --------------------------------------------------------------------------- by fabpot at 2012-09-21T05:52:01Z Can you submit a PR on symfony/symfony-docs to update the documentation and reference it here before I merge? Thanks. --------------------------------------------------------------------------- by gajdaw at 2012-09-21T10:54:50Z I've already done it in PR1527. symfony/symfony-docs#1527 --------------------------------------------------------------------------- by stof at 2012-09-21T22:15:46Z Actually, to be BC in PHPUnit when switching to Finder (this feature is the reason why the switch was reverted in 3.7), they will need the support of the glob syntax. Should it be supported directly in the Finder or should we consider that PHPUnit will have to put the code converting globs to regexes themselves before calling the finder ? --------------------------------------------------------------------------- by fabpot at 2012-09-23T13:15:08Z @stof what about supporting globs/patterns for the `in()` method? --------------------------------------------------------------------------- by stof at 2012-09-23T13:38:00Z yeah, this could be a good idea too --------------------------------------------------------------------------- by gajdaw at 2012-09-26T06:11:56Z Supporting globs in `path(), notPath()` methods is trivial: we have `Glob::toRegex()`. The only thing to do is to convert (when necessary) parameter sent to `path(), notPath()`. --------------------------------------------------------------------------- by stof at 2012-10-13T17:19:08Z @gajdaw can you update this PR with the glob support and rebase it ? --------------------------------------------------------------------------- by fabpot at 2012-10-29T11:20:55Z @gajdaw You also need to rebase and update the new adapters accordingly. Maybe @jfsimon can help. --------------------------------------------------------------------------- by jfsimon at 2012-10-29T16:22:25Z With pleasure! @gajdaw let me know if I can do anything. --------------------------------------------------------------------------- by gajdaw at 2012-10-29T16:48:10Z I have moved `->path()` and `->notPath()` methods to `PhpAdapter`. This implementation passes all the tests on Windows, but Travis reports failures. I think that similar methods should be implemented for `GnuFindAdapter`. @jfsimon What do you think? --------------------------------------------------------------------------- by jfsimon at 2012-10-29T17:03:36Z @gajdaw Travis says class 'Symfony\Component\HttpKernel\Exception\InternalServerErrorHttpException' not found in /home/travis/builds/symfony/symfony/src/Symfony/Component/HttpKernel/Tests/Exception/FlattenExceptionTest.php on line 83. This is weird. And yes, `AdapterInterface` and `GnuFindAdapter` should be updated too. I can work on it if you like. --------------------------------------------------------------------------- by fabpot at 2012-10-29T17:07:46Z I've just fixed the unit tests --------------------------------------------------------------------------- by gajdaw at 2012-10-29T17:25:43Z @jfsimon Can implement `path(), notPath()` for `GnuFindAdapter`? I have no time to analyse Gnu's `find` command at the moment. Thanks! --------------------------------------------------------------------------- by jfsimon at 2012-10-29T17:30:13Z @gajdaw okay. --------------------------------------------------------------------------- by jfsimon at 2012-10-29T19:05:26Z @gajdaw work complete! I cant make a PR on your repos :-/ Could you merge my repos https://github.com/jfsimon/symfony/tree/component_finder_path_notPath please? Or maybe could I post a new PR on symfony/master. --------------------------------------------------------------------------- by gajdaw at 2012-10-30T05:34:17Z @jfsimon I have pulled your changes. I don't know wheather you should post a new PR.

fabpot reviewed Jul 18, 2012
View reviewed changes

fabpot mentioned this pull request Jul 18, 2012

Ticket 4911 - Fixed ignoreDotFiles(true) which did not exclude folders properly #4932

Closed

fabpot reviewed Sep 18, 2012
View reviewed changes

gajdaw mentioned this pull request Oct 13, 2012

Issue 4911 fix #5128

Closed

fabpot reviewed Oct 29, 2012
View reviewed changes

[Component][Finder] ->path(), ->notPath() methods (with basic tests)

c36dfc1

jfsimon added 3 commits October 29, 2012 19:55

[Finder] Fixed tests.

5c6dbeb

[Finder] Fixed expression classes.

6258d12

[Finder] Added path & notPath support to gnu find adapter.

4e21bf2

fabpot merged commit 4e21bf2 into symfony:master Oct 30, 2012

gajdaw mentioned this pull request Oct 31, 2012

[Component][Finder] path(), notPath() methods symfony/symfony-docs#1527

Merged

Uh oh!

[2.2][Finder] ->pathContains(), ->pathNotContains() methods (with basic tests) #4739

[2.2][Finder] ->pathContains(), ->pathNotContains() methods (with basic tests) #4739

Uh oh!

Conversation

gajdaw commented Jul 4, 2012

Uh oh!

fabpot Jul 18, 2012

Choose a reason for hiding this comment

Uh oh!

gajdaw Jul 30, 2012

Choose a reason for hiding this comment

Uh oh!

travisbot commented Aug 1, 2012

Uh oh!

travisbot commented Aug 1, 2012

Uh oh!

travisbot commented Aug 6, 2012

Uh oh!

fabpot Sep 18, 2012

Choose a reason for hiding this comment

Uh oh!

gajdaw Sep 21, 2012

Choose a reason for hiding this comment

Uh oh!

fabpot commented Sep 21, 2012

Uh oh!

gajdaw commented Sep 21, 2012

Uh oh!

stof commented Sep 21, 2012

Uh oh!

fabpot commented Sep 23, 2012

Uh oh!

stof commented Sep 23, 2012

Uh oh!

gajdaw commented Sep 26, 2012

Uh oh!

stof commented Oct 13, 2012

Uh oh!

fabpot Oct 29, 2012

Choose a reason for hiding this comment

Uh oh!

fabpot commented Oct 29, 2012

Uh oh!

jfsimon commented Oct 29, 2012

Uh oh!

gajdaw commented Oct 29, 2012

Uh oh!

jfsimon commented Oct 29, 2012

Uh oh!

fabpot commented Oct 29, 2012

Uh oh!

gajdaw commented Oct 29, 2012

Uh oh!

jfsimon commented Oct 29, 2012

Uh oh!

jfsimon commented Oct 29, 2012

Uh oh!

gajdaw commented Oct 30, 2012

Uh oh!

Uh oh!