8000 Merge branch '2.1' · symfony/symfony@b22da6e · GitHub
[go: up one dir, main page]
Skip to content

Commit b22da6e

Browse files
fabpotfabpot
committed
Merge branch '2.1'
* 2.1: [TwigBundle] Moved the registration of the app global to the environment needs to use simpleContent in xsd to allow empty elements bumped Symfony version to 2.1.5-DEV bumped Symfony version to 2.0.19-DEV removed wrong routing xsd statement `mixed="true"` removed unused attribute from routing.xsd [HttpFoundation] added a small comment about the meaning of Request::hasSession() as this is a recurrent question (refs #4541) updated VERSION for 2.1.4 updated CHANGELOG for 2.1.4 updated VERSION for 2.0.19 update CONTRIBUTORS for 2.0.19 updated CHANGELOG for 2.0.19 Conflicts: src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd
2 parents 2762466 + a6e08b1 commit b22da6e

File tree

4 files changed

+77
-4
lines changed

4 files changed

+77
-4
lines changed

‎CHANGELOG-2.0.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,30 @@ in 2.0 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.0.0...v2.0.1
99

10+
* 2.0.19 (2012-11-29)
11+
12+
* e5536f0: replaced magic strings by proper constants
13+
* 6a3ba52: fixed the logic in Request::isSecure() (if the information comes from a source that we trust, don't check other ones)
14+
* 67e12f3: added a way to configure the X-Forwarded-XXX header names and a way to disable trusting them
15+
* b45873a: fixed algorithm used to determine the trusted client IP
16+
* 254b110: removed the non-standard Client-IP HTTP header
17+
* fc89d6b: [DependencyInjection] fixed composer.json
18+
* ac77c5b: [Form] Updated checks for the ICU version from 4.5+ to 4.7+ due to test failures with ICU 4.6
19+
* 29bfa13: small fix of #5984 when the container param is not set
20+
* 64b54dc: Use better default ports in urlRedirectAction
21+
* f2cbea3: [Security] remove escape charters from username provided by Digest DigestAuthenticationListener
22+
* 694697d: [Security] Fixed digest authentication
23+
* c067586: [Security] Fixed digest authentication
24+
* 32dc31e: [SecurityBundle] Convert Http method to uppercase in the config
25+
* b3a8efd: fixed comment. The parent ACL is not accessed in this method.
26+
* e12bd12: [HttpFoundation] Make host & methods really case insensitive in the RequestMacther
27+
* 15a5868: [Validator] fixed Ukrainian language code (closes #5972)
28+
* dc80385: [Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
29+
* 9872d26: [HttpFoundation] Fix name sanitization after perfoming move
30+
* 6f15c47: [ClassLoader] fixed unbracketed namespaces (closes #5747)
31+
* 2d9a6fc: Use Norm Data instead of Data
32+
* a094f7e: Add check to Store::unlock to ensure file exists
33+
1034
* 2.0.18 (2012-10-25)
1135

1236
* 20898e5: Add to DateFormats 'D M d H:i:s Y T' (closes #5830)

‎CHANGELOG-2.1.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,47 @@ in 2.1 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.1.0...v2.1.1
99

10+
* 2.1.4 (2012-12-29)
11+
12+
* e5536f0: replaced magic strings by proper constants
13+
* 6a3ba52: fixed the logic in Request::isSecure 10000 () (if the information comes from a source that we trust, don't check other ones)
14+
* 67e12f3: added a way to configure the X-Forwarded-XXX header names and a way to disable trusting them
15+
* b45873a: fixed algorithm used to determine the trusted client IP
16+
* 254b110: removed the non-standard Client-IP HTTP header
17+
* 06ee53b: [Form] improve error message with a "hasser" hint for PropertyAccessDeniedException
18+
* ac77c5b: [Form] Updated checks for the ICU version from 4.5+ to 4.7+ due to test failures with ICU 4.6
19+
* 2fe04e1: Update src/Symfony/Component/Form/Extension/Core/Type/FileType.php
20+
* bbeff54: Xliff with other node than source or target are ignored
21+
* 29bfa13: small fix of #5984 when the container param is not set
22+
* f211b19: Filesystem Component mirror symlinked directory fix
23+
* 64b54dc: Use better default ports in urlRedirectAction
24+
* e7401a2: Update src/Symfony/Component/DomCrawler/Tests/FormTest.php
25+
* b0e468f: Update src/Symfony/Component/DomCrawler/Form.php
26+
* 1daefa5: [Routing] made it compatible with older PCRE version (pre 8)
27+
* f2cbea3: [Security] remove escape charters from username provided by Digest DigestAuthenticationListener
28+
* 82334d2: Force loader to be null or a EntityLoaderInterface
29+
* 694697d: [Security] Fixed digest authentication
30+
* c067586: [Security] Fixed digest authentication
31+
* d2920c9: Added HttpCache\Store::generateContentDigest() + changed visibility
32+
* e12bd12: [HttpFoundation] Make host & methods really case insensitive in the RequestMacther
33+
* c659e78: Make YamlFileLoader and XmlFileLoader file loading extensible
34+
* 0f75586: [Form] Removed an exception that prevented valid formats from being passed, e.g. "h" for the hour, "L" for the month etc.
35+
* 84b760b: [HttpKernel] fixed Client when using StreamedResponses (closes #5370)
36+
* 67e697f: fixed PDO session handler for Oracle (closes #5829)
37+
* c2a8a0b: [HttpFoundation] fixed PDO session handler for Oracle (closes #5829)
38+
* a30383d: [Locale] removed a check that is done too early (and it is done twice anyways)
39+
* 84635bd: [Form] allowed no type guesser to be registered
40+
* 8377146: Adding new localized strings for farsi validation.
41+
* e34fb41: [HttpFoundation] moved the HTTP protocol check from StreamedResponse to Response (closes #5937)
42+
* 4909bc3: [Form] Fixed forms not to be marked invalid if their children are already marked invalid
43+
* dc80385: [Form] Fixed NumberToLocalizedStringTransformer to accept both comma and dot as decimal separator, if possible
44+
* 208e134: [FrameworkBundle] Router skip defaults resolution for arrays
45+
* a0af8bf: [Form] Adapted HTML5 format in DateTimeType as response to a closed ICU ticket
46+
* 6b42c8c: The exception message should say which field is not mapped
47+
* 9872d26: [HttpFoundation] Fix name sanitization after perfoming move
48+
* 2d9a6fc: Use Norm Data instead of Data
49+
* a094f7e: Add check to Store::unlock to ensure file exists
50+
1051
* 2.1.3 (2012-10-30)
1152

1253
* 6f15c47: [ClassLoader] fixed unbracketed namespaces (closes #5747)

‎src/Symfony/Component/HttpFoundation/Request.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,7 @@ public function getSession()
617617
* Whether the request contains a Session which was started in one of the
618618
* previous requests.
619619
*
620-
* @return boolean
620+
* @return Boolean
621621
*
622622
* @api
623623
*/
@@ -630,7 +630,11 @@ public function hasPreviousSession()
630630
/**
631631
* Whether the request contains a Session object.
632632
*
633-
* @return boolean
633+
* This method does not give any information about the state of the session object,
634+
* like whether the session is started or not. It is just a way to check if this Request
635+
* is associated with a Session instance.
636+
*
637+
* @return Boolean true when the Request contains a Session object, false otherwise
634638
*
635639
* @api
636640
*/

‎src/Symfony/Component/Routing/Loader/schema/routing/routing-1.0.xsd

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@
5050
<xsd:attribute name="hostname-pattern" type="xsd:string" />
5151
</xsd:complexType>
5252

53-
<xsd:complexType name="element" mixed="true">
54-
<xsd:attribute name="key" type="xsd:string" />
53+
<xsd:complexType name="element">
54+
<xsd:simpleContent>
55+
<xsd:extension base="xsd:string">
56+
<xsd:attribute name="key" type="xsd:string" />
57+
</xsd:extension>
58+
</xsd:simpleContent>
5559
</xsd:complexType>
5660
</xsd:schema>

0 commit comments

Comments
 (0)
0