[Component][Finder][SplFileInfo] file_get_contents=>fpassthru #4751

Merged
merged 1 commit into from Jul 9, 2012

Projects

None yet

2 participants

@gajdaw
Contributor
gajdaw commented Jul 4, 2012

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: -

@fabpot fabpot added a commit that referenced this pull request Jul 9, 2012
@fabpot fabpot merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)
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: -
5608c0c
@fabpot fabpot merged commit b4d7a7e into symfony:master Jul 9, 2012
@fabpot fabpot added a commit that referenced this pull request Dec 10, 2012
@fabpot fabpot Revert "merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)" …
…(closes #6224)

This reverts commit 5608c0c, reversing
changes made to 38c30b7.

Conflicts:
	src/Symfony/Component/Finder/SplFileInfo.php
a1734dd
@fabpot fabpot added a commit that referenced this pull request Dec 11, 2012
@fabpot fabpot Merge branch '2.1'
* 2.1:
  fixed CS
  fixed CS
  [Security] fixed path info encoding (closes #6040, closes #5695)
  [HttpFoundation] added some tests for the previous merge and removed dead code (closes #6037)
  Improved Cache-Control header when no-cache is sent
  removed unneeded comment
  Fix to allow null values in labels array
  fix date in changelog
  removed the Travis icon (as this is not stable enough -- many false positive, closes #6186)
  Revert "merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)" (closes #6224)
  Fixed a typo
  Fixed: HeaderBag::parseCacheControl() not parsing quoted zero correctly
  [Form] Fix const inside an anonymous function
  [Config] Loader::import must return imported data
  [DoctrineBridge] Fixed caching in DoctrineType when "choices" or "preferred_choices" is passed
  [Form] Fixed the default value of "format" in DateType to DateType::DEFAULT_FORMAT if "widget" is not "single_text"
  [HttpFoundation] fixed a small regression

Conflicts:
	src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/MongoDbSessionHandlerTest.php
3c010db
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment