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.

Sign up for GitHub

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

Jump to bottom

Merge stable #400

Merged
merged 49 commits into from
Sep 19, 2017
Merged

Merge stable #400

merged 49 commits into from
Sep 19, 2017

Conversation

greg0ire
Copy link
Contributor

Manual merge

core23 and others added 30 commits January 28, 2017 12:33
@core23 @greg0ire
Fixed version in deprecation information (sonata-project#356)
2ba81f2
@core23 @greg0ire
Removed deprecated getMock in unit tests (sonata-project#357)
2ccf15c
@SonataCI
DevKit updates (sonata-project#360)
a55da62
@greg0ire @OskarStark
Remove undefined block (sonata-project#362)
324f675 
This seems like a careless mistake. Old versions of Twig allow calling
an undefined block, which explains how this was not caught.
Fixes sonata-project#361
@SonataCI
DevKit updates (sonata-project#364)
a40be16
@dbu @greg0ire
improve deprecation notice (sonata-project#366)
eddbdd8
@dbu @greg0ire
avoid triggering our own deprecation notice (sonata-project#367)
1614d90
@soullivaneuh
3.3.1
f5aaddf
@SonataCI
DevKit updates (sonata-project#368)
6e747f5
@pkruithof @greg0ire
Resolve definition class parameter first (sonata-project#369)
ca01a5b
@OskarStark @jordisala1991
added captions to TOC tree in docs (sonata-project#370)
1167ff4
@ossinkine @OskarStark
Finally fix internal deprecations (sonata-project#372)
bda2e2c
@OskarStark
removed useless comments
76b3f23
@OskarStark
avoid long lines
1c8b298
@OskarStark
Merge pull request sonata-project#359 from OskarStark/avoid
ea34e30 
Avoid long lines
@OskarStark
use configureOptions instead of setDefaultOptions in doc (sonata-proj…
c773885 
…ect#373)
@soullivaneuh
3.3.2
7cdf6e5
@jordisala1991
Remove phpunit whitelist exceptions
ef435a9
@jordisala1991
remove test deprecations
cbdfebf
@greg0ire
Merge pull request sonata-project#375 from jordisala1991/hotfix/phpunit
af2fc60 
Remove phpunit whitelist exceptions
@SonataCI
DevKit updates (sonata-project#376)
6bfa87f
@wodka @greg0ire
Prevent notice if service is defined through annotations (sonata-proj…
c6c0702 
…ect#378)

if a service is defined through annotation the arguments are set later. Therefore the $arguments variable is empty at this point. Which in return causes the notice if [0] is accessed
@SonataCI
DevKit updates
9cfbfb7
@SonataCI
DevKit updates (sonata-project#379)
244e40c
@SonataCI
DevKit updates
c3b8996
@SonataCI
DevKit updates (sonata-project#380)
83e71dc
@SonataCI
DevKit updates
afa6b3d
@SonataCI
DevKit updates (sonata-project#386)
6d3ff02
@ceesvanegmond @jordisala1991
Bugfix: Reordered if statements in BlockHelper (sonata-project#383)
a50efa5
@jvasseur @OskarStark
Only add classes to compile on PHP < 7.0 (sonata-project#387)
4e451e8 
addClassesToCompile is deprecated and doesn't improve performances on PHP > 7.0
SonataCI and others added 17 commits August 5, 2017 02:05
@greg0ire greg0ire force-pushed the merge_stable branch 2 times, most recently from 94532a7 to cb12155 Compare September 19, 2017 20:18
@greg0ire greg0ire mentioned this pull request Sep 19, 2017
Merged
@greg0ire greg0ire closed this Sep 19, 2017
@greg0ire greg0ire reopened this Sep 19, 2017
@greg0ire greg0ire closed this Sep 19, 2017
@greg0ire greg0ire reopened this Sep 19, 2017
@greg0ire greg0ire merged commit 9042d46 into sonata-project:master Sep 19, 2017
@greg0ire greg0ire deleted the merge_stable branch September 19, 2017 21:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jordisala1991 jordisala1991 jordisala1991 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet