Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[DependencyInjection] Allow frozen containers to be dumped to graphviz (2.1 merge) #7018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from

Conversation

igorw
Copy link
Contributor

@igorw igorw commented Feb 7, 2013

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
License MIT

This is the 2.1 merge for #7017 with an addition for 2.1 specifically.

Note: The diff currently still contains commits from 2.0 which are not in 2.1 yet.

fabpot and others added 7 commits February 4, 2013 19:34
…stancies (closes symfony#6923, closes symfony#6936)

This fixes the creation of a sub-request when the master request Request URI
is determined with specific server information.
This PR was merged into the 2.0 branch.

Commits
-------

ddf4678 [HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes symfony#6923, closes symfony#6936)

Discussion
----------

[HttpFoundation] fixed the creation of sub-requests under some circumstancies (closes symfony#6923, closes symfony#6936)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | symfony#6923, symfony#6936
| License       | MIT
| Doc PR        | n/a

This fixes the creation of a sub-request when the master request Request URI
is determined with specific server information.
This PR was merged into the 2.0 branch.

Commits
-------

a12744e Add dot character `.` to legal mime subtype regular expression

Discussion
----------

[HttpFoundation][2.0] Add dot character `.` to legal mime subtype regular expression

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

For example, the following mimetype (used for Microsoft powerpoints) is not recognized given the current regexp : `application/vnd.ms-powerpoint; charset=binary`
…ainer-2.1

* upstream/2.1: (2632 commits)
  [HttpKernel] fixed the creation of the Profiler directory
  [Security] fixed session creation when none is needed (closes symfony#6917)
  [FrameworkBundle] removed obsolete comment (see 2e356c1)
  Correct comment in NativeSessionStorage regarding session.save_handler
  [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
  Fixed missing class argument when throwing exception
  [Security] Add PHPDoc to AuthenticationEvents
  Fix typos in README
  Added an error message in the DebugClassLoader when using / instead of \.
  KNOWN_ISSUES with php 5.3.16
  bumped Symfony version to 2.1.8-DEV
  updated VERSION for 2.1.7
  updated CHANGELOG for 2.1.7
  fixed CS
  [Process] Fix docblocks, remove `return` from `PhpProcess#start()` as parent returns nothing, cleaned up `ExecutableFinder`
  fixes a bug when output/error output contains a % character
  [Profiler] [Redis] Fix sort of profiler rows.
  Removed underscores from test method names to be consistent with other components.
  Fix version_compare() calls for PHP 5.5.
  Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
  ...

Conflicts:
	tests/Symfony/Tests/Component/DependencyInjection/Dumper/GraphvizDumperTest.php
@fabpot
Copy link
Member

fabpot commented Feb 7, 2013

I've cherry-picked the last commit. Thanks.

@fabpot fabpot closed this Feb 7, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants