Commit Graph

15148 Commits

Author SHA1 Message Date
Fabien Potencier
51014bf930 merged branch catch56/container_array_key_exists (PR #8907)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8907).

Discussion
----------

Use isset() instead of array_key_exists() in DIC

It doesn't look like the array_key_exists() in Container::get() and Container::has() is necessary. Changing this to isset() removed over 1,000 calls on a default Drupal 8 install - attaching before/after xhprof screenshots with this change.

![screen shot 2013-09-01 at 1 13 41 pm](https://f.cloud.github.com/assets/116285/1063965/d826057c-1300-11e3-96c3-2c94b89fe83a.png)

![screen shot 2013-09-01 at 1 13 49 pm](https://f.cloud.github.com/assets/116285/1063961/99a0f7b2-1300-11e3-9bd2-b0bf22d4245e.png)

Commits
-------

3c01ae6 Use isset() instead of array_key_exists() in DIC
2013-09-03 12:21:15 +02:00
Nathaniel Catchpole
e4b303973f Use isset() instead of array_key_exists() in DIC 2013-09-03 12:21:15 +02:00
Fabien Potencier
71621d7404 merged branch enumag/patch-2 (PR #8912)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8912).

Discussion
----------

Fixed annotation

See #8910.

Commits
-------

18ce361 Fixed annotation
2013-09-02 15:38:54 +02:00
Jáchym Toušek
4147047c8e Fixed annotation 2013-09-02 15:38:54 +02:00
Fabien Potencier
6f59f072cb merged branch tyx/fix/missing-property-form-di-extension (PR #8914)
This PR was merged into the master branch.

Discussion
----------

[Form] Add missing default property typeExtensionServiceIds

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

Just added missing property.

It works pretty well for now as `$typeExtensionServiceIds` is setted in construct but could bring misunderstood or strange behavior in future.

Commits
-------

938f83d [Form] Add missing default property typeExtensionServiceIds
2013-09-02 15:36:16 +02:00
Timothée Barray
938f83d97f [Form] Add missing default property typeExtensionServiceIds 2013-09-02 15:03:07 +02:00
Christian Raue
42c7b95ab3 fixed typo 2013-09-01 20:32:33 +02:00
Peter Kruithof
94d648b75c Added 'host' option to firewall configuration 2013-09-01 11:49:21 +02:00
Fabien Potencier
cade045e34 merged branch jfsimon/issue-8583 (PR #8609)
This PR was squashed before being merged into the master branch (closes #8609).

Discussion
----------

Replace sha1 and md5 hashing with sha256 algorithm

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #8583

Commits
-------

dd8014a Replace sha1 and md5 hashing with sha256 algorithm
2013-08-31 13:25:42 +02:00
Jean-François Simon
dd8014a0f4 Replace sha1 and md5 hashing with sha256 algorithm 2013-08-31 13:25:41 +02:00
Fabien Potencier
567e3f4642 merged branch stloyd/bugfix/issue-7724 (PR #8393)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2] Return BC compatibility for `@Route` parameters and default values

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

Commits
-------

d400b5a Return BC compatibility for `@Route` parameters and default values
2013-08-31 08:28:50 +02:00
Fabien Potencier
a5dcb32760 merged branch fabpot/router-webprofiler (PR #8894)
This PR was merged into the 2.2 branch.

Discussion
----------

[HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)

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

Commits
-------

c931eb7 [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867)
2013-08-31 08:13:13 +02:00
Fabien Potencier
47b32437e1 Merge branch '2.2' into 2.3
* 2.2:
  [BrowserKit] fixed method/files/content when redirecting a request
  [BrowserKit] removed some headers when redirecting a request
  [BrowserKit] fixed headers when redirecting if history is set to false (refs #8697)
  [BrowserKit] Pass headers when `followRedirect()` is called

Conflicts:
	src/Symfony/Component/BrowserKit/Client.php
	src/Symfony/Component/BrowserKit/Tests/ClientTest.php
2013-08-31 08:12:22 +02:00
Fabien Potencier
dc1a539c02 merged branch fabpot/browserkit-redirect-22 (PR #8895)
This PR was merged into the 2.2 branch.

Discussion
----------

[BrowserKit] fixed the redirect behavior according to the RFC

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

Commits
-------

2d34e78 [BrowserKit] fixed method/files/content when redirecting a request
64e1655 [BrowserKit] removed some headers when redirecting a request
96a4b00 [BrowserKit] fixed headers when redirecting if history is set to false (refs #8697)
2013-08-31 08:10:23 +02:00
Fabien Potencier
98b14f155d merged branch pulzarraider/patch-1 (PR #8878)
This PR was merged into the master branch.

Discussion
----------

[HttpFoundation] [BrowserKit] Missing sprintf in exceptions

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

Commits
-------

16d7ef1 [BrowserKit] Fixed missing sprintf in InvalidArgumentException
713f623 Use sprintf in "Untrusted Host" and "Invalid Host" exception
2013-08-31 08:06:41 +02:00
Andrej Hudec
16d7ef1140 [BrowserKit] Fixed missing sprintf in InvalidArgumentException 2013-08-30 22:08:50 +02:00
Fabien Potencier
2d34e78aaf [BrowserKit] fixed method/files/content when redirecting a request 2013-08-30 20:46:40 +02:00
Fabien Potencier
64e1655164 [BrowserKit] removed some headers when redirecting a request 2013-08-30 20:37:24 +02:00
Fabien Potencier
96a4b00c7c [BrowserKit] fixed headers when redirecting if history is set to false (refs #8697) 2013-08-30 20:37:05 +02:00
Fabien Potencier
7e06905ec0 merged branch stloyd/bugfix/issue7929 (PR #8697)
This PR was merged into the 2.2 branch.

Discussion
----------

[2.2] [BrowserKit] Pass headers when `followRedirect()` is called

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Tests pass?   | yes
| Fixed tickets | #7929
| License       | MIT

Commits
-------

0d07af8 [BrowserKit] Pass headers when `followRedirect()` is called
2013-08-30 20:27:38 +02:00
Fabien Potencier
c931eb7a53 [HttpKernel] fixed route parameters storage in the Request data collector (closes #8867) 2013-08-30 19:08:44 +02:00
Fabien Potencier
e838bf04ca Merge branch '2.3'
* 2.3:
  [Security] fixed some phpdoc
  Fixed PHPDoc Blocks
  optimized circular reference checker
  fixed misleading doc block
  [HttpKernel] changed fragment URLs to be relative by default (closes #8458)

Conflicts:
	src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
	src/Symfony/Component/HttpKernel/Tests/Fragment/RoutableFragmentRendererTest.php
2013-08-30 15:15:50 +02:00
Fabien Potencier
e8e5a3a2e5 Merge branch '2.2' into 2.3
* 2.2:
  [Security] fixed some phpdoc
  Fixed PHPDoc Blocks
  optimized circular reference checker
  [HttpKernel] changed fragment URLs to be relative by default (closes #8458)
2013-08-30 15:10:46 +02:00
Fabien Potencier
0bb76683c0 [Security] added a missing CHANGELOG enrty 2013-08-30 15:09:09 +02:00
Fabien Potencier
7f3878e1d9 merged branch vierbergenlars/patch-1 (PR #8854)
This PR was merged into the master branch.

Discussion
----------

[Security] Keep other query string parameters when switching users

| Q                    | A
| ---------------------- | ---
| Bug fix? 	        | yes
| New feature? 	| no
| BC breaks? 	| no
| Deprecations? 	| no
| Tests pass? 	| yes
| Fixed tickets 	| n/a
| Doc PR 	        | n/a

When switching users, the whole query string gets dropped when redirecting after the switch.
I think only the switch user parameter should be dropped from the query string.

Commits
-------

0a338f5 [Security] Keep other query string parameters when switching users
2013-08-30 15:07:27 +02:00
Fabien Potencier
f02dbd6641 [Security] fixed some phpdoc 2013-08-30 14:58:19 +02:00
Fabien Potencier
042be413cf merged branch fabpot/debug-classloader (PR #8870)
This PR was merged into the master branch.

Discussion
----------

duplicated the DebugClassLoader in the Debug component

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

This is a follow-up for #8553.

Commits
-------

d146461 duplicated the DebugClassLoader in the Debug component
2013-08-30 14:14:08 +02:00
Fabien Potencier
7a0eba4ddc merged branch fabpot/fragment-urls (PR #8879)
This PR was merged into the 2.2 branch.

Discussion
----------

Made fragment URLs relative instead of absolute by default

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

This fixes a regression introduced with the new fragment system where fragment URLs were generated as absolute URLs. As per the ESI spec, there is no need to generate an absolute URL and this can even be problematic when dealing with internal sub-requests in a more "complex" hosting environment.

Commits
-------

91234cd [HttpKernel] changed fragment URLs to be relative by default (closes #8458)
2013-08-30 14:12:10 +02:00
Fabien Potencier
32a560fb40 merged branch ChristianGaertner/patch-1 (PR #8887)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8887).

Discussion
----------

[Process] Fixed PHPDoc Blocks

These ```RunTimeExceptions``` are NOT the native ones, therefor the should not be ```\``` in front of them.

| Q             | A
| ------------- | ---
| Fixed tickets | none
| License       | MIT

Commits
-------

26e9717 Fixed PHPDoc Blocks
2013-08-30 14:09:31 +02:00
Christian Gärtner
6d8e91bf4f Fixed PHPDoc Blocks
These ```RunTimeExceptions``` are NOT the native ones, therefor the should not be ```\``` in front of them.
2013-08-30 14:09:30 +02:00
Fabien Potencier
ce53700003 merged branch kriswallsmith/http/misleading-comment (PR #8886)
This PR was merged into the 2.3 branch.

Discussion
----------

fixed misleading doc block

This doc block does not match what's happening in the code.

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | ~
| License       | MIT
| Doc PR        | ~

Commits
-------

4d01e7e fixed misleading doc block
2013-08-30 13:37:51 +02:00
Fabien Potencier
480dda41cf merged branch tgabi333/master (PR #8891)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #8891).

Discussion
----------

[DependencyInjection] optimized circular reference checker

| Q             | A
| ------------- | ---
| Bug fix?      | [no]
| New feature?  | [no]
| BC breaks?    | [no]
| Deprecations? | no]
| Tests pass?   | [yes]
| Fixed tickets | []
| License       | MIT
| Doc PR        | []

It is an addtion to my previous PR https://github.com/symfony/symfony/pull/7699

There is no need to check again previously checked sub-trees.

In our tightly coupled services graph, this circular reference check runs avg 1,5ms, before that: 100ms

Commits
-------

67ebf8f optimized circular reference checker
2013-08-30 13:28:31 +02:00
Tóth Gábor
96bb731b28 optimized circular reference checker 2013-08-30 13:28:31 +02:00
Fabien Potencier
fc15c706f1 [Debug] fixed unit tests 2013-08-30 13:26:06 +02:00
Fabien Potencier
f3e5994212 [Debug] fixed typo that prevented smart errors for class not found errors to work 2013-08-30 09:34:07 +02:00
Kris Wallsmith
4d01e7ebbd fixed misleading doc block 2013-08-29 12:32:30 -07:00
Kévin Gomez
764e9155fe [PropelBridge] PropelTypeGuesser can now recognize columns by their phpName
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Until now, the `PropelTypeGuesser` could only find columns by their
name.
Example: `created_at` was recognized but `createdAt` wasn't.

This PR adds the ability to match column's phpNames (in a
case-insensitive way).
2013-08-29 18:21:05 +01:00
Andrej Hudec
713f62326b Use sprintf in "Untrusted Host" and "Invalid Host" exception 2013-08-29 12:43:36 +02:00
Fabien Potencier
feff411dfc Merge branch '2.3'
* 2.3:
  Clear lazy loading initializer after the service is successfully initialized
  [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797)
  [SecurityBundle] Move format-dependent tests from SecurityExtensionTest
  bumped Symfony version to 2.3.5-DEV
  updated VERSION for 2.3.4
  updated CHANGELOG for 2.3.4
  bumped Symfony version to 2.2.7
  updated VERSION for 2.2.6
  update CONTRIBUTORS for 2.2.6
  updated CHANGELOG for 2.2.6
  clearToken exception is thrown at wrong place.
  fix typo in test skipped message
  [Form] Fixed Form::all() signature for PHP 5.3.3
  [Form] Fixed Form::all() signature for PHP 5.3.3
  [Locale] Fixed: Locale::setDefault() throws no exception when "en" is passed
  [Locale] Fixed: StubLocale::setDefault() throws no exception when "en" is passed
  [Translation] Grammar fix
  [Yaml] fixed embedded folded string parsing
  [Validator] fixed Boolean handling in XML constraint mappings (closes #5603)
  [Translation] Fixed regression: When only one rule is passed to transChoice(), this rule should be used

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
2013-08-29 08:54:01 +02:00
Fabien Potencier
c0a256d966 Merge branch '2.2' into 2.3
* 2.2:
  [FrameworkBundle] added support for double-quoted strings in the extractor (closes #8797)
  [SecurityBundle] Move format-dependent tests from SecurityExtensionTest

Conflicts:
	src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/SecurityExtensionTest.php
2013-08-29 08:53:29 +02:00
Fabien Potencier
70db3c3182 merged branch jeremylivingston/proxy-init (PR #8877)
This PR was submitted for the master branch but it was merged into the 2.3 branch instead (closes #8877).

Discussion
----------

Clear lazy loading initializer after the service is successfully initialized

Fixes #8875

Commits
-------

da73102 Clear lazy loading initializer after the service is successfully initialized
2013-08-29 07:26:51 +02:00
Jeremy Livingston
39b610d9ad Clear lazy loading initializer after the service is successfully initialized 2013-08-29 07:26:51 +02:00
Fabien Potencier
91234cd89a [HttpKernel] changed fragment URLs to be relative by default (closes #8458) 2013-08-29 07:21:07 +02:00
Fabien Potencier
5994f69a97 merged branch Inori/patch-3 (PR #8876)
This PR was merged into the master branch.

Discussion
----------

[HttpFoundation] add test to ensure Content-Length is preserved on HEAD

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

Related to #8873

Commits
-------

42f0596 [HttpFoundation] add test to ensure that Content-Length is preserved on HEAD method
2013-08-28 22:01:19 +02:00
Roman Marintšenko
42f0596f1a [HttpFoundation] add test to ensure that Content-Length is preserved on HEAD method 2013-08-28 22:35:29 +03:00
Fabien Potencier
803c0b74c5 merged branch Inori/tests-coverage (PR #8856)
This PR was squashed before being merged into the master branch (closes #8856).

Discussion
----------

[HttpFoundation] Improve test coverage

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

Commits
-------

aef78f2 [HttpFoundation] Improve test coverage
2013-08-28 20:56:23 +02:00
Roman Marintšenko
aef78f26a3 [HttpFoundation] Improve test coverage 2013-08-28 20:56:22 +02:00
Fabien Potencier
7f51252063 merged branch fabpot/moved_yaml_7 (PR #8872)
This PR was merged into the master branch.

Discussion
----------

fixes fabpots comment at yaml pr#6

Commits
-------

8b7cc14 fixes fabpots comment at yaml pr#6
2013-08-28 20:26:52 +02:00
fh-github@fholzhauer.de
8b7cc14962 fixes fabpots comment at yaml pr#6 2013-08-28 20:24:22 +02:00
Fabien Potencier
6132b40b06 merged branch endroid/master (PR #8488)
This PR was squashed before being merged into the master branch (closes #8488).

Discussion
----------

Add container aware trait

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | yes
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        | will create one if merged

This trait can be used inside a class to make it container aware. As it is not always possible to extend the abstract ContainerAware class, the code for creating a container aware class is usually copied over and over (most of the time unchanged), resulting in a lot of redundant code in your project. As my projects are PHP 5.4 based nowadays, I would like to be able to use a trait in these scenarios to improve my workflow.

Commits
-------

4c9e606 Add container aware trait
2013-08-28 20:20:21 +02:00