Skip to content
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

Merge 1.4 into 1.5 #474

Merged
merged 15 commits into from
Nov 10, 2017
Merged

Merge 1.4 into 1.5 #474

merged 15 commits into from
Nov 10, 2017

Conversation

jaugustin
Copy link
Member

No description provided.

havvg and others added 14 commits July 30, 2015 21:30
Travis: updated symfony and php versions
The Twig_Filter_Method class is deprecated since version 1.12 and will be removed in 2.0. Use Twig_SimpleFilter instead.
Replace deprecated Twig_Filter_Method class
feat(DataLoader): allow to set foreign key for a table not included in fixture
$bufferPhingOutput is initially set to Symfony's kernel.debug parameter.
However, the conditional for checking the buffer works the other way round:
If buffering is enabled, the buffer is discarded, otherwise it is output.

This commit fixes that issue. Now if $bufferPhingOutput is true,
the detailed output of the command is displayed.
Fix profiler do not escape HTML for SQL query
update memory limit for php 5.3
[1.4] fix tests with php 5.3, add build with php 7.1 / 7.2
update README with branches versions
…sity

Fix inverted command verbosity for PropelBundle 1.4/1.5/1.6
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.

None yet

5 participants