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

Support for Doctrine ORM >=2.5 #3726

Merged
merged 2 commits into from
Dec 16, 2015
Merged

Support for Doctrine ORM >=2.5 #3726

merged 2 commits into from
Dec 16, 2015

Conversation

pamil
Copy link
Contributor

@pamil pamil commented Dec 15, 2015

No description provided.

@pamil pamil changed the title Support for Doctrine 2.5 Support for Doctrine ORM >=2.5 Dec 15, 2015
@pjedrzejewski pjedrzejewski added the Enhancement Minor issues and PRs improving the current solutions (optimizations, typo fixes, etc.). label Dec 15, 2015
@pjedrzejewski
Copy link
Member

Could you update other composer.jsons?

https://github.com/Sylius/Sylius/search?l=json&q=doctrine%5C%2Form&type=Code&utf8=%E2%9C%93

@michalmarcinkowski
Copy link
Contributor

@pamil does the fix work on v2.5.1? If not we should exclude this version.

pjedrzejewski
pjedrzejewski reviewed Dec 16, 2015
View reviewed changes
src/Sylius/Component/Channel/composer.json
@@ -22,7 +22,7 @@
"require": {
"php": ">=5.5.9",

"doctrine/orm": "2.4.*",
"doctrine/orm": "^2.4.8",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Channel really requires Doctrine ORM? Should not be the case ...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like ORM's exceptions are used in PhpDocs in ChannelRepositoryInterface.

doctrine/common is used too in ChannelsAwareInterface only.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ORM's exceptions should be removed from interface docs. The interface doesn't know anything about the implementation especially about the thrown exceptions.

Let's require doctrine/common then.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I opened a separate issue for that #3729.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@pamil
Copy link
Contributor Author

pamil commented Dec 16, 2015

@michalmarcinkowski it should be fine on all 2.5.* releases.

pjedrzejewski pushed a commit that referenced this pull request Dec 16, 2015
Merge pull request #3726 from pamil/doctrine-252
91d5e5f 
Support for Doctrine ORM >=2.5
@pjedrzejewski pjedrzejewski merged commit 91d5e5f into Sylius:master Dec 16, 2015
@pjedrzejewski
Copy link
Member

Thanks Kamil!

@pjedrzejewski pjedrzejewski mentioned this pull request Dec 16, 2015
Closed
@pamil pamil deleted the doctrine-252 branch December 16, 2015 09:51
pamil added a commit to pamil/Sylius that referenced this pull request Jan 8, 2016
@pamil
[Core] Reverted Sylius#3726
0140a4a
@pamil pamil mentioned this pull request Jan 8, 2016
Merged
GSadee pushed a commit to GSadee/Sylius that referenced this pull request Jan 29, 2016
@pamil @GSadee
[Core] Reverted Sylius#3726
cd782e2
GSadee pushed a commit to GSadee/Sylius that referenced this pull request Feb 3, 2016
@pamil @GSadee
[Core] Reverted Sylius#3726
6cf6cee
pamil added a commit to pamil/Sylius that referenced this pull request May 7, 2019
@pamil
[Core] Reverted Sylius#3726
e835f36
pamil pushed a commit to pamil/Sylius that referenced this pull request May 7, 2019
Merge pull request Sylius#3726 from pamil/doctrine-252
f4ec70f 
Support for Doctrine ORM >=2.5
pamil added a commit to pamil/Sylius that referenced this pull request May 7, 2019
@pamil
[Core] Reverted Sylius#3726
15de272
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Enhancement Minor issues and PRs improving the current solutions (optimizations, typo fixes, etc.).
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pamil @pjedrzejewski @michalmarcinkowski @koemeet