Skip to content

Commit

Permalink
Changelog for squizlabs#2491 + travis check for XSD + tabs2spaces
Browse files Browse the repository at this point in the history
  • Loading branch information
gsherwood committed May 27, 2019
1 parent 04854eb commit 8ff9283
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ script:
# Validate the xml ruleset files.
# @link http://xmlsoft.org/xmllint.html
- if [[ $XMLLINT == "1" ]]; then xmllint --noout --schema phpcs.xsd ./src/Standards/*/ruleset.xml; fi
- if [[ $XMLLINT == "1" ]]; then curl -O https://www.w3.org/2012/04/XMLSchema.xsd; fi
- if [[ $XMLLINT == "1" ]]; then xmllint --noout --schema ./XMLSchema.xsd ./phpcs.xsd; fi
# Check the code-style consistency of the xml files.
- if [[ $XMLLINT == "1" ]]; then diff -B ./phpcs.xml.dist <(xmllint --format "./phpcs.xml.dist"); fi
- if [[ $XMLLINT == "1" ]]; then diff -B ./src/Standards/Generic/ruleset.xml <(xmllint --format "./src/Standards/Generic/ruleset.xml"); fi
Expand Down
2 changes: 2 additions & 0 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
-- You still need to give PHPCS a list of files or directories in which to apply the filter
-- Thanks to Juliette Reinders Folmer for the contribution
- JSON reports now end with a newline character
- The phpcs.xsd schema now validates phpcs-only and phpcbf-only attributes correctly
-- Thanks to Juliette Reinders Folmer for the patch
- The T_LIST token and it's opening and closing parentheses now contain references to each other in the tokens array
-- Uses the same parenthesis_opener/closer/owner indexes as other tokens
-- Thanks to Juliette Reinders Folmer for the patch
Expand Down
4 changes: 2 additions & 2 deletions phpcs.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:element>
<xs:element name="exclude-pattern" type="patternType" maxOccurs="unbounded" minOccurs="0"></xs:element>
<xs:element name="arg" maxOccurs="unbounded" minOccurs="0">
<xs:complexType>
Expand Down Expand Up @@ -61,7 +61,7 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:element>
<xs:element name="type" maxOccurs="1" minOccurs="0">
<xs:complexType>
<xs:simpleContent>
Expand Down

0 comments on commit 8ff9283

Please sign in to comment.