Skip to content

Commit

Permalink
Merge pull request #8428 from den-kuz/4.x
Browse files Browse the repository at this point in the history 
Allow any attribute for complex types in schema
  • Loading branch information
@orklah
orklah authored Aug 28, 2022
2 parents 2fdcd5a + 93a293c commit 1eeea7c
Showing 1 changed file with 36 additions and 14 deletions.
50 changes: 36 additions & 14 deletions config.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@
<xs:attribute name="disableSuppressAll" type="xs:boolean" default="false" />
<xs:attribute name="triggerErrorExits" type="TriggerErrorExitsType" default="default" />
<xs:attribute name="threads" type="xs:integer" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="ProjectFilesType">
Expand All @@ -138,24 +139,25 @@
<xs:element name="file" minOccurs="0" maxOccurs="unbounded" type="NameAttributeType" />
<xs:element name="ignoreFiles" minOccurs="0" maxOccurs="1" type="IgnoreFilesType" />
</xs:choice>
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="TaintAnalysisType">
<xs:choice maxOccurs="unbounded">
<xs:element name="ignoreFiles" minOccurs="0" maxOccurs="1" type="IgnoreFilesType" />
</xs:choice>
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="NameAttributeType">
<xs:attribute name="name" type="xs:string" use="required" />
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="StubsAttributeType">
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="preloadClasses" type="xs:boolean" default="false" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="IgnoreFilesType">
Expand All @@ -165,14 +167,14 @@
</xs:choice>

<xs:attribute name="allowMissingFiles" type="xs:string" />
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</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:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="FileExtensionsType">
Expand All @@ -185,50 +187,51 @@
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="MockClassesType">
<xs:sequence>
<xs:element name="class" maxOccurs="unbounded" type="NameAttributeType" />
</xs:sequence>
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="UniversalObjectCratesType">
<xs:sequence>
<xs:element name="class" maxOccurs="unbounded" type="NameAttributeType" />
</xs:sequence>
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</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:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="StubsType">
<xs:sequence>
<xs:element name="file" maxOccurs="unbounded" type="StubsAttributeType" />
</xs:sequence>
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="ExitFunctionsType">
<xs:sequence>
<xs:element name="function" maxOccurs="unbounded" type="NameAttributeType" />
</xs:sequence>
<xs:anyAttribute processContents="skip"/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="PluginsType">
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="plugin">
<xs:complexType>
<xs:attribute name="filename" type="xs:string" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
<xs:element name="pluginClass">
Expand All @@ -237,10 +240,11 @@
<xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
</xs:sequence>
<xs:attribute name="class" type="xs:string" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
</xs:choice>
<xs:anyAttribute/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="IssueHandlersType">
Expand Down Expand Up @@ -527,7 +531,7 @@
<xs:element name="UnusedReturnValue" type="IssueHandlerType" minOccurs="0" />
<xs:element name="UnusedVariable" type="IssueHandlerType" minOccurs="0" />
</xs:choice>
<xs:anyAttribute/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="IssueHandlerType">
Expand All @@ -540,11 +544,13 @@
</xs:choice>

<xs:attribute name="type" type="ErrorLevelType" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="errorLevel" type="ErrorLevelType" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="PluginIssueHandlerType">
Expand All @@ -557,12 +563,14 @@
</xs:choice>

<xs:attribute name="type" type="ErrorLevelType" use="required" />
<xs:anyAttribute processContents="skip"/>
</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="errorLevel" type="ErrorLevelType" />
<xs:attribute name="name" type="xs:string" use="required" />
<xs:anyAttribute processContents="skip"/>
</xs:complexType>

<xs:complexType name="MethodIssueHandlerType">
Expand All @@ -576,11 +584,13 @@
</xs:choice>

<xs:attribute name="type" type="ErrorLevelType" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="errorLevel" type="ErrorLevelType" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="FunctionIssueHandlerType">
Expand All @@ -594,11 +604,13 @@
</xs:choice>

<xs:attribute name="type" type="ErrorLevelType" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="errorLevel" type="ErrorLevelType" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="ArgumentIssueHandlerType">
Expand All @@ -612,11 +624,13 @@
</xs:choice>

<xs:attribute name="type" type="ErrorLevelType" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="errorLevel" type="ErrorLevelType" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="ClassIssueHandlerType">
Expand All @@ -630,11 +644,13 @@
</xs:choice>

<xs:attribute name="type" type="ErrorLevelType" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="errorLevel" type="ErrorLevelType" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="PropertyIssueHandlerType">
Expand All @@ -648,11 +664,13 @@
</xs:choice>

<xs:attribute name="type" type="ErrorLevelType" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="errorLevel" type="ErrorLevelType" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="VariableIssueHandlerType">
Expand All @@ -666,28 +684,32 @@
</xs:choice>

<xs:attribute name="type" type="ErrorLevelType" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>
</xs:element>
</xs:sequence>

<xs:attribute name="errorLevel" type="ErrorLevelType" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="GlobalsType">
<xs:sequence>
<xs:element name="var" maxOccurs="unbounded" type="IdentifierType" />
</xs:sequence>
<xs:anyAttribute/>
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="IdentifierType">
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="type" type="xs:string" use="required" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:complexType name="ExceptionType">
<xs:attribute name="name" type="xs:string" use="required" />
<xs:attribute name="onlyGlobalScope" type="xs:string" />
<xs:anyAttribute processContents="skip" />
</xs:complexType>

<xs:simpleType name="ErrorLevelType">
Expand Down

0 comments on commit 1eeea7c

Please sign in to comment.