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

Backport PR-1895 for Magento 2.1 - Fix relative template references in individual Magento modules #13539

Closed
wants to merge 2 commits into from

Conversation

hostep
Copy link
Contributor

@hostep hostep commented Feb 7, 2018

Description

This is a backport of #1895 for Magento 2.1
I started with cherry picking this commit: a434162 (since it contains some extra fixes above the PR referenced above) and fixed a bunch of merge conflicts.
Then ran the new static test introduced in the above commit, which revealed two more files which needed fixing, and fixed those two in a separate commit (curiously enough they were fixed in the initial PR by @davidalger, but were not included in the merge commit from @vrann)

Please be very careful when reviewing this, a lot of files have changed!
I'm not exactly sure about the changes in the composer.json files, but since they were included in the commit from @vrann, I also included them.

Fixed Issues (if relevant)

  1. Remember me template is not loaded from the original module #7273: Remember me template is not loaded from the original module
  2. setting target Module Name when generating a block #1287: setting target Module Name when generating a block
  3. fix for lost template when creating a preference for Magento\Checkout\Block\Cart\Item\Renderer #11004: fix for lost template when creating a preference for Magento\Checkout\Block\Cart\Item\Renderer
    ...

Contribution checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • All new or changed code is covered with unit/integration tests (if applicable)
  • All automated tests passed successfully (all builds on Travis CI are green)

Sorry, something went wrong.

@dmanners
Copy link
Contributor

dmanners commented Feb 7, 2018

Hi @hostep, thanks for this pull request.

Could you take a look at the static test failures for me.

1) Magento\Test\Php\LiveCodeTest::testCodeStylePsr2
PHP Code Sniffer has found 6 error(s): 
FILE: ...integration/testsuite/Magento/Framework/View/Model/Layout/MergeTest.php
--------------------------------------------------------------------------------
FOUND 6 ERROR(S) AFFECTING 6 LINE(S)
--------------------------------------------------------------------------------
 34 | ERROR | Opening parenthesis of a multi-line function call must be the
    |       | last content on the line
 39 | ERROR | Closing parenthesis of a multi-line function call must be on a
    |       | line by itself
 52 | ERROR | Opening parenthesis of a multi-line function call must be the
    |       | last content on the line
 57 | ERROR | Closing parenthesis of a multi-line function call must be on a
    |       | line by itself
 65 | ERROR | Opening parenthesis of a multi-line function call must be the
    |       | last content on the line
 68 | ERROR | Closing parenthesis of a multi-line function call must be on a
    |       | line by itself
--------------------------------------------------------------------------------

@dmanners dmanners self-assigned this Feb 7, 2018
@hostep hostep force-pushed the backport-pr-1895-attempt-3 branch from fc971b7 to 1c1c134 Compare February 7, 2018 14:05
@hostep
Copy link
Contributor Author

hostep commented Feb 7, 2018

@dmanners: static test failures are fixed.

@dmanners
Copy link
Contributor

Hi @hostep any chance you could have a look at these conflicting files?

vrann and others added 2 commits August 11, 2018 10:37
…-engcom/develop-prs-isolated

[EngCom] Fix relative template references in individual Magento modules magento#1895

(cherry picked from commit a434162)
@hostep hostep force-pushed the backport-pr-1895-attempt-3 branch from 1c1c134 to 2943013 Compare August 11, 2018 08:53
@hostep
Copy link
Contributor Author

hostep commented Aug 11, 2018

@dmanners: ok done!

Just for information: conflicts where caused by db166c7

I've rebased my branch on top of the latest 2.1-develop, fixed conflicts (removed the same 4 lines in the xml files like in db166c7), and force pushed.

Let's see how the tests are doing (can't seem to get them working properly at the moment on my local machine).

@dmanners
Copy link
Contributor

Thanks @hostep I have never been able to get this branch behaving how I would like in the tests either. Hopefully I can sort this out now though.

@dmanners
Copy link
Contributor

Hi @hostep as discussed via slack I will close this PR. For me this fix is already in newer versions of Magento and the release line 2.1 will no longer be available for contribution as of Monday the 17th of September. The decision to close 2.1 was made to increase focus on 2.2 and 2.3 release lines.

Thanks for your understanding.

@dmanners dmanners closed this Sep 17, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants