Skip to content

Commit 8ff9283

Browse files
committed
Changelog for #2491 + travis check for XSD + tabs2spaces
1 parent 04854eb commit 8ff9283

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ script:
6565
# Validate the xml ruleset files.
6666
# @link http://xmlsoft.org/xmllint.html
6767
- if [[ $XMLLINT == "1" ]]; then xmllint --noout --schema phpcs.xsd ./src/Standards/*/ruleset.xml; fi
68+
- if [[ $XMLLINT == "1" ]]; then curl -O https://www.w3.org/2012/04/XMLSchema.xsd; fi
69+
- if [[ $XMLLINT == "1" ]]; then xmllint --noout --schema ./XMLSchema.xsd ./phpcs.xsd; fi
6870
# Check the code-style consistency of the xml files.
6971
- if [[ $XMLLINT == "1" ]]; then diff -B ./phpcs.xml.dist <(xmllint --format "./phpcs.xml.dist"); fi
7072
- if [[ $XMLLINT == "1" ]]; then diff -B ./src/Standards/Generic/ruleset.xml <(xmllint --format "./src/Standards/Generic/ruleset.xml"); fi

package.xml

+2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
4141
-- You still need to give PHPCS a list of files or directories in which to apply the filter
4242
-- Thanks to Juliette Reinders Folmer for the contribution
4343
- JSON reports now end with a newline character
44+
- The phpcs.xsd schema now validates phpcs-only and phpcbf-only attributes correctly
45+
-- Thanks to Juliette Reinders Folmer for the patch
4446
- The T_LIST token and it's opening and closing parentheses now contain references to each other in the tokens array
4547
-- Uses the same parenthesis_opener/closer/owner indexes as other tokens
4648
-- Thanks to Juliette Reinders Folmer for the patch

phpcs.xsd

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</xs:extension>
2121
</xs:simpleContent>
2222
</xs:complexType>
23-
</xs:element>
23+
</xs:element>
2424
<xs:element name="exclude-pattern" type="patternType" maxOccurs="unbounded" minOccurs="0"></xs:element>
2525
<xs:element name="arg" maxOccurs="unbounded" minOccurs="0">
2626
<xs:complexType>
@@ -61,7 +61,7 @@
6161
</xs:extension>
6262
</xs:simpleContent>
6363
</xs:complexType>
64-
</xs:element>
64+
</xs:element>
6565
<xs:element name="type" maxOccurs="1" minOccurs="0">
6666
<xs:complexType>
6767
<xs:simpleContent>

0 commit comments

Comments
 (0)