8000 [Process] Fixed issue where $env or $_ENV can contain array values by mmucklo · Pull Request #8122 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

[Process] Fixed issue where $env or $_ENV can contain array values #8122

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 9,869 commits into from
Closed
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9869 commits
Select commit Hold shift + click to select a range
472cca1
updated VERSION for 2.0.23
fabpot Mar 20, 2013
a3241ed
merged branch nikrou/relative-path-with-slash (PR #7434)
fabpot Mar 20, 2013
5f2ac3f
Merge branch '2.0' into 2.1
fabpot Mar 20, 2013
ea66d00
Revert "merged branch jfsimon/issue-6928 (PR #7378)"
jfsimon Mar 20, 2013
1ea87ed
change wrapped exception message to be more usefull
gimler Mar 20, 2013
ba9e3ff
merged branch gimler/pimp_exception (PR #7433)
fabpot Mar 20, 2013
f994d95
merged branch Tobion/strict-req-xsd (PR #7424)
fabpot Mar 20, 2013
5a15a49
Merge branch '2.1' into 2.2
fabpot Mar 20, 2013
53d8cbd
[HttpFoudantion] fixed Request::getPreferredLanguage()
jfsimon Mar 20, 2013
3b3c67f
Update .travis.yml (closes #7355)
aitboudad Mar 12, 2013
496c83b
merged branch jfsimon/issue-7378 (PR #7438)
fabpot Mar 20, 2013
7f46f1e
Added unit tests to Dumper
eddiejaoude Feb 21, 2013
5dc3dea
merged branch eddiejaoude/master (PR #7144)
fabpot Mar 20, 2013
495100c
[Form] made DefaultCsrfProvider using session_status() when available
bamarni Mar 21, 2013
538b677
merged branch bamarni/form-default-csrf-provider-session-status (PR #…
fabpot Mar 22, 2013
cec20f7
[Yaml] fixed bugs with folded scalar parsing
ezzatron Mar 23, 2013
6aa6079
merged branch ezzatron/yaml-folded-scalar (PR #7455)
fabpot Mar 23, 2013
778c4a8
Added '@@' escaping strategy for YamlFileLoader and YamlDumper
Mar 8, 2013
89548a9
merged branch tPl0ch/feature/yaml-parameter-escape (PR #7357)
fabpot Mar 23, 2013
e41cd47
#7106 - fix for ZTS builds
Mar 2, 2013
4804562
merged branch lizjulien/7106 (PR #7248)
fabpot Mar 23, 2013
a35df6e
merged branch DHorchler/2.1 (PR #7193)
fabpot Mar 23, 2013
4105be1
Merge branch '2.1' into 2.2
fabpot Mar 23, 2013
821588c
[WebProfiler] added the possibility to override the application name/…
fabpot Feb 7, 2013
9c356b6
merged branch fabpot/webprofiler-customization (PR #7003)
fabpot Mar 23, 2013
900cecc
reverts some behavior changes made in c66d1f9de30fd1b6a86cca10dd79d12…
schmittjoh Mar 23, 2013
42311b1
merged branch schmittjoh/routingFix (PR #7458)
fabpot Mar 23, 2013
505d9e8
[FrameworkBundle] Reuse definition variable in FormPass
franmomu Mar 23, 2013
9b23754
merged branch franmomu/reuse_variable_formpass (PR #7464)
fabpot Mar 24, 2013
3ea5d47
[HttpFoundation] getClientIp is fixed.
denvned Mar 25, 2013
3a38a03
Add missing use
Mar 20, 2013
591d133
Remove already defined arguments
Mar 20, 2013
0de1a60
merged branch xkobal/master (PR #7436)
fabpot Mar 26, 2013
e038b72
[Security] fixed wrong interface
fabpot Mar 26, 2013
8c028e7
updated CHANGELOG for 2.1.9
fabpot Mar 26, 2013
64f72b7
update CONTRIBUTORS for 2.1.9
fabpot Mar 26, 2013
dffbe07
updated VERSION for 2.1.9
fabpot Mar 26, 2013
a489bf1
[Validator][translation][japanese]replaced period to japanese one
77web Mar 26, 2013
6ec3c8a
bumped Symfony version to 2.1.10-DEV
fabpot Mar 26, 2013
6325951
Merge branch '2.1' into 2.2
fabpot Mar 26, 2013
64a4357
merged branch 77web/validator-translation-ja (PR #7478)
fabpot Mar 26, 2013
0645ca2
Keep the file extension in the temporary copy and test that it exists…
thewilkybarkid Mar 26, 2013
158ca55
Fixed long multibyte parameter logging in DbalLogger:startQuery
Mar 27, 2013
ba80ec9
merged branch burci/doctrinebridge-dballogger-bug (PR #7497)
fabpot Mar 27, 2013
d8148a1
Fix param docs for PropertyAccessor read method
jmikola Mar 27, 2013
c9bd098
[PropertyAccess] Remove trailing periods from doc blocks
jmikola Mar 27, 2013
223c1c7
merged branch jmikola/2.2-propertyaccess-docs (PR #7511)
fabpot Mar 28, 2013
b28f1cc
[Security] Removed unused var
lyrixx Mar 28, 2013
605a7cd
fix overwriting of request's locale if attribute _locale is missing
uwej711 Mar 28, 2013
45e5cb0
idAsIndex should be true with a smallint or bigint id field.
sterrien Mar 29, 2013
f64c414
[SecurityBundle] Fixed configuration exemple
lyrixx Mar 30, 2013
34a3ef2
small changes
bamarni Mar 31, 2013
e972a81
Doctrine cannot handle bare random non-utf8 strings
Mar 31, 2013
64091bc
On OS X, sys_get_tmp_dir() returns /var/private/..., which really is …
mpdude Mar 31, 2013
e3bdfe9
merged branch webfactory/fix-finder-test-osx (PR #7536)
fabpot Apr 1, 2013
da3177c
merged branch TerjeBr/persistent-token-provider (PR #7534)
fabpot Apr 1, 2013
43a9251
merged branch bamarni/minor-2.1 (PR #7533)
fabpot Apr 1, 2013
a0f0091
merged branch lyrixx/fix-security-config (PR #7528)
fabpot Apr 1, 2013
e29a69a
merged branch sterrien/patch-4 (PR #7519)
fabpot Apr 1, 2013
d5336e8
fixed doc references (closes #7515)
fabpot Apr 1, 2013
ce55cc7
merge branch '2.1' into 2.2
fabpot Apr 1, 2013
76b7e0a
fixed doc references (closes #7515)
fabpot Apr 1, 2013
dd9c1a8
[WebProfilerBundle] removed next pointer class in a template
bamarni Apr 2, 2013
5d507c1
merged branch bamarni/patch-3 (PR #7544)
fabpot Apr 5, 2013
e1ec8bf
[FrameworkBundle] fixed the discovery of the PHPUnit configuration fi…
fabpot Apr 5, 2013
f8563c7
[HttpFoundation] Fixed copy pasted comment from FlashBag in AttributeBag
Apr 5, 2013
8ab4692
merged branch phc/2.1 (PR #7569)
fabpot Apr 5, 2013
997db9b
Fixed phpdoc blocks to show that $uri can be passed as a string or Co…
caponica Apr 5, 2013
59b7592
updated CHANGELOG for 2.2.1
fabpot Apr 6, 2013
4025f07
Merge branch '2.1' into 2.2
fabpot Apr 6, 2013
b5588ac
updated VERSION for 2.2.1
fabpot Apr 6, 2013
52389d6
bumped Symfony version to 2.2.2-DEV
fabpot Apr 6, 2013
474f1be
[HttpKernel] Remove args from 5.3 stack traces to avoid filling log f…
Seldaek Apr 7, 2013
f58ded1
Fix Process timeout
romainneutron Apr 6, 2013
19cc6eb
Round stream_select fifth argument up.
romainneutron Apr 7, 2013
674d72b
merged branch Seldaek/fix-deprecated-logs (PR #7587)
fabpot Apr 7, 2013
eab20c0
merged branch romainneutron/process-timeout-2 (PR #7583)
fabpot Apr 7, 2013
c66815d
fixed CS
fabpot Apr 7, 2013
8daa00b
Fix timeout in Process::stop method
romainneutron Apr 6, 2013
544783e
merged branch romainneutron/process-timeout (PR #7580)
fabpot Apr 7, 2013
abf9784
Fix autocompletion of command names when namespaces conflict
Seldaek Apr 7, 2013
fffa53e
merged branch Seldaek/autocomplete_fix (PR #7589)
fabpot Apr 7, 2013
4498964
#7531: [HttpKernel][Config] FileLocator adds NULL as global resource …
ro0NL Apr 1, 2013
29a9630
merged branch ro0NL/master (PR #7537)
fabpot Apr 7, 2013
e40cde7
[HttpKernel] tweaked previous merge
fabpot Apr 7, 2013
9b27654
merged branch caponica/HttpKernelExtension_phpdoc_fix (PR #7573)
fabpot Apr 7, 2013
8890e63
Fix finding ACLs from ObjectIdentity's with different types
gordalina Apr 5, 2013
9ec22db
merged branch gordalina/multiple-classes-oids-acls (PR #7567)
fabpot Apr 7, 2013
ae79641
merged branch uwej711/fix_locale_is_overridden (PR #7516)
fabpot Apr 7, 2013
1e1a86b
Merge branch '2.1' into 2.2
fabpot Apr 7, 2013
fd143b0
[PropertyAccess] Add objectives to pluralMap
franmomu Apr 7, 2013
85a2719
merged branch franmomu/add_objective_to_plurals (PR #7594)
fabpot Apr 8, 2013
8624483
merged branch lyrixx/path-10 (PR #7597)
fabpot Apr 8, 2013
ee6ebc4
[HttpFoundation] fixed the creation of sub-requests under some circum…
Apr 8, 2013
8da105e
Update PhpEngine.php
janschoenherr Apr 8, 2013
0451cb6
merged branch janschoenherr/patch-5 (PR #7600)
fabpot Apr 9, 2013
f68571c
merged branch denvned/getClientIp-fix (PR #7472)
fabpot Apr 9, 2013
4ea481a
[Form] DateTimeToRfc3339Transformer use proper transformation extepti…
kibao Apr 9, 2013
557af39
[HttpFoundation] Fixed bug in key searching for NamespacedAttributeBag
ReneeVandervelde Apr 6, 2013
a37a1bc
fixed handling of "0" input on ask
kipit Apr 10, 2013
78c916d
merged branch kipit/ticket_7549 (PR #7623)
fabpot Apr 11, 2013
ed1eb9f
The /e modifier for preg_replace() is deprecated in PHP 5.5; replace …
Tatsh Apr 11, 2013
6e504a4
merged branch Tatsh/master (PR #7624)
fabpot Apr 11, 2013
304a02d
[Console] fixed handling of "0" input on ask
kipit Apr 10, 2013
b8dd714
merged branch kipit/ticket_7549 (PR #7625)
fabpot Apr 11, 2013
482689e
[Routing][XML Loader] Add a possibility to set a default value to null
aitboudad Apr 11, 2013
0ce71b3
merged branch kibao/datetime-rfc3339-transformer (PR #7618)
fabpot Apr 12, 2013
804f98f
merged branch Aitboudad/ticket__7335 (PR #7635)
fabpot Apr 12, 2013
d7ed92c
merged branch MaxVandervelde/fix/namespaced-parameter-issue (PR #7586)
fabpot Apr 12, 2013
1c2073b
[Yaml] fixed handling an empty value
pvolok Apr 12, 2013
78d6418
[Yaml] improved boolean naming ($notEOF -> !$EOF)
pvolok Apr 12, 2013
a4fea05
merged branch pvolok/fix-7274 (PR #7641)
fabpot Apr 12, 2013
0b831d5
fixed output of bag values
pvolok Apr 12, 2013
737f27b
merged branch pvolok/fix_7540 (PR #7643)
fabpot Apr 12, 2013
b9f8290
[HttpKernel] fixed the Kernel when the ClassLoader component is not a…
fabpot Apr 12, 2013
17799ca
[Console] Fix merging of application definition, fixes #7068, replace…
Seldaek Apr 12, 2013
813cc09
merged branch Seldaek/consmerge (PR #7650)
fabpot Apr 12, 2013
8520a9b
Fix download over SSL using IE < 8 and binary file response
nlegoff Apr 12, 2013
da59b5c
merged branch nlegoff/ie_download_over_ssl (PR #7651)
fabpot Apr 12, 2013
138165d
[HttpFoundation] do not use server variable PATH_INFO because it is a…
Tobion Apr 12, 2013
4d3bfee
merged branch Tobion/apache-pathinfo (PR #7656)
fabpot Apr 12, 2013
eb52d39
Disabled APC on Travis for PHP 5.5+ as it is not available
stof Apr 13, 2013
9f26f1b
merged branch stof/fix_travis_5_5 (PR #7663)
fabpot Apr 13, 2013
2d26679
[HttpKernel] truncate profiler token to 6 chars (see #7665)
1ed Apr 13, 2013
7d9ee3f
merged branch 1ed/token-length (PR #7665)
fabpot Apr 14, 2013
260d9a9
fix overwriting of request's locale if attribute _locale is missing
uwej711 Apr 16, 2013
8c498d1
Fix default value handling for multi-value options
jmikola Apr 16, 2013
24331df
merged branch jmikola/2.2-fix/gh7689 (PR #7690)
fabpot Apr 17, 2013
e2c9282
Merge branch '2.1' into 2.2
fabpot Apr 17, 2013
99b8cc7
merged branch uwej711/fix_locale_is_overridden_2_1 (PR #7686)
fabpot Apr 17, 2013
0b3ab00
Merge branch '2.1' into 2.2
fabpot Apr 17, 2013
3097b84
[DependencyInjection] fixed wrong exception class
fabpot Apr 17, 2013
56365e6
merged branch fabpot/inactive-scope-fix (PR #7696)
fabpot Apr 17, 2013
67225ec
Merge branch '2.1' into 2.2
fabpot Apr 17, 2013
908952d
fix a DI circular reference recognition bug
tgabi333 Apr 17, 2013
55a1a44
merged branch tgabi333/2.1 (PR #7699)
fabpot Apr 19, 2013
2e8753c
fixed source messages to accept pluralized messages [Validator][trans…
77web Apr 19, 2013
a00d208
merged branch 77web/validator-translation-ja-2.2plus (PR #7718)
fabpot Apr 19, 2013
92ceba3
[Translator] added additional conversion for encodings other than utf-8
BenjaminPaap Apr 17, 2013
07507f2
merged branch benjaminpaap/bugfixes/xliff_encoding (PR #7698)
fabpot Apr 20, 2013
c604507
[Translation] removed unneeded getter/setter
fabpot Apr 20, 2013
d8602c4
[Translation] removed an uneeded class property
fabpot Apr 20, 2013
4384c45
merged branch bendavies/iis-rewrite-subrequests (PR #7606)
fabpot Apr 20, 2013
149628b
[2.2] Pass ESI header to subrequests
mweimerskirch Mar 3, 2013
ad0663a
merged branch mweimerskirch/patch-13 (PR #7253)
fabpot Apr 20, 2013
554c046
fixed detection of secure cookies received over https
acoulton Apr 13, 2013
d5c41e9
[HttpFoundation] fixed empt 10000 y domain= in Cookie::__toString()
fabpot Apr 20, 2013
529359e
[BrowserKit] removed dead code
fabpot Apr 20, 2013
6c77235
[HttpFoundation][BrowserKit] fixed path when converting a cookie to a…
fabpot Apr 20, 2013
e640fa7
merged branch fabpot/cookie (PR #7738)
fabpot Apr 20, 2013
f20dae8
[Config] #7644 add tests for passing number looking attributes as str…
cordoval Apr 12, 2013
49681cc
merged branch cordoval/bugfix/7644 (PR #7655)
fabpot Apr 20, 2013
b5add72
Merge branch '2.1' into 2.2
fabpot Apr 20, 2013
406ed16
[Translation] fixed a unit test
fabpot Apr 20, 2013
869849e
Filesystem::touch() not working with different owners (utime/atime is…
Jan 4, 2013
409ebc8
merged branch fabpot/moved_filesystem_3 (PR #7752)
fabpot Apr 21, 2013
80da76a
[Validator] added missing estonian translation of messages
kgilden Apr 21, 2013
030c1b1
merged branch kgilden/trans_et (PR #7769)
fabpot Apr 21, 2013
5762544
Removed trailing whitespace
pborreli Apr 21, 2013
b21bfa4
merged branch pborreli/patch-9 (PR #7770)
fabpot Apr 21, 2013
a181ce1
[Validator] added missing estonian translation of messages
kgilden Apr 21, 2013
15b382f
merged branch kgilden/2.2 (PR #7776)
fabpot Apr 21, 2013
3e1309a
Merge branch '2.1' into 2.2
fabpot Apr 21, 2013
afa2b7e
added missing license blocks
fabpot Apr 22, 2013
5aa92a4
Merge branch '2.1' into 2.2
fabpot Apr 22, 2013
a6671e2
added missing license blocks
fabpot Apr 22, 2013
4953cc2
Add This field is missing RU translation
mmuruev Mar 20, 2013
8444120
merged branch fabpot/moved_validator_4 (PR #7784)
fabpot Apr 22, 2013
f782ce9
Re-added context information to log list
mweimerskirch Apr 22, 2013
b24c17b
merged branch mweimerskirch/patch-16 (PR #7806)
fabpot Apr 23, 2013
55ba7d3
Added reloading of fallback catalogues when calling addResource() (#7…
hilobok Apr 23, 2013
90bdcec
Reset all catalogues when adding resource to fallback locale (#7715, …
hilobok Apr 23, 2013
2746427
merged branch hilobok/ticket_7715 (PR #7819)
fabpot Apr 24, 2013
a05a033
Rename misprint property (from warmer to finder)
alexpods Apr 25, 2013
b45ae0c
merged branch alexpods/patch-1 (PR #7837)
fabpot Apr 25, 2013
cefbeaa
[Console] find command even if its name is a namespace too (closes #7…
pborreli Apr 26, 2013
7a3cdb8
merged branch pborreli/bug-7860 (PR #7863)
fabpot Apr 27, 2013
8fc31b2
[Process] Fix #5594 : `termsig` must be used instead of `stopsig` in …
romainneutron Apr 27, 2013
5a5072c
[Filesystem] copy() is not working when open_basedir is set
stloyd Apr 28, 2013
360de85
merged branch romainneutron/termsig (PR #7865)
fabpot Apr 29, 2013
5fa8392
[BrowserKit] fixed BC break done recently
fabpot Apr 29, 2013
81c5cf4
merged branch fabpot/cookies (PR #7879)
fabpot Apr 30, 2013
59c41ef
Merge branch '2.1' into 2.2
fabpot Apr 30, 2013
e46697f
[Translation] fixed a unit test
fabpot Apr 30, 2013
777fbfa
Fix getPort() returning 80 instead of 443 when X-FORWARDED-PROTO is s…
pst Apr 28, 2013
07a4f3d
merged branch pst/master (PR #7871)
fabpot Apr 30, 2013
1cac279
Merge branch '2.1' into 2.2
fabpot Apr 30, 2013
d728020
merged branch stloyd/patch-3 (PR #7869)
fabpot Apr 30, 2013
baa18c4
use while loop for iterating
henrikbjorn Apr 30, 2013
36f1d66
merged branch henrikbjorn/filesystem-limit (PR #7886)
fabpot May 1, 2013
c79e3cd
remove validation related headers when needed
bamarni Apr 26, 2013
8cdbf82
merged branch bamarni/issue-6977 (PR #7857)
fabpot May 1, 2013
d761a57
[Swiftmailer] bumped allowed versions
fabpot May 1, 2013
6a3a2d6
Merge branch '2.1' into 2.2
fabpot May 1, 2013
c903446
Fix wrong method in findTaggedServiceIds(), add example to docblock.
beberlei May 2, 2013
5b04056
merged branch beberlei/TaggedServices (PR #7909)
fabpot May 3, 2013
605e631
[Form] Improved multi-byte handling of NumberToLocalizedStringTransfo…
webmozart May 2, 2013
c0919ec
if the repository method returns an array ensure that it's internal p…
xabbuh May 2, 2013
aaef4ae
merged branch xabbuh/issue6651 (PR #7906)
fabpot May 3, 2013
a38b4a3
merged branch bschussek/issue7609 (PR #7902)
fabpot May 3, 2013
efcff47
[Form] Fixed: String validation groups are never interpreted as callb…
webmozart May 3, 2013
7b66cef
[Form] Fixed transform()/reverseTransform() to always throw Transform…
webmozart May 3, 2013
0c1a36c
merged branch bschussek/issue7371 (PR #7918)
fabpot May 3, 2013
0745fda
merged branch bschussek/issue7558 (PR #7917)
fabpot May 3, 2013
c3a5694
[Validator] Fixed: $traverse and $deep is passed to the visitor from …
webmozart May 3, 2013
02f40c1
merged branch bschussek/fix-validator (PR #7919)
fabpot May 3, 2013
0b434d3
[Validator] fixed wrong URL for XSD
fabpot May 4, 2013
02e3523
added a missing check for the provider key
fabpot May 5, 2013
bab89e4
merged branch fabpot/missing-provider-key-check (PR #7937)
fabpot May 5, 2013
92449e7
added additional tests to cover invalid argument exceptions in Output…
warmans Apr 30, 2013
aa05eec
Merge branch '2.1' into 2.2
fabpot May 6, 2013
ba8390b
[Filesystem] Fix regression introduced in 10dea948
stloyd May 6, 2013
d2081cd
[Process] Cleanup tests & prevent assertion that kills randomly Travi…
stloyd May 6, 2013
dbca7a7
merged branch stloyd/bugfix/fix_regression (PR #7944)
fabpot May 6, 2013
068fd86
merged branch stloyd/bugfix/process_tests (PR #7947)
fabpot May 6, 2013
cd52b25
fixed CS
fabpot May 6, 2013
ce28af4
updated CHANGELOG for 2.1.10
fabpot May 6, 2013
602229e
update CONTRIBUTORS for 2.1.10
fabpot May 6, 2013
33d7e3e
updated VERSION for 2.1.10
fabpot May 6, 2013
4dcba4a
bumped Symfony version to 2.1.11-DEV
fabpot May 6, 2013
d2de4d4
Merge branch '2.1' into 2.2
fabpot May 6, 2013
e102014
Fixed 2 namespaces
wouterj May 7, 2013
2aea0cb
merged branch WouterJ/fix_namespaces (PR #7967)
fabpot May 7, 2013
ec0680b
Fixed fatal error in normalize/denormalizeObject.
linclark May 7, 2013
e409f30
merged branch linclark/7971-error-denormalizeObject (PR #7971)
fabpot May 8, 2013
327b888
[Serializer] fixed CS (refs #7971)
fabpot May 8, 2013
9a3be3c
[Console] Added dedicated testcase for HelperSet class
warmans May 7, 2013
0e3f792
merged branch warmans/component_console_helper_helperset_tests_2.1 (P…
fabpot May 9, 2013
dd8d0a6
Fixed Loader import
Myke79 May 9, 2013
2f3578a
Added a test case for Loader::import().
jakzal May 9, 2013
773a04c
merged branch jakzal/loader-fix (PR #7987)
fabpot May 9, 2013
ba3d35f
[Form] Fixed a method name.
jakzal May 9, 2013
7c242a5
Fixed parsing of leading blank lines in folded scalars. Closes #7989.
ezzatron May 10, 2013
565be8f
merged branch jakzal/form-validator-tests-fix (PR #7996)
fabpot May 10, 2013
e084cb2
merged branch ezzatron/yaml-folded-leading-newlines (PR #7997)
fabpot May 10, 2013
691802f
Fixed XML syntax.
aforsblo May 10, 2013
6131e39
merged branch aforsblo/translation_syntax_fix (PR #8006)
fabpot May 10, 2013
566764c
fixed CS
fabpot May 10, 2013
df9de2b
Merge branch '2.1' into 2.2
fabpot May 10, 2013
c8fc65e
removed CHANGELOG for 2.0 as it is not maintained anymore
fabpot May 10, 2013
292843b
Fix Crawler::children() to not trigger a notice for childless node
lazyhammer May 16, 2013
d19be64
Merge branch '2.1' into 2.2
fabpot May 16, 2013
245dbde
merged branch lazyhammer/issue-8048 (PR #8054)
fabpot May 16, 2013
db9c55c
[CssSelector] Fix :nth-last-child() translation
lazyhammer May 17, 2013
a45e617
[Console] fix and refactor exit code handling
Tobion May 17, 2013
e257651
merged branch lazyhammer/issue-8068-2.1 (PR #8073)
fabpot May 19, 2013
ff715f4
Merge branch '2.1' into 2.2
fabpot May 19, 2013
2c9d60c
merged branch Tobion/console-exit-code (PR #8080)
fabpot May 19, 2013
9d40a09
Merge branch '2.1' into 2.2
fabpot May 19, 2013
0d2eea2
[Process] fix issue where env contains array vals
mmucklo May 23, 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
2 changes: 1 addition & 1 deletion src/Symfony/Bundle/FrameworkBundle/Routing/Router.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ private function resolveParameters(RouteCollection $collection)
foreach ($route->getRequirements() as $name => $value) {
$route->setRequirement($name, $this->resolveString($value));
}

$collection->setPrefix('/'.ltrim($this->resolveString($collection->getPrefix()), '/'));
$route->setPattern($this->resolveString($route->getPattern()));
}
}
Expand Down
10 changes: 10 additions & 0 deletions src/Symfony/Component/Routing/RouteCollection.php
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,16 @@ public function getPrefix()
return $this->prefix;
}

/**
* Sets the prefix (used to resolve placeholders).
*
* @param string The prefix
*/
public function setPrefix($prefix)
{
$this->prefix = $prefix;
}

/**
* Returns an array of resources loaded to build this collection.
*
Expand Down
0