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

update xml schema, fix #111 #113

Merged
merged 4 commits into from
Dec 29, 2013
Merged

update xml schema, fix #111 #113

merged 4 commits into from
Dec 29, 2013

Conversation

dbu
Copy link
Member

@dbu dbu commented Dec 27, 2013

Q A
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets #111
License MIT
Doc PR -

@@ -27,35 +27,6 @@ public function getConfigTreeBuilder()

$rootNode
->children()
->arrayNode('sonata_admin')
Copy link
Member Author

Choose a reason for hiding this comment

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

i moved this to the bottom of the Configuration file to be consistent with the sonata location in other configs.


<xsd:complexType name="multilang">
<xsd:sequence>
<xsd:element name="locale" type="xsd:NMTOKEN"/>
Copy link
Member Author

Choose a reason for hiding this comment

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

is this the right way to get

<multilang>
    <locale>en</locale>
</multilang>

or should i do something different?

Copy link
Member

Choose a reason for hiding this comment

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

you should use maxOccurs="unbounded" and I'm not so sure about xsd:NMTOKEN, seems like it's only there to be BC with XML 1.0. We may add our own locale type using the pattern [a-z]{2}, or we simply use xsd:string (I think I used that in the other bundles)

Copy link
Member Author

Choose a reason for hiding this comment

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

changed to xsd:string and added unbounded, thanks

@wouterj
Copy link
Member

wouterj commented Dec 27, 2013

@dbu I'll merge symfony-cmf/Testing#33 within an hour, could you please add a test in your PR for this?

@dbu
Copy link
Member Author

dbu commented Dec 27, 2013

oh, that would certainly help to have the test. could you do the test on one of the bundles so i see how its meant to be done?

@wouterj
Copy link
Member

wouterj commented Dec 27, 2013

@dbu you forgot to push your latest changes, could you please do that, then I'll push the testing example here.

@wouterj
Copy link
Member

wouterj commented Dec 27, 2013

@dbu fixed the things and added the test

@wouterj
Copy link
Member

wouterj commented Dec 27, 2013

sorry, did not fixed the things :)

@dbu
Copy link
Member Author

dbu commented Dec 27, 2013

okay, removed fixXmlConfig and pushed. lets see what the test thinks.

@wouterj
Copy link
Member

wouterj commented Dec 27, 2013

Please don't merge this in the current state, the fixtures should be moved to resources/Fixtures

@dbu
Copy link
Member Author

dbu commented Dec 27, 2013

you mean Tests/Resources/DataFixture => Tests/Resources/Fixtures? do you want to do that? i will be pretty much offline from tomorrow for a week, so feel free to move things and merge.

@wouterj
Copy link
Member

wouterj commented Dec 27, 2013

Yes, I can do that but I don't have acces to a computer now

@lsmith77
Copy link
Member

@wouterj ok to merge?

@wouterj
Copy link
Member

wouterj commented Dec 28, 2013

@lsmith77 ready now

wouterj added a commit that referenced this pull request Dec 29, 2013
@wouterj wouterj merged commit f5a54a0 into master Dec 29, 2013
@wouterj wouterj deleted the fix-schema branch December 29, 2013 10:36
@wouterj
Copy link
Member

wouterj commented Dec 29, 2013

Thank you!

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.

3 participants