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 ContentEditor to 4.6, deprecate removed methods on Alchemy::Content #1847

Merged
merged 2 commits into from
May 27, 2020

Conversation

mamhoff
Copy link
Contributor

@mamhoff mamhoff commented May 25, 2020

What is this pull request for?

This backports the ContentEditor class from the master branch, and deprecated the removed methods. This should provide a doable upgrade path for users.

Checklist

  • I have followed Pull Request guidelines
  • I have added a detailed description into each commit message
  • I have added tests to cover this change

In order to deprecate the removed methods from the content model in the
master branch, we need to introduce the content editor here.
Copy link

@hound hound bot left a comment

Choose a reason for hiding this comment

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

Some files could not be reviewed due to errors:

.rubocop.yml: Metrics/LineLength has the wrong namespace - should be Layout
.rubocop.yml: Metrics/LineLength has the wrong namespace - should be Layout
Error: The `Layout/AlignHash` cop has been renamed to `Layout/HashAlignment`.
(obsolete configuration found in .rubocop.yml, please update it)
The `Layout/AlignParameters` cop has been renamed to `Layout/ParameterAlignment`.
The `Layout/IndentArray` cop has been renamed to `Layout/FirstArrayElementIndentation`.
The `Layout/IndentHash` cop has been renamed to `Layout/FirstHashElementIndentation`.
The `Layout/IndentHeredoc` cop has been renamed to `Layout/HeredocIndentation`.
The `Lint/HandleExceptions` cop has been renamed to `Lint/SuppressedException`.
The `Style/BracesAroundHashParameters` cop has been removed.

@mamhoff mamhoff changed the base branch from 4.5-stable to 4.6-stable May 25, 2020 11:14
@mamhoff mamhoff added this to the 4.6 milestone May 25, 2020
@mamhoff mamhoff changed the title Backport ContentEditor to 4.5, deprecate removed methods on Alchemy::Content Backport ContentEditor to 4.6, deprecate removed methods on Alchemy::Content May 25, 2020
Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

This does not seem to be necessary because the Alchemy::ContentEditor delegates to Alchemy::Content

@mamhoff
Copy link
Contributor Author

mamhoff commented May 25, 2020

I'll see in my work with the other Alchemy gems. I'll leave it open for now.

@mamhoff mamhoff closed this May 25, 2020
@mamhoff mamhoff reopened this May 25, 2020
These were removed in the master branch with the introduction of the ContentEditor, but gems
in the ecosystem still use them. In order to provide a good upgrade path
to 5.0, we should reintroduce and deprecate these methods.
@mamhoff mamhoff force-pushed the deprecate-45-content-methods branch from fbd967f to 4cd2502 Compare May 25, 2020 20:29
Copy link

@hound hound bot left a comment

Choose a reason for hiding this comment

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

Some files could not be reviewed due to errors:

.rubocop.yml: Metrics/LineLength has the wrong namespace - should be Layout
.rubocop.yml: Metrics/LineLength has the wrong namespace - should be Layout
Error: The `Layout/AlignHash` cop has been renamed to `Layout/HashAlignment`.
(obsolete configuration found in .rubocop.yml, please update it)
The `Layout/AlignParameters` cop has been renamed to `Layout/ParameterAlignment`.
The `Layout/IndentArray` cop has been renamed to `Layout/FirstArrayElementIndentation`.
The `Layout/IndentHash` cop has been renamed to `Layout/FirstHashElementIndentation`.
The `Layout/IndentHeredoc` cop has been renamed to `Layout/HeredocIndentation`.
The `Lint/HandleExceptions` cop has been renamed to `Lint/SuppressedException`.
The `Style/BracesAroundHashParameters` cop has been removed.

Copy link
Member

@tvdeyen tvdeyen left a comment

Choose a reason for hiding this comment

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

Many thanks, as always

@tvdeyen tvdeyen merged commit 0f5ab9b into AlchemyCMS:4.6-stable May 27, 2020
tvdeyen added a commit that referenced this pull request Jun 4, 2020
- Use apt update instead of apt-get in GH action [#1865](#1865) ([tvdeyen](https://github.com/tvdeyen))
- Use depth for page tree serializer root_or_leaf [#1864](#1864) ([tvdeyen](https://github.com/tvdeyen))
- Fix sitemap wrapper height [#1861](#1861) ([tvdeyen](https://github.com/tvdeyen))
- Do not return the root page with API responses. [#1860](#1860) ([tvdeyen](https://github.com/tvdeyen))
- Introduce page.url_path and use it for alchemyPageSelect [#1859](#1859) ([tvdeyen](https://github.com/tvdeyen))
- Update Urlname translation [#1857](#1857) ([tvdeyen](https://github.com/tvdeyen))
- Show url name in Page tree [#1856](#1856) ([tvdeyen](https://github.com/tvdeyen))
- Deprecate Page#visible attribute [#1855](#1855) ([tvdeyen](https://github.com/tvdeyen))
- 4.6: Re-add `auto_logout_time` configuration option [#1852](#1852) ([mamhoff](https://github.com/mamhoff))
- Backport ContentEditor to 4.6, deprecate removed methods on `Alchemy::Content` [#1847](#1847) ([mamhoff](https://github.com/mamhoff))
- Deprecate auto_logout_time (4.6) [#1843](#1843) ([tvdeyen](https://github.com/tvdeyen))
- Deprecate require_ssl (4.6) [#1842](#1842) ([tvdeyen](https://github.com/tvdeyen))
- Deprecate url_nesting configuration (4.6) [#1841](#1841) ([tvdeyen](https://github.com/tvdeyen))
- Allow page visible toggle (4.6) [#1838](#1838) ([tvdeyen](https://github.com/tvdeyen))
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants