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

Ensure that entity_loader disable variable is re-set back to the orig… #1585

Merged
merged 1 commit into from
Mar 31, 2019

Conversation

seamuslee001
Copy link
Contributor

@seamuslee001 seamuslee001 commented Feb 23, 2019

…inal setting

Description

I work for a project that implements PHPWord that being CiviCRM, we have found that the changes here have sometimes disrupted our test suite because we have used XML to define our menu structure and like. This is because the changes override the global value of the loading of external entites and doesn't re-set afterwards.

Checklist:

  • I have run composer run-script check --timeout=0 and no errors were reported
  • The new code is covered by unit tests (check build/coverage for coverage report)
  • [n/a] I have updated the documentation to describe the changes

@coveralls
Copy link

coveralls commented Feb 23, 2019

Coverage Status

Coverage increased (+0.001%) to 94.63% when pulling 607378b on seamuslee001:libxml_improve into 2d2fe52 on PHPOffice:develop.

@seamuslee001
Copy link
Contributor Author

ping @Progi1984 This is basically the same as #1585

@Progi1984 Progi1984 requested a review from troosan March 5, 2019 08:05
Copy link
Contributor

@troosan troosan left a comment

Choose a reason for hiding this comment

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

ping @Progi1984 This is basically the same as #1585

what do you mean?

src/PhpWord/Shared/Html.php Outdated Show resolved Hide resolved
@seamuslee001
Copy link
Contributor Author

ping @Progi1984 This is basically the same as #1585

what do you mean?

Sorry got my PRs mixed up it was this one PHPOffice/Common#29

…inal setting

Simplify the setting of libxml_disable_entity_loader
@seamuslee001
Copy link
Contributor Author

@troosan thanks for the pointer (once i finally understood it gahh) i have now updated the code to be as simple as possible i think so should be ready for review

@troosan troosan added this to the v0.17.0 milestone Mar 31, 2019
@troosan troosan merged commit 6e4f18c into PHPOffice:develop Mar 31, 2019
@seamuslee001 seamuslee001 deleted the libxml_improve branch May 30, 2021 21:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants