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

IBX-5048: Fixed handling nested lists with line feeds #237

Merged
merged 10 commits into from
Aug 17, 2023

Conversation

vidarl
Copy link
Member

@vidarl vidarl commented Jul 10, 2023

Question Answer
JIRA issue IBX-5048
Bug/Improvement yes
New feature no
Target version 2.3
BC breaks no
Tests pass yes/no
Doc needed no

<itemizedList> and <orderedList> cannot be below <literallayout> in richtext. It was quite hard to deal with that in XSLT, so created a php converter to deal with it after XSLT has completed

TODO:

  • Implement feature / fix a bug.
  • Implement tests.
  • Fix new code according to Coding Standards ($ composer fix-cs).
  • Ask for Code Review.

phpstan-baseline.neon Outdated Show resolved Hide resolved
@vidarl
Copy link
Member Author

vidarl commented Jul 11, 2023

@ezsystems/php-dev-team : Please review

@vidarl vidarl requested a review from a team July 19, 2023 11:01
composer.json Outdated Show resolved Hide resolved
src/bundle/Resources/config/fieldtype_services.yaml Outdated Show resolved Hide resolved
src/lib/RichText/Converter/ListLineBreaks.php Outdated Show resolved Hide resolved
@alongosz alongosz changed the title Ibx 5048 lists and linefeeds IBX-5048: Fixed handling nested lists with line feeds Aug 4, 2023
Copy link
Member

@alongosz alongosz left a comment

Choose a reason for hiding this comment

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

@vidarl please see first my last diff comment, it contains all the suggested changes for ListLineBreaks class from other comments to make it more clear.

tests/lib/Richtext/Converter/ListLineBreaksTest.php Outdated Show resolved Hide resolved
tests/lib/Richtext/Converter/ListLineBreaksTest.php Outdated Show resolved Hide resolved
tests/lib/Richtext/Converter/ListLineBreaksTest.php Outdated Show resolved Hide resolved
src/lib/RichText/Converter/ListLineBreaks.php Outdated Show resolved Hide resolved
src/lib/RichText/Converter/ListLineBreaks.php Outdated Show resolved Hide resolved
phpstan-baseline.neon Outdated Show resolved Hide resolved
src/lib/RichText/Converter/ListLineBreaks.php Outdated Show resolved Hide resolved
src/lib/RichText/Converter/ListLineBreaks.php Outdated Show resolved Hide resolved
src/lib/RichText/Converter/ListLineBreaks.php Outdated Show resolved Hide resolved
src/lib/RichText/Converter/ListLineBreaks.php Outdated Show resolved Hide resolved
@vidarl vidarl requested a review from alongosz August 7, 2023 12:18
@vidarl
Copy link
Member Author

vidarl commented Aug 7, 2023

I believe all review comments have been addressed now. Feel free to have a final look

@alongosz alongosz requested a review from a team August 7, 2023 12:56
@alongosz alongosz added Bug Something isn't working Ready for review labels Aug 7, 2023
@jwibexa jwibexa self-assigned this Aug 9, 2023
Copy link

@jwibexa jwibexa left a comment

Choose a reason for hiding this comment

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

tested and validated.
Please take note that the PR requires additional line in composer.json:

    "autoload": {
        "psr-4": {
            "App\\": "src/",
+            "Ibexa\\FieldTypeRichText\\RichText\\": "vendor/ezsystems/ezplatform-richtext/src/lib/RichText"
        }
    },

@webhdx webhdx merged commit 454e5cc into 2.3 Aug 17, 2023
20 checks passed
@webhdx webhdx deleted the IBX-5048_lists_and_linefeeds branch August 17, 2023 09:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working Ready for review
Development

Successfully merging this pull request may close these issues.

8 participants