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

Allow xml:base attribute in configuration elements #6059

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions config.xsd
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
targetNamespace="https://getpsalm.org/schema/config"
elementFormDefault="qualified"
>
<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd" />
<xs:element name="psalm" type="PsalmType" />

<xs:complexType name="PsalmType">
Expand Down Expand Up @@ -96,15 +97,18 @@
<xs:element name="file" minOccurs="0" maxOccurs="unbounded" type="NameAttributeType" />
<xs:element name="ignoreFiles" minOccurs="0" maxOccurs="1" type="IgnoreFilesType" />
</xs:choice>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="TaintAnalysisType">
<xs:choice maxOccurs="unbounded">
<xs:element name="ignoreFiles" minOccurs="0" maxOccurs="1" type="IgnoreFilesType" />
</xs:choice>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="NameAttributeType">
<xs:attribute ref="xml:base" />
<xs:attribute name="name" type="xs:string" use="required" />
</xs:complexType>

Expand All @@ -120,12 +124,14 @@
</xs:choice>

<xs:attribute name="allowMissingFiles" type="xs:string" />
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="ProjectDirectoryAttributeType">
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="ignoreTypeStats" type="xs:string" />
<xs:attribute name="useStrictTypes" type="xs:string" />
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="FileExtensionsType">
Expand All @@ -138,37 +144,43 @@
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="MockClassesType">
<xs:sequence>
<xs:element name="class" maxOccurs="unbounded" type="NameAttributeType" />
</xs:sequence>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="UniversalObjectCratesType">
<xs:sequence>
<xs:element name="class" maxOccurs="unbounded" type="NameAttributeType" />
</xs:sequence>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="ExceptionsType">
<xs:sequence>
<xs:element name="class" minOccurs="0" maxOccurs="unbounded" type="ExceptionType" />
<xs:element name="classAndDescendants" minOccurs="0" maxOccurs="unbounded" type="ExceptionType" />
</xs:sequence>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="StubsType">
<xs:sequence>
<xs:element name="file" maxOccurs="unbounded" type="StubsAttributeType" />
</xs:sequence>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="ExitFunctionsType">
<xs:sequence>
<xs:element name="function" maxOccurs="unbounded" type="NameAttributeType" />
</xs:sequence>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="PluginsType">
Expand All @@ -187,6 +199,7 @@
</xs:complexType>
</xs:element>
</xs:choice>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="IssueHandlersType">
Expand Down Expand Up @@ -463,6 +476,7 @@
<xs:element name="UnusedReturnValue" type="IssueHandlerType" minOccurs="0" />
<xs:element name="UnusedVariable" type="IssueHandlerType" minOccurs="0" />
</xs:choice>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="IssueHandlerType">
Expand Down Expand Up @@ -612,6 +626,7 @@
<xs:sequence>
<xs:element name="var" maxOccurs="unbounded" type="IdentifierType" />
</xs:sequence>
<xs:attribute ref="xml:base" />
</xs:complexType>

<xs:complexType name="IdentifierType">
Expand Down