Merge pull request #8591 from Nicelocal/merge_4.x

Merge 4.x
vimeo · Oct 17, 2022 · 212281d · 212281d
2 parents 61ef140 + 56805ab
commit 212281d
Show file tree

Hide file tree

Showing 148 changed files with 3,731 additions and 1,182 deletions.
diff --git a/.github/workflows/build-phar.yml b/.github/workflows/build-phar.yml
@@ -8,8 +8,13 @@ on:
     types:
       - published
 
+permissions:
+  contents: read
+
 jobs:
   pre_job:
+    permissions:
+      actions: write
     runs-on: ubuntu-latest
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
@@ -24,6 +29,8 @@ jobs:
           paths: '["bin/**", "assets/**", "build/**", "dictionaries/**", "src/**", "stubs/**", "psalm", "psalm-language-server", "psalm-plugin", "psalm-refactor", "psalter", "box.json.dist", "composer.json", "config.xsd", "keys.asc.gpg", "scoper.inc.php"]'
 
   build-phar:
+    permissions:
+      contents: write # for release
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
     runs-on: ubuntu-latest

diff --git a/composer.json b/composer.json
@@ -54,7 +54,8 @@
         "slevomat/coding-standard": "^7.0",
         "phpstan/phpdoc-parser": "1.6.4",
         "squizlabs/php_codesniffer": "^3.6",
-        "symfony/process": "^4.3 || ^5.0 || ^6.0"
+        "symfony/process": "^4.3 || ^5.0 || ^6.0",
+        "weirdan/prophecy-shim": "^1.0 || ^2.0"
     },
     "suggest": {
         "ext-igbinary": "^2.0.5 is required, used to serialize caching data",

diff --git a/config.xsd b/config.xsd
@@ -75,6 +75,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">
@@ -83,24 +84,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">
@@ -110,15 +112,15 @@
         </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="resolveSymlinks" type="xs:boolean" />
         <xs:attribute name="useStrictTypes" type="xs:string" />
-        <xs:anyAttribute processContents="skip"/>
+        <xs:anyAttribute processContents="skip" />
     </xs:complexType>
 
     <xs:complexType name="FileExtensionsType">
@@ -131,50 +133,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">
@@ -183,10 +186,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 processContents="skip"/>
+        <xs:anyAttribute processContents="skip" />
     </xs:complexType>
 
     <xs:complexType name="IssueHandlersType">
@@ -411,6 +415,7 @@
             <xs:element name="ReferenceConstraintViolation" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="ReferenceReusedFromConfusingScope" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="ReservedWord" type="IssueHandlerType" minOccurs="0" />
+            <xs:element name="RiskyCast" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="StringIncrement" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedCallable" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="TaintedCookie" type="IssueHandlerType" minOccurs="0" />
@@ -482,7 +487,7 @@
             <xs:element name="UnusedReturnValue" type="IssueHandlerType" minOccurs="0" />
             <xs:element name="UnusedVariable" type="IssueHandlerType" minOccurs="0" />
         </xs:choice>
-        <xs:anyAttribute processContents="skip"/>
+        <xs:anyAttribute processContents="skip" />
     </xs:complexType>
 
     <xs:complexType name="IssueHandlerType">
@@ -495,11 +500,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">
@@ -512,12 +519,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">
@@ -531,11 +540,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">
@@ -549,11 +560,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">
@@ -567,11 +580,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">
@@ -585,11 +600,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">
@@ -603,11 +620,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="ClassConstantIssueHandlerType">
@@ -639,28 +658,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">