Permalink
Commits on May 25, 2013
  1. merged branch alquerci/ticket-3585-7834 (PR #8120)

    fabpot committed May 25, 2013
    This PR was squashed before being merged into the 2.1 branch (closes
    
    Discussion
    ----------
    
    [Finder] Fix iteration fails with non-rewindable streams
    
    <table>
      <tr>
        <th>Q</th><th>A</th>
      </tr>
      <tr>
        <td>Bug fix?</td><td>yes</td>
      </tr>
      <tr>
        <td>New feature?</td><td>no</td>
      </tr>
      <tr>
        <td>BC breaks?</td><td>no</td>
      </tr>
      <tr>
        <td>Deprecations?</td><td>no</td>
      </tr>
      <tr>
        <td>Tests pass?</td><td>yes</td>
      </tr>
      <tr>
        <td>Fixed tickets</td><td>#3585, #7834</td>
      </tr>
      <tr>
        <td>License?</td><td>MIT</td>
      </tr>
    </table>
    
    - [x] Add a good detection of non seekable stream
    - [x] Add some unit tests
    
    But the iteration under ftp stream still not work properly. Edit: need
    tests for that.
    
    Commits
    -------
    
    169c0b9 [Finder] Fix iteration fails with non-rewindable streams
Commits on Mar 6, 2013
Commits on Jan 9, 2013
Commits on Jan 4, 2013
  1. Merge branch '2.0' into 2.1

    fabpot committed Jan 4, 2013
    * 2.0:
      updated license year
      Update src/Symfony/Component/HttpFoundation/Response.php
      [Console] fixed unitialized properties (closes #5935)
      [Bundle] [FrameworkBundle] fixed typo in phpdoc of the SessionListener.
      bumped Symfony version to 2.0.21-DEV
      updated VERSION for 2.0.21
      updated CHANGELOG for 2.0.21
    
    Conflicts:
    	src/Symfony/Bundle/SwiftmailerBundle/LICENSE
    	src/Symfony/Component/Filesystem/LICENSE
    	src/Symfony/Component/HttpFoundation/Response.php
    	src/Symfony/Component/HttpKernel/Kernel.php
  2. updated license year

    fabpot committed Jan 4, 2013
Commits on Dec 10, 2012
  1. Revert "merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)" …

    fabpot committed Dec 10, 2012
    …(closes #6224)
    
    This reverts commit 5608c0c3ee21e6aade3170d6c580bf7ad452a143, reversing
    changes made to 38c30b71bd2d32ac31920996480d1706402118f2.
    
    Conflicts:
    	src/Symfony/Component/Finder/SplFileInfo.php
Commits on Dec 6, 2012
Commits on Nov 8, 2012
  1. Fix export-ignore on Windows

    gajdaw committed Nov 8, 2012
Commits on Oct 20, 2012
  1. Nsdocblocks

    Drak committed with fabpot Oct 19, 2012
Commits on Oct 4, 2012
Commits on Aug 22, 2012
Commits on Aug 15, 2012
  1. fix CS into Finder

    ruian committed Aug 15, 2012
    fix CS into Finder
Commits on Jul 28, 2012
  1. Fixed typos

    pborreli committed Jul 28, 2012
Commits on Jul 27, 2012
  1. merged branch alebo/ticket_4922 (PR #4993)

    fabpot committed Jul 27, 2012
    Commits
    -------
    
    ae6016c [Finder] Workaround for FilterIterator-FilesystemIterator-rewind issue
    
    Discussion
    ----------
    
    [Finder] Workaround for the problem with rewind of FilterIterator with inner FilesystemIterator.
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: #4922
    Todo: -
    License of the code: MIT
    Documentation PR: -
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-07-20T10:28:05Z
    
    Please add some tests
    
    ---------------------------------------------------------------------------
    
    by alebo at 2012-07-24T09:50:36Z
    
    Any feedback yet? The new commit includes tests.
Commits on Jul 20, 2012
  1. Late static factory method

    Slamdunk committed Jul 20, 2012
Commits on Jul 15, 2012
  1. Revert "raised the minimum version of PHP to 5.3.4 (closes #3856)"

    fabpot committed Jul 15, 2012
    This reverts commit 2dcc44897ef1ceec2721bbf616c4744131340657.
Commits on Jul 13, 2012
  1. raised the minimum version of PHP to 5.3.4 (closes #3856)

    fabpot committed Jul 13, 2012
    We've raised the minimum version of PHP because of a PHP
    bug before 5.3.4:
    
    https://bugs.php.net/bug.php?id=52083
    https://bugs.php.net/bug.php?id=50027
Commits on Jul 9, 2012
  1. fixed CS

    fabpot committed Jul 9, 2012
  2. merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)

    fabpot committed Jul 9, 2012
    Commits
    -------
    
    b4d7a7e [Component][Finder][SplFileInfo] file_get_contents=>fpassthru
    
    Discussion
    ----------
    
    [Component][Finder][SplFileInfo] file_get_contents=>fpassthru
    
    Bug fix: no
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: yes
    Fixes the following tickets: https://github.com/symfony/symfony/pull/4335/files#r1016152
    Todo: -
    License of the code: MIT
    Documentation PR: -
  3. fixed CS

    fabpot committed Jul 9, 2012
Commits on Jul 4, 2012
Commits on Jul 2, 2012
  1. [Finder] '*' and '?' are considered are glob pattern rather than deli…

    vicb committed Jul 2, 2012
    …miters (fix #4664)
Commits on Jun 19, 2012
  1. merged branch gajdaw/finder_current_fix (PR #4335)

    fabpot committed Jun 19, 2012
    Commits
    -------
    
    3eb67fc [2.1][Component][Finder] $this->current() fix
    
    Discussion
    ----------
    
    [2.1][Component][Finder] $this->current() fix
    
    Bug fix: yes
    Feature addition: no
    Backwards compatibility break: no
    Symfony2 tests pass: [![Build Status](https://secure.travis-ci.org/gajdaw/symfony.png?branch=master)](http://travis-ci.org/gajdaw/symfony)
    Fixes the following tickets: -
    Todo: -
    License of the code: MIT
    
    One method to resolve `->in("ftp://...")` problem is to create `RecursiveDirectoryFtpIterator`.
    (Details: [issue 3585](symfony/symfony#3585))
    
    I think that all filters should access the information about current item calling `current()` or `getInnerIterator()`. Otherwise it will not work if we replace `RecursiveDirectoryIterator` with ftp iterator inside `Finder`.
    
    I'm not sure if that should go to 2.0 or 2.1 branch.
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-19T09:20:19Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1373361) (merged 9f247921 into 58b92453).
    
    ---------------------------------------------------------------------------
    
    by gajdaw at 2012-05-19T10:51:10Z
    
    Probably it should go to master branch, because it improves commit done to master:
    
    symfony/symfony@f2fea97
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-19T11:26:14Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1373982) (merged f9d1db8c into 58b92453).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-19T11:51:25Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1374031) (merged f1b4b4f7 into 58b92453).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-19T12:48:17Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1374303) (merged b6d073da into 58b92453).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-19T13:28:18Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1374568) (merged fd144c96 into 58b92453).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-19T13:35:38Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1374609) (merged 89a8d851 into 58b92453).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-21T04:31:46Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1385764) (merged 0d5b8322 into 58b92453).
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-21T07:21:56Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1386545) (merged 3eb67fca into 1407f112).
    
    ---------------------------------------------------------------------------
    
    by stof at 2012-06-09T13:24:14Z
    
    seems good
Commits on May 21, 2012
  1. fixed CS

    fabpot committed May 21, 2012
Commits on May 18, 2012
  1. fixed CS

    fabpot committed May 18, 2012
  2. fixed CS

    fabpot committed May 18, 2012
  3. merged branch jocl/master (PR #4211)

    fabpot committed May 18, 2012
    Commits
    -------
    
    d3fee9b [Finder] ignoreDotFiles(true) filter does not match (issue #4106)
    
    Discussion
    ----------
    
    Fix for issue #4106 [Finder] ignoreDotFiles(true) filter does not match
    
    I added new dot test files:
     * .bar
     * .foo/
     * .foo/.bar
    
    Changed the tests and made a fix to finder that seems to okay for me.
    
    I hope my first PR is well arranged ;-)
    If not I will be pleased to get feedback...
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-05-11T10:20:51Z
    
    Could you squash you commits ?
    
    There is also an issue when `ignoreDotFiles(false)` is called twice, could you add a failing TC and fix the code ?
    `$this->ignore = $this->ignore ^ static::IGNORE_DOT_FILES;` should be `$this->ignore = $this->ignore & ~static::IGNORE_DOT_FILES;`
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-11T12:43:53Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1304510) (merged 72c320bc into ff7c4757).
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-05-11T13:09:32Z
    
    You need to:
    
    - tackle the related issue I have mentioned,
    - squash the commit,
    - rebase,
    - force push to your branch.
    
    http://symfony.com/doc/current/contributing/code/patches.html has some more info.
    
    As a fix, did you consider sending it to the 2.0 branch - your mention it as a BC in the commit comment but it really is a bug fix.
    
    ---------------------------------------------------------------------------
    
    by jocl at 2012-05-11T13:33:30Z
    
    Thank you. I will try it.
    
    Hasn't ```ignoreVCS(false)``` the same twice calling problem with
    ```$this->ignore = $this->ignore ^ static::IGNORE_VCS_FILES;```?
    
    ---------------------------------------------------------------------------
    
    by vicb at 2012-05-11T13:36:22Z
    
    yep, good catch !
    
    ---------------------------------------------------------------------------
    
    by jocl at 2012-05-12T10:32:06Z
    
    I mentioned it as BC, since I found no place in documentation with the information that dotFiles are ignored by default. I was also wondering that it is default behavior.
    
    But if I only read the code, it is a 100% bug.
    
    As soon as the PR is merged, I think we should also add a little notice in documentation like it is for ignoreVCS():
    http://symfony.com/doc/master/components/finder.html#files-or-directories
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-15T05:47:49Z
    
    I think you should keep these changes on master. Last thing before I can merge: can you squash your commits as explained by @vicb?
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-15T08:20:04Z
    
    This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1334337) (merged 525919fa into ff7c4757).
    
    ---------------------------------------------------------------------------
    
    by jocl at 2012-05-15T08:23:24Z
    
    I am sorry, of wasting your time... totally confused about using git. I feel a little bit squashed :-) of a the possible actions.
    I hope it is squashed now. And next time I will use the issue/ticket branch I made.
    
    ---------------------------------------------------------------------------
    
    by fabpot at 2012-05-15T08:35:59Z
    
    That's still not good. Squashing is explained here: http://symfony.com/doc/current/contributing/code/patches.html#rework-your-patch
    
    ---------------------------------------------------------------------------
    
    by travisbot at 2012-05-15T20:44:14Z
    
    This pull request [fails](http://travis-ci.org/symfony/symfony/builds/1339390) (merged d3fee9b2 into 03d4b026).
Commits on May 15, 2012
  1. fixed phpdoc @param alignment

    fabpot committed May 15, 2012
  2. [Finder] ignoreDotFiles(true) filter does not match (issue #4106)

    jocl committed May 6, 2012
    Added new dot files/folder:
     * .bar
     * .foo/
     * .foo/.bar
    
    Adapted unit tests to the new test directory structure.
    Possible patch to fix Finder to ignore dot files.
    
    And fixed issue if ignoreDotFiles(false) and ignoreVCS(false) is called twice.
    Added 2 asserts to FinderTest.