Skip to content

Commit

Permalink
[Input] fix wrong XSD schema location
Browse files Browse the repository at this point in the history
  • Loading branch information
@sstok
sstok committed Feb 15, 2015
1 parent f82455c commit 8522733
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/Exporter/XmlExporter.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public function exportCondition(SearchConditionInterface $condition, $useFieldAl
$searchRoot->setAttribute('xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
$searchRoot->setAttribute(
'xsi:schemaLocation',
'http://rollerworks.github.io/search/schema/dic/search http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd'
'http://rollerworks.github.io/search/input/schema/search http://rollerworks.github.io/schema/search/xml-input-1.0.xsd'
);

$searchRoot->setAttribute('logical', $condition->getValuesGroup()->getGroupLogical());
Expand Down
44 changes: 22 additions & 22 deletions tests/Exporter/XmlExporterTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ public function provideSingleValuePairTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<fields>
<field name="name">
<single-values>
Expand All @@ -51,8 +51,8 @@ public function provideFieldAliasTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<fields>
<field name="firstname">
<single-values>
Expand All @@ -70,8 +70,8 @@ public function provideMultipleValuesTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<fields>
<field name="name">
<single-values>
Expand All @@ -94,8 +94,8 @@ public function provideRangeValuesTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<fields>
<field name="id">
<ranges>
Expand Down Expand Up @@ -141,8 +141,8 @@ public function provideComparisonValuesTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<fields>
<field name="id">
<comparisons>
Expand All @@ -167,8 +167,8 @@ public function provideMatcherValuesTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<fields>
<field name="name">
<pattern-matchers>
Expand All @@ -190,8 +190,8 @@ public function provideGroupTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<fields>
<field name="name">
<single-values>
Expand Down Expand Up @@ -231,8 +231,8 @@ public function provideMultipleSubGroupTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<groups>
<group logical="AND">
<fields>
Expand Down Expand Up @@ -264,8 +264,8 @@ public function provideNestedGroupTest()
return
'<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<groups>
<group logical="AND">
<groups>
Expand Down Expand Up @@ -299,17 +299,17 @@ public function provideEmptyValuesTest()
{
return '<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND"/>'
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND"/>'
;
}

public function provideEmptyGroupTest()
{
return '<?xml version="1.0" encoding="UTF-8"?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<groups>
<group logical="AND"/>
</groups>
Expand Down
4 changes: 2 additions & 2 deletions tests/Input/XmlInputTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ public function provideSingleValuePairTests()
array(
'<?xml version="1.0" encoding="UTF-8"'.'?'.'>
<search xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'.
' xsi:schemaLocation="http://rollerworks.github.io/search/schema/dic/search '.
'http://rollerworks.github.io/search/schema/dic/search/input-1.0.xsd" logical="AND">
' xsi:schemaLocation="http://rollerworks.github.io/search/input/schema/search '.
'http://rollerworks.github.io/schema/search/xml-input-1.0.xsd" logical="AND">
<fields>
<field name="name">
<single-values>
Expand Down

0 comments on commit 8522733

Please sign in to comment.