-
-
Notifications
You must be signed in to change notification settings - Fork 16
Fix sanitizer config #1276
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
Merged
Merged
Fix sanitizer config #1276
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
packages/guides/tests/unit/DependencyInjection/GuidesExtensionTest.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * This file is part of phpDocumentor. | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| * | ||
| * @link https://phpdoc.org | ||
| */ | ||
|
|
||
| namespace phpDocumentor\Guides\DependencyInjection; | ||
|
|
||
| use PHPUnit\Framework\Attributes\DataProvider; | ||
| use PHPUnit\Framework\TestCase; | ||
| use Symfony\Component\DependencyInjection\ContainerBuilder; | ||
|
|
||
| use function array_filter; | ||
| use function array_values; | ||
|
|
||
| class GuidesExtensionTest extends TestCase | ||
| { | ||
| /** | ||
| * @param array<array<mixed>> $configs | ||
| * @param callable(ContainerBuilder):void $assertions | ||
| */ | ||
| #[DataProvider('provideConfigs')] | ||
| public function testLoad(array $configs, callable $assertions): void | ||
| { | ||
| $container = new ContainerBuilder(); | ||
|
|
||
| $extension = new GuidesExtension(); | ||
| $extension->load($configs, $container); | ||
|
|
||
| $assertions($container); | ||
| } | ||
|
|
||
| /** @return iterable<string, array{array<mixed>, callable(ContainerBuilder):void}> */ | ||
| public static function provideConfigs(): iterable | ||
| { | ||
| $sanitizerAssertions = static function (ContainerBuilder $container): void { | ||
| self::assertTrue($container->hasDefinition('phpdoc.guides.raw_node.sanitizer.default')); | ||
|
|
||
| $definition = $container->getDefinition('phpdoc.guides.raw_node.sanitizer.default'); | ||
| $allowElementMethodCalls = array_values(array_filter($definition->getMethodCalls(), static fn (array $call) => $call[0] === 'allowElement')); | ||
| self::assertCount(1, $allowElementMethodCalls); | ||
| self::assertSame(['object', ['type', 'data', 'alt']], $allowElementMethodCalls[0][1]); | ||
| }; | ||
|
|
||
| yield 'sanitizer' => [ | ||
| [ | ||
| [ | ||
| 'raw_node' => [ | ||
| 'sanitizers' => [ | ||
| 'default' => [ | ||
| 'allow_elements' => [ | ||
| 'object' => ['type', 'data', 'alt'], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| $sanitizerAssertions, | ||
| ]; | ||
|
|
||
| yield 'sanitizer XML' => [ | ||
| [ | ||
| [ | ||
| 'raw_node' => [ | ||
| 'sanitizer' => [ | ||
| 'name' => 'default', | ||
| 'allow_element' => [ | ||
| [ | ||
| 'name' => 'object', | ||
| 'attribute' => ['type', 'data', 'alt'], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| ], | ||
| $sanitizerAssertions, | ||
| ]; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both the old and new config work, but it's not (nicely) possible to combine simple type (string content) and complex type (attributes/child elements) in XSD. The schema has been updated to a complex type, to allow specifying the allowed attributes, which means this file had to be updated to conform to the new schema.