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

Theme etc/view.xml detection #97

Merged
merged 6 commits into from
Aug 4, 2023
Merged

Theme etc/view.xml detection #97

merged 6 commits into from
Aug 4, 2023

Conversation

convenient
Copy link
Contributor

@convenient convenient commented May 30, 2023 •
edited
Loading

Add detection for theme etc/view.xml files.

+-------+--------------------------+-------------------------------------------------+-----------------------------------------------------------------------------------+
| Level | Type                     | File                                            | To Check                                                                          |
+-------+--------------------------+-------------------------------------------------+-----------------------------------------------------------------------------------+
| WARN  | Override (phtml/js/html) | vendor/magento/theme-frontend-luma/etc/view.xml | vendor/ampersand/upgrade-patch-helper-test-hyva-fallback-theme/theme/etc/view.xml |
| WARN  | Override (phtml/js/html) | vendor/magento/theme-frontend-luma/etc/view.xml | vendor/ampersand/upgrade-patch-helper-test-module/src/theme/etc/view.xml          |
+-------+--------------------------+-------------------------------------------------+-----------------------------------------------------------------------------------+

For example vendor/magento/theme-frontend-luma/etc/view.xml has changed, and only themes that have an etc/view.xml defined and extend the frontend/magento/luma theme will be reported.

Checklist

  • Pull request has a meaningful description of its purpose
  • All commits are accompanied by meaningful commit messages
  • Tests have been ran / updated

@convenient convenient linked an issue May 30, 2023 that may be closed by this pull request
Doesn't detect changes in etc/view.xml yet #96
Closed
@convenient convenient changed the title POC theme view.xml detection theme etc/view.xml detection Aug 4, 2023
@convenient convenient marked this pull request as ready for review August 4, 2023 09:31
@convenient
Merge remote-tracking branch 'origin/master' into fix-issue-96-detect…
fd7c2f5 
…-etc-view

 Conflicts:
	dev/phpunit/functional/expected_output/magentom24-nodb.out.txt
	dev/phpunit/functional/expected_output/magentom24-show-info.out.txt
	dev/phpunit/functional/expected_output/magentom24.out.txt
	dev/phpunit/functional/expected_output/magentom24nodb-threeway-diff.out.txt
@convenient
Update test case
7c15b26
@convenient convenient changed the title theme etc/view.xml detection Theme etc/view.xml detection Aug 4, 2023
@convenient convenient merged commit bc32b4f into master Aug 4, 2023
@convenient convenient deleted the fix-issue-96-detect-etc-view branch August 4, 2023 13:25
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Doesn't detect changes in etc/view.xml yet
1 participant
@convenient