8000 [FrameworkBundle] Fixes invalid serialized objects in cache by jfsimon · Pull Request #7235 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

[FrameworkBundle] Fixes invalid serialized objects in cache #7235

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 4,049 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
4049 commits
Select commit Hold shift + click to select a range
922c201
Merge branch '2.0' into 2.1
fabpot Nov 29, 2012
6c67476
Merge branch '2.0' into 2.1
fabpot Nov 29, 2012
d50f9d7
Merge branch '2.0' into 2.1
fabpot Nov 29, 2012
375fdc8
updated CHANGELOG for 2.1.4
fabpot Nov 29, 2012
936abe1
updated VERSION for 2.1.4
fabpot Nov 29, 2012
7b234db
[HttpFoundation] added a small comment about the meaning of Request::…
fabpot Nov 30, 2012
a82f3ed
bumped Symfony version to 2.1.5-DEV
fabpot Dec 2, 2012
a6e08b1
Merge branch '2.0' into 2.1
fabpot Dec 3, 2012
faeecf8
Fix namespace of Validator and BrowserKit Tests
franmomu Dec 3, 2012
4f787fe
merged branch franmomu/fix_validator_test_namespace (PR #6177)
fabpot Dec 3, 2012
2ed30e7
Fixed DefaultValue for session.auto_start in NodeDefinition
franmomu Nov 29, 2012
d6acb55
merged branch franmomu/auto_start_default_value (PR #6155)
fabpot Dec 3, 2012
d03281b
[Security] Move DigestDataTest.php inside the Security component
franmomu Dec 4, 2012
b94d4c4
merged branch franmomu/move_security_digest_data_test (PR #6183)
fabpot Dec 4, 2012
889bd2e
Merge branch '2.0' into 2.1
fabpot Dec 6, 2012
10e5f3b
Removed useless branch alias for dev-master in composer.json
hason Dec 6, 2012
101f042
merged branch hason/composer_2_1 (PR #6201)
fabpot Dec 6, 2012
99321cb
[DoctrineBridge] Fixed: Exception is thrown if the entity class is no…
webmozart Dec 6, 2012
db2ee54
[DoctrineBridge] Improved exception message
webmozart Dec 6, 2012
b604eb7
[DoctrineBridge] Improved performance of the EntityType when used wit…
webmozart Dec 6, 2012
6be1d29
merged branch bschussek/issue6141 (PR #6206)
fabpot Dec 6, 2012
864cc85
Merge branch '2.0' into 2.1
fabpot Dec 7, 2012
6e7e08f
[Form] Fixed the default value of "format" in DateType to DateType::D…
webmozart Dec 6, 2012
ca5d9ac
[DoctrineBridge] Fixed caching in DoctrineType when "choices" or "pre…
webmozart Dec 6, 2012
992707e
merged branch bschussek/issue6190 (PR #6216)
fabpot Dec 7, 2012
74c8b01
merged branch bschussek/issue6141_2 (PR #6217)
fabpot Dec 7, 2012
a37e5e3
[Form] Fix const inside an anonymous function
franmomu Dec 9, 2012
d451933
merged branch franmomu/fix_const_in_anonymous_function (PR #6244)
fabpot Dec 10, 2012
9e46819
Fixed: HeaderBag::parseCacheControl() not parsing quoted zero correctly
patrickallaert Dec 10, 2012
33cfd02
merged branch patrickallaert/HeaderBag/QuotedZeroNotParsedCorrectly (…
fabpot Dec 10, 2012
9cf1d14
Fixed a typo
Dec 8, 2012
947a48d
merged branch DenisGorbachev/patch-2 (PR #6240)
fabpot Dec 10, 2012
a1734dd
Revert "merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)" …
fabpot Dec 10, 2012
bae5cff
fix date in changelog
le6o Dec 10, 2012
a22111b
merged branch le6o/patch-1 (PR #6260)
fabpot Dec 10, 2012
4e909bd
Fix to allow null values in labels array
kaywalker Aug 30, 2012
20dd9d9
merged branch kaywalker/master (PR #5394)
fabpot Dec 11, 2012
f853fc3
removed unneeded comment
fabpot Dec 11, 2012
1ab4923
Improved Cache-Control header when no-cache is sent
dlsniper Nov 17, 2012
47dfb9c
[HttpFoundation] added some tests for the previous merge and removed …
fabpot Dec 11, 2012
d6a402a
[Security] fixed path info encoding (closes #6040, closes #5695)
fabpot Dec 11, 2012
d2885ad
Merge branch '2.0' into 2.1
fabpot Dec 11, 2012
7f3be5c
fixed CS
fabpot Dec 11, 2012
6a9a8c0
Update src/Symfony/Component/Validator/Resources/translations/validat…
stloyd Dec 12, 2012
3caa32e
merged branch stloyd/patch-1 (PR #6279)
fabpot Dec 12, 2012
eac14b5
Check if key # is defined in $value
haswalt Aug 31, 2012
b73b87d
Maintain array structure
Sep 1, 2012
b4e894a
- Test undefined index #
egulias Dec 12, 2012
e0cefd7
merged branch fabpot/serializer (PR #6302)
fabpot Dec 12, 2012
21a59ca
[Form] Fixed FileType not to throw an exception when bound empty
webmozart Dec 13, 2012
a6930a3
merged branch bschussek/issue6134 (PR #6319)
fabpot Dec 13, 2012
35e19c7
refactor ControllerNameParser
Tobion Dec 12, 2012
6e499a3
merged branch Tobion/controllernameparser (PR #6297)
fabpot Dec 13, 2012
03b880f
[Form] Fixed treatment of countables and traversables in Form::isEmpty()
webmozart Dec 13, 2012
722c19b
merged branch bschussek/issue5828 (PR #6321)
fabpot Dec 13, 2012
d2231d8
[Console] Add support for parsing terminal width/height on localized …
Seldaek Dec 13, 2012
521fcb1
merged branch Seldaek/consolfix (PR #6330)
fabpot Dec 13, 2012
b20c5ca
[Form] Fixed reverse transformation of values in DateTimeToStringTran…
webmozart Dec 13, 2012
2447757
merged branch bschussek/datetimetostringtransformer (PR #6333)
fabpot Dec 13, 2012
20e93bf
[Session] Utilize MongoDB::selectCollection()
jmikola Dec 13, 2012
b28af77
[Session] Support MongoClient and Mongo connection classes
jmikola Dec 13, 2012
de19a81
[HttpKernel] Support MongoClient and Mongo connection classes
jmikola Dec 13, 2012
78c5273
[Session] Document Mongo|MongoClient argument type instead of "object"
jmikola Dec 13, 2012
f24e3d7
[HttpKernel] Revise MongoDbProfilerStorage::write() return value
jmikola Dec 13, 2012
a5530c5
[Propel1Bridge] Fix "and => &&" CS in ModelChoiceList
igorw Dec 13, 2012
422ad83
merged branch igorw/patch-3 (PR #6341)
fabpot Dec 14, 2012
c6bd807
merged branch jmikola/2.1-mongoclient (PR #6338)
fabpot Dec 14, 2012
ad29df5
[Form] Fixed DateTimeToStringTransformer parsing on PHP < 5.3.8
webmozart Dec 14, 2012
6b9ee87
[Session] Fixed a bug with the TestListener
Dec 14, 2012
563b208
merged branch bschussek/bugfix (PR #6353)
fabpot Dec 14, 2012
098b593
[Session] Added exception to save method
Dec 14, 2012
c67ddb2
merged branch baldurrensch/testlistener_fix (PR #6362)
fabpot Dec 15, 2012
54d3f81
[FrameworkBundle] Fixed logic under test environment.
Dec 15, 2012
021de72
merged branch drak/frameworktestsession (PR #6369)
fabpot Dec 15, 2012
aca311e
Merge branch '2.0' into 2.1
fabpot Dec 15, 2012
47a5604
[FrameworkBundle] fixed broken tests
fabpot Dec 15, 2012
e713bb4
Fixed failing test
webmozart Dec 15, 2012
ab64da5
[Locale] fixed a test
fabpot Dec 15, 2012
2cd43da
[Process] Allow non-blocking start with PhpProcess
krichprollsch Dec 18, 2012
055daa9
merged branch cup-of-giraf/phpprocess_allow_non_blocking (PR #6411)
fabpot Dec 19, 2012
4bee2e9
Merge branch '2.0' into 2.1
fabpot Dec 20, 2012
e7fc97e
updated CHANGELOG for 2.1.5
fabpot Dec 20, 2012
1493f74
Merge branch '2.0' into 2.1
fabpot Dec 20, 2012
1770d3f
updated VERSION for 2.1.5
fabpot Dec 20, 2012
06e1de9
bumped Symfony version to 2.1.6-DEV
fabpot Dec 20, 2012
8513777
[HttpFoundation] Update docblock for non-working method
Dec 19, 2012
8beee64
[Form] Fix for `DateTimeToStringTransformer`
stloyd Dec 20, 2012
ce536cd
[FrameworkBundle] fixed ESI calls
fabpot Dec 20, 2012
8013469
Merge branch '2.0' into 2.1
fabpot Dec 20, 2012
2dd2bac
updated CHANGELOG for 2.1.6
fabpot Dec 21, 2012
9270c41
updated VERSION for 2.1.6
fabpot Dec 21, 2012
031a09d
bumped Symfony version to 2.1.7-DEV
fabpot Dec 21, 2012
6855cff
add preferred_query option to ModelType
havvg Dec 21, 2012
05fca6d
use preferred_choices in favor of preferred_query
havvg Dec 21, 2012
bfccd28
HttpUtils must handle RequestMatcher too
dbu Dec 22, 2012
8fd34e4
merged branch stloyd/bugfix/tests_form (PR #6440)
fabpot Dec 23, 2012
b444a10
Fixed php doc of GenericEvent::__construct
lyrixx Dec 26, 2012
f66625d
merged branch lyrixx/fix-eventdispatcher (PR #6487)
fabpot Dec 27, 2012
a0ea84b
merged branch havvg/feature/propel1-modelchoice-preferred (PR #6454)
fabpot Dec 27, 2012
a6704f3
[Tests] Fix namespaces
franmomu Dec 27, 2012
277abab
merged branch franmomu/fix_test_namespaces (PR #6497)
fabpot Dec 28, 2012
87dcf25
[Form] Fixed test regression introduced in #6440
webmozart Dec 28, 2012
9b71f30
merged branch bschussek/issue6440 (PR #6505)
fabpot Dec 28, 2012
ef6f241
[Locale] Fixed the StubLocaleTest for ICU versions lower than 4.8.
jakzal Dec 29, 2012
81967f6
[Form] Fixed failing tests for DateTimeToStringTransformer.
jakzal Dec 29, 2012
1d395ad
Revert "[DoctrineBridge] Improved performance of the EntityType when …
fabpot Dec 29, 2012
f4f2ba8
merged branch jakzal/form-tests-fix (PR #6517)
fabpot Dec 29, 2012
477ddfb
merged branch jakzal/stub-tests (PR #6515)
fabpot Dec 29, 2012
a5aeb21
[Process] Prevented test from failing when pcntl extension is not ena…
jakzal Dec 30, 2012
bf468ca
merged branch jakzal/process-test-fix (PR #6520)
fabpot Dec 30, 2012
c282a2b
[DoctrineBridge] Allowing memcache port to be 0 to support memcache u…
tammyd Dec 31, 2012
13f0a80
merged branch dbu/2.1-requestmatcher-httputils (PR #6470)
fabpot Jan 2, 2013
36627c4
merged branch tammyd/bugfix/memcache-port-0 (PR #6529)
fabpot Jan 2, 2013
87b6cc2
Fix Expires when the header is -1
dlsniper Dec 22, 2012
d9a55ed
merged branch dlsniper/fix-expiry (PR #6471)
fabpot Jan 2, 2013
ba5cd6a
Fixed missing plural message in portuguese validator
abreu-dev Jan 2, 2013
25f970a
merged branch andreabreu98/master (PR #6534)
fabpot Jan 2, 2013
75952af
[HttpFoundation] better fix for non-parseable Expires header date
Tobion Jan 2, 2013
10b01c9
[HttpFoundation] fix return types and handling of zero in Response
Tobion Jan 2, 2013
114bbce
merged branch Tobion/expires-header (PR #6535)
fabpot Jan 2, 2013
6c5e615
[Form] Fixed DateType when used with the intl extension disabled.
jakzal Jan 3, 2013
c526ad9
[Form] Fixed inheritance of "error_bubbling" in RepeatedType
webmozart Jan 3, 2013
14be3e0
merged branch bschussek/issue5428 (PR #6545)
fabpot Jan 3, 2013
9153f19
merged branch jakzal/date-type-fix (PR #6543)
fabpot Jan 3, 2013
d601b13
use the right RequestMatcherInterface
dbu Jan 4, 2013
8349816
Merge branch '2.0' into 2.1
fabpot Jan 4, 2013
ea09a53
merged branch dbu/2.1-requestmatcher-httputils (PR #6553)
fabpot Jan 4, 2013
fa6fb6f
[Process] Do not reset stdout/stderr pipes on Interrupted system call
romainneutron Jan 3, 2013
94aacec
merged branch romainneutron/StreamSelect (PR #6540)
fabpot Jan 4, 2013
4abd5bf
Restrict Monolog version to be in version `<1.3`.
stloyd Jan 5, 2013
f1d2fe9
Merge branch '2.0' into 2.1
fabpot Jan 5, 2013
d50df09
merged branch stloyd/bugfix/monolog_restrict (PR #6570)
fabpot Jan 5, 2013
33e9d00
[Form] Deleted references in FormBuilder::getFormConfig() to improve …
webmozart Jan 5, 2013
8f21f89
[2.1] [Console] Added getTerminalDimensions() with fix for osx/freebsd
gigablah Jan 5, 2013
24534ce
merged branch gigablah/terminal-dimensions-fix (PR #6581)
fabpot Jan 5, 2013
5699a34
Merge branch '2.0' into 2.1
fabpot Jan 5, 2013
d786e09
[Console] made Application::getTerminalDimensions() public
fabpot Jan 5, 2013
31edf85
Update Ukrainian translation for 2.1 branch
Jan 6, 2013
e9df732
merged branch vitaliytv/2.1 (PR #6589)
fabpot Jan 7, 2013
87a85b6
merged branch bschussek/issue6558 (PR #6578)
fabpot Jan 7, 2013
cd04bd7
merged branch drak/flashcount (PR #6423)
fabpot Jan 7, 2013
ae3d454
[Form] corrected source node for a Danish translation
shieldo Jan 7, 2013 8000
850cda1
merged branch shieldo/patch-9 (PR #6609)
fabpot Jan 8, 2013
55aa012
[Form] Fixed EntityChoiceList when loading objects with negative inte…
webmozart Jan 8, 2013
87160a7
merged branch bschussek/issue6610 (PR #6617)
fabpot Jan 8, 2013
2155719
[Component] [Security] fixed PSR-2 coding violation in ClassUtilsTest…
Jan 8, 2013
8ca1b80
[Console] Make style formatter matching less greedy to avoid having t…
Seldaek Jan 8, 2013
eb93e66
[Console] Fix style escaping parsing
Seldaek Jan 8, 2013
f24e32c
merged branch Seldaek/stylefix (PR #6623)
fabpot Jan 8, 2013
1949ce0
merged branch hhamon/cs_fix (PR #6621)
fabpot Jan 8, 2013
8321127
Merge branch '2.0' into 2.1
fabpot Jan 8, 2013
bde5a7f
[HttpKernel] Clarify misleading comment in ExceptionListener
igorw Jan 8, 2013
d0dc59c
merged branch igorw/exception-listener-comment (PR #6611)
fabpot Jan 9, 2013
b33d5bc
removed the .gitattributes files (closes #6605, reverts #5674)
fabpot Jan 9, 2013
34def9f
Handle the deprecation of IntlDateFormatter::setTimeZoneId() in PHP 5.5.
LawnGnome Jan 10, 2013
4991607
Fix version_compare() calls for PHP 5.5.
LawnGnome Jan 10, 2013
8024262
Removed underscores from test method names to be consistent with othe…
jakzal Jan 11, 2013
3095765
merged branch jakzal/no-underscored-methods-in-tests-2.1 (PR #6695)
fabpot Jan 11, 2013
9257b03
[Profiler] [Redis] Fix sort of profiler rows.
stephpy Jan 11, 2013
9b92e8e
merged branch stephpy/redis_profiler_sort (PR #6703)
fabpot Jan 11, 2013
e463a63
Merge branch '2.0' into 2.1
fabpot Jan 11, 2013
92f951f
merged branch LawnGnome/PHP-5.5-compat (PR #6647)
fabpot Jan 11, 2013
785d365
fixes a bug when output/error output contains a % character
schmittjoh Jan 12, 2013
a62e04f
[Process] Fix docblocks, remove `return` from `PhpProcess#start()` as…
stloyd Jan 8, 2013
da0b042
merged branch schmittjoh/exFix (PR #6716)
fabpot Jan 12, 2013
635b1fc
StringInput resets the given options.
Jan 15, 2013
4c36625
merged branch stloyd/bugfix/process_phpdocs (PR #6626)
fabpot Jan 16, 2013
2dfe966
fixed CS
fabpot Jan 16, 2013
a25fad8
Merge branch '2.0' into 2.1
fabpot Jan 17, 2013
28add12
updated CHANGELOG for 2.1.7
fabpot Jan 17, 2013
3444290
updated VERSION for 2.1.7
fabpot Jan 17, 2013
f537849
Merge branch '2.0' into 2.1
fabpot Jan 17, 2013
9155a23
bumped Symfony version to 2.1.8-DEV
fabpot Jan 17, 2013
5aa83ad
KNOWN_ISSUES with php 5.3.16
vicb Jan 18, 2013
9223c5a
merged branch vicb/php5.3.16 (PR #6795)
fabpot Jan 18, 2013
11aaa2e
Added an error message in the DebugClassLoader when using / instead o…
stof Jan 18, 2013
84c6b48
merged branch stof/debug_class_loader (PR #6803)
fabpot Jan 19, 2013
e6a7e4c
Fix typos in README
asm89 Jan 19, 2013
fada75c
merged branch asm89/patch-3 (PR #6806)
fabpot Jan 20, 2013
bdc7e91
Merge branch '2.0' into 2.1
fabpot Jan 22, 2013
e7624b6
[Security] Add PHPDoc to AuthenticationEvents
franmomu Jan 22, 2013
d77828c
Fixed missing class argument when throwing exception
xamado Jan 25, 2013
f0fefeb
merged branch xamado/master (PR #6884)
fabpot Jan 26, 2013
6f71948
[Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
fabpot Jan 27, 2013
d6c0455
Correct comment in NativeSessionStorage regarding session.save_handler
igorw Jan 30, 2013
8c804c7
merged branch igorw/session-save-handler-comment (PR #6922)
fabpot Jan 31, 2013
0c3d0db
merged branch franmomu/add_phpdoc_to_authentication_events (PR #6831)
fabpot Feb 1, 2013
04cb480
Merge branch '2.0' into 2.1
fabpot Feb 4, 2013
09bbb68
[FrameworkBundle] removed obsolete comment (see 2e356c1)
fabpot Feb 4, 2013
8ca00c5
[Security] fixed session creation when none is needed (closes #6917)
fabpot Feb 4, 2013
3e2ff71
merged branch fabpot/avoid-session-creation (PR #6964)
fabpot Feb 4, 2013
e50d333
[HttpKernel] fixed the creation of the Profiler directory
fabpot Feb 7, 2013
3615e19
[Security] fixed session creation on login (closes #7011)
adriensamson Feb 7, 2013
10ed567
merged branch adriensamson/issue-7011 (PR #7013)
fabpot Feb 7, 2013
83e9558
Fix 'undefined index' error, when entering scope recursively
ludekstepan Nov 26, 2012
0c63bbd
merged branch ludekstepan/fix-di-scope-nesting (PR #6119)
fabpot Feb 7, 2013
6485273
Merge branch '2.0' into 2.1
fabpot Feb 7, 2013
e0637fa
[DependencyInjection] Add clone for resources which were introduced i…
igorw Feb 7, 2013
6a9c510
fixed the IP address in HttpCache when calling the backend
fabpot Feb 9, 2013
42d3c4c
added support for the X-Forwarded-For header (closes #6982, closes #7…
fabpot Feb 9, 2013
22e997a
merged branch fabpot/ip-cache (PR #7034)
fabpot Feb 11, 2013
33aca01
Merge branch '2.0' into 2.1
fabpot Feb 11, 2013
0209eb6
Merge branch '2.0' into 2.1
fabpot Feb 11, 2013
5e8d844
[Process] Warn user with a useful message when tmpfile() failed
Seldaek Feb 14, 2013
7d143aa
merged branch Seldaek/proctemp (PR #7066)
fabpot Feb 14, 2013
0eff68f
Fix REMOTE_ADDR for cached subrequests
mweimerskirch Feb 16, 2013
8fc69c3
merged branch mweimerskirch/patch-12 (PR #7092)
fabpot Feb 17, 2013
98d5750
[HttpKernel] added some tests for previous merge
fabpot Feb 17, 2013
18b139d
[FrameworkBundle] tweaked reference dumper command (see #7093)
1ed Feb 17, 2013
75c6194
merged branch 1ed/ref-dumper-tweak-2.1 (PR #7097)
fabpot Feb 17, 2013
6fb7904
Merge branch '2.0' into 2.1
fabpot Feb 18, 2013
3e40c17
[HttpKernel] fixed locale management when exiting sub-requests
fabpot Feb 17, 2013
50c3de3
merged branch fabpot/locale-fix (PR #7099)
fabpot Feb 19, 2013
e7e61fd
merged branch jfcixmedia/2.1 (PR #5838)
fabpot Oct 27, 2012
b4b291f
Fix docblock type
Maks3w Feb 22, 2013
9f59ac9
merged branch Maks3w/patch-5 (PR #7151)
fabpot Feb 22, 2013
368f62f
Expanded fault-tolerance for unusual cookie dates
ecaron Feb 21, 2013
0fb397c
merged branch TrackIF/master (PR #7149)
fabpot Feb 22, 2013
00fbb7e
[Form] Added test for "label" option to accept the value "0"
webmozart Feb 21, 2013
f61295d
merged branch bschussek/issue6862 (PR #7154)
fabpot Feb 22, 2013
b7bd630
[Form] Fixed TimeType not to render a "size" attribute in select tags
webmozart Feb 22, 2013
f0704aa
Update composer.json
guilhermeblanco Feb 22, 2013
e10cd19
merged branch guilhermeblanco/patch-13 (PR #7160)
fabpot Feb 22, 2013
205021b
merged branch bschussek/issue6153 (PR #7155)
fabpot Feb 22, 2013
b2080c4
[HttpFoundation] Remove Cache-Control when using https download via I…
Feb 22, 2013
52bd4ff merged branch cloppy/2.1 (PR #7153)
fabpot Feb 22, 2013
06ebb0d
Defined stable version point of Doctrine.
guilhermeblanco Feb 22, 2013
6e3fa85
merged branch guilhermeblanco/patch-14 (PR #7161)
fabpot Feb 23, 2013
22dbfc0
Merge branch '2.0' into 2.1
fabpot Feb 23, 2013
222c846
updated CHANGELOG for 2.1.8
fabpot Feb 23, 2013
dffc315
updated VERSION for 2.1.8
fabpot Feb 23, 2013
7c4323f
bumped Symfony version to 2.1.9-DEV
fabpot Feb 23, 2013
ae5b94f
fixed CHANGELOG
fabpot Feb 23, 2013
0690709
added a DebuClassLoader::findFile() method to make the wrapping less …
lsmith77 Feb 24, 2013
b1ea8e5
Fixed handling absent href attribute in base tag
mvdbos Feb 25, 2013
0c09b93
merged branch matthijsvandenbos/matthijsvandenbos/basetag-href-fix (P…
fabpot Feb 26, 2013
d10ad0f
merged branch lsmith77/debugclassloader_findfile_2_1 (PR #7168)
fabpot Feb 27, 2013
83382bc
[TwigBridge] fixed the translator extractor that were not trimming th…
fabpot Feb 27, 2013
8f8ba38
[DomCrawler] fix handling of schemes by Link::getUri()
mvdbos Feb 28, 2013
8e99eb0
merged branch matthijsvandenbos/matthijsvandenbos/link-handle-scheme …
fabpot Feb 28, 2013
bae83c7
[TwigBridge] fixed trans twig extractor
jfsimon Feb 27, 2013
66c2be3
merged branch jfsimon/issue-6943 (PR #7206)
fabpot Feb 28, 2013
5b19c89
[Console] fixed unparsed StringInput tokens
jfsimon Feb 28, 2013
f52120b
merged branch jfsimon/issue-6749 (PR #7220)
fabpot Feb 28, 2013
e2ef708
Options small typo
yahuarkuntur Feb 28, 2013
1114f73
merged branch yahuarkuntur/master (PR #7224)
fabpot Feb 28, 2013
08757db
Merge branch '2.0' into 2.1
fabpot Mar 1, 2013
0e7b5fb
fixed CS
fabpot Mar 1, 2013
e253018
[FrameworkBundle] fixed router cache class parameters
jfsimon Mar 1, 2013
4d99bf1
[FrameworkBundle] fixed invalid serialized objects after cache clear
jfsimon Mar 1, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch '2.0' into 2.1
* 2.0:
  [Form] Fixed "label" option to accept the value "0"
  [DomCrawler] lowered parsed protocol string (fixes #6986)

Conflicts:
	src/Symfony/Component/Form/Extension/Core/Type/FieldType.php
	tests/Symfony/Tests/Component/Form/Extension/Core/Type/FieldTypeTest.php
  • Loading branch information
fabpot committed Feb 23, 2013
commit 22dbfc009fcf990d77d77073ea6f728b159ededc
2 changes: 1 addition & 1 deletion src/Symfony/Component/DomCrawler/Link.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Link
*/
public function __construct(\DOMNode $node, $currentUri, $method = 'GET')
{
if (!in_array(substr($currentUri, 0, 4), array('http', 'file'))) {
if (!in_array(strtolower(substr($currentUri, 0, 4)), array('http', 'file'))) {
throw new \InvalidArgumentException(sprintf('Current URI must be an absolute URL ("%s").', $currentUri));
}

Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0