-
Notifications
You must be signed in to change notification settings - Fork 9.3k
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
Moves common code to all auto-generated Interceptor classes into a trait #1156
Conversation
The following tests failed on travis unit:
which also fails on other pull requests (https://travis-ci.org/magento/magento2/jobs/56015518) so I don't think is related to my changes. integration:
again I think this is unrelated. The above is a single failure in an 18 set dataset - if this was related to the interceptor code I am fairly sure it would fail on all. |
Looks good to me, will get this in using internal ticket MAGETWO-35920. Thanks for the contribution! |
Sorry for the delay on this one. I noticed that |
@otoolec Thanks for the update - sounds good. |
@fooman Magento 2 is now using version 2.4 of ZF2 components. This means there shouldn't be a need to copy Zend code into Magento. Would you mind updating the pull request to reflect that simplification? |
The travis integration_integrity build seems to have had some issue Travis side:
the remaining tests look good. |
Thanks @fooman for making the updates. I'll work on integrating this into our code and running the internal test-suite. Will let you know if I hit any snags. |
Looks like the latest beta-11 release had some merge conflicts (Fixed an issue where interceptors were Generated with Invalid __wakeup()). I have resolved those. |
Failures are the same as the beta-11 release. |
Yes, we've also faced with some failed tests on Travis. We are working on it now. |
…ceptor classes into a trait #1156 Add some doc-blocks and fix some static test failures
…ceptor classes into a trait #1156 Add interface for Interceptor so Chain can reference it.
@fooman Could you take a look and resolve the conflicts? |
@joanhe to be honest I am currently not sure how this PR was treated. The contributed code is already merged in - see here: https://github.com/magento/magento2/blame/develop/lib/internal/Magento/Framework/Interception/Interceptor.php Maybe @otoolec can clarify but I think this has already been merged and this can get closed. |
I suspect the conflicts are related to b15f387 and should be easy to resolve. I would suggest dropping that commit from this PR and seeing if that resolves the conflict. |
b15f387
to
d596078
Compare
thanks @otoolec - dropping the merge seems indeed to have resolved it and it already shows as merged and closed. |
This implements using traits for the interceptor code as discussed in issue #975
I have run a few performance tests using https://github.com/magento/magento2/blob/develop/dev/tests/performance/benchmark.jmx
Below are some figures copied from the Summary Reports
which to me looks like no performance impact good or bad.