Nils werner sonarsource/update output provider to differentiate sonarsource products

.appveyor.yml

@@ -1,59 +1,4 @@
 build: false
-platform:
- - x64
-
-clone_folder: c:\projects\php-project-workspace
-
-## Set up environment variables
-init:
- - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
- - SET COMPOSER_NO_INTERACTION=1
- - SET PHP=1 # This var is connected to PHP install cache
- - SET ANSICON=121x90 (121x90)
-
-environment:
- SSL_CERT_FILE: "C:\\tools\\php\\cacert.pem"
- matrix:
- - php_ver_target: 8.0
- DEPS: 'high'
-
-cache:
- - '%LOCALAPPDATA%\Composer\files'
- - '%LOCALAPPDATA%\Composer\vcs'
- # Cache chocolatey packages
- - C:\ProgramData\chocolatey\bin
- - C:\ProgramData\chocolatey\lib
- # Cache php install
- - c:\tools\php
-
-## Install PHP and composer, and run the appropriate composer command
-install:
- - IF EXIST c:\tools\php (SET PHP=0) # Checks for the PHP install being cached
- - ps: appveyor-retry cinst --no-progress --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
- - appveyor DownloadFile https://curl.haxx.se/ca/cacert.pem -FileName C:\tools\php\cacert.pem
- - cd c:\tools\php
- - IF %PHP%==1 copy php.ini-production php.ini /Y
- - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
- - IF %PHP%==1 echo extension_dir=ext >> php.ini
- - IF %PHP%==1 echo extension=php_curl.dll >> php.ini
- - IF NOT EXIST php-installed.txt echo curl.cainfo="C:/tools/php/cacert.pem" >> php.ini
- - IF NOT EXIST php-installed.txt echo openssl.cafile="C:/tools/php/cacert.pem" >> php.ini
- - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
- - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
- - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
- - IF %PHP%==1 echo zend.assertions=1 >> php.ini
- - IF %PHP%==1 echo assert.exception=On >> php.ini
- - IF %PHP%==1 echo error_reporting=E_ALL >> php.ini
- - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
- - IF NOT EXIST composer.phar appveyor-retry appveyor DownloadFile https://getcomposer.org/composer-stable.phar -FileName composer.phar
- - cd c:\projects\php-project-workspace
- - php -r "phpinfo(INFO_GENERAL);"
- - if NOT DEFINED APPVEYOR_REPO_TAG_NAME (set COMPOSER_ROOT_VERSION=dev-master)
- - if %DEPS%==low appveyor-retry composer update --no-interaction --no-progress --profile --prefer-lowest --prefer-stable
- - if %DEPS%==high appveyor-retry composer update --no-interaction --no-progress --profile
-
-## Run the actual test
-test_script:
- - cd c:\projects\php-project-workspace
- - vendor/bin/paratest --log-junit build/phpunit/phpunit.xml
- - php ./psalm --shepherd
+branches:
+ only:
+ - dear-appveyor-please-dont-build-this-repo

.github/workflows/windows-ci.yml

@@ -0,0 +1,50 @@
+name: Run unit tests on Windows
+
+on: [push, pull_request]
+
+jobs:
+ tests:
+ name: "Unit Tests"
+
+ runs-on: windows-latest
+
+ strategy:
+ fail-fast: false
+
+ steps:
+ - name: Set git to use LF
+ run: |
+ git config --global core.autocrlf false
+ git config --global core.eol lf
+
+ - name: Set up PHP
+ uses: shivammathur/setup-php@v2
+ with:
+ php-version: '8.0'
+ tools: composer:v2
+
+ - uses: actions/checkout@v2
+
+ - name: Get Composer Cache Directories
+ id: composer-cache
+ run: |
+ echo "::set-output name=files_cache::$(composer config cache-files-dir)"
+ echo "::set-output name=vcs_cache::$(composer config cache-vcs-dir)"
+
+ - name: Cache composer cache
+ uses: actions/cache@v2
+ with:
+ path: |
+ ${{ steps.composer-cache.outputs.files_cache }}
+ ${{ steps.composer-cache.outputs.vcs_cache }}
+ key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+ restore-keys: |
+ ${{ runner.os }}-composer-
+
+ - name: Run composer install
+ run: composer install -o
+ env:
+ COMPOSER_ROOT_VERSION: dev-master
+
+ - name: Run unit tests
+ run: vendor/bin/paratest --log-junit build/phpunit/phpunit.xml

bin/github-deploy-phar.sh

@@ -26,6 +26,7 @@ git commit -m "Updated Psalm phar to commit ${GITHUB_SHA}"
 git push origin master
 
 tag=${GITHUB_REF/refs\/heads\//}
+tag=${tag/refs\/tags\//}
 
 if [[ "$tag" != 'master' ]] ; then
  git tag "$tag"

composer.json

@@ -16,11 +16,12 @@
  "require": {
  "php": "^7.1|^8",
  "ext-SimpleXML": "*",
+ "ext-ctype": "*",
  "ext-dom": "*",
  "ext-json": "*",
  "ext-libxml": "*",
- "ext-tokenizer": "*",
  "ext-mbstring": "*",
+ "ext-tokenizer": "*",
  "amphp/amp": "^2.4.2",
  "amphp/byte-stream": "^1.5",
  "composer/package-versions-deprecated": "^1.8.0",
@@ -30,7 +31,7 @@
  "felixfbecker/advanced-json-rpc": "^3.0.3",
  "felixfbecker/language-server-protocol": "^1.5",
  "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0",
- "nikic/php-parser": "^4.12",
+ "nikic/php-parser": "4.12.*",
  "openlss/lib-array2xml": "^1.0",
  "sebastian/diff": "^3.0 || ^4.0",
  "symfony/console": "^3.4.17 || ^4.1.6 || ^5.0",
@@ -52,7 +53,6 @@
  "slevomat/coding-standard": "^7.0",
  "squizlabs/php_codesniffer": "^3.5",
  "symfony/process": "^4.3 || ^5.0",
- "weirdan/phpunit-appveyor-reporter": "^1.0.0",
  "weirdan/prophecy-shim": "^1.0 || ^2.0"
  },
  "suggest": {

config.xsd

@@ -5,7 +5,6 @@
  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">
@@ -98,19 +97,19 @@
  <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: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:attribute ref="xml:base" />
+ <xs:anyAttribute processContents="skip"/>
  </xs:complexType>
 
  <xs:complexType name="NameAttributeType">
- <xs:attribute ref="xml:base" />
  <xs:attribute name="name" type="xs:string" use="required" />
+ <xs:anyAttribute processContents="skip"/>
  </xs:complexType>
 
  <xs:complexType name="StubsAttributeType">
@@ -125,14 +124,14 @@
  </xs:choice>
 
  <xs:attribute name="allowMissingFiles" type="xs:string" />
- <xs:attribute ref="xml:base" />
+ <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:attribute ref="xml:base" />
+ <xs:anyAttribute processContents="skip"/>
  </xs:complexType>
 
  <xs:complexType name="FileExtensionsType">
@@ -145,43 +144,43 @@
  </xs:complexType>
  </xs:element>
  </xs:sequence>
- <xs:attribute ref="xml:base" />
+ <xs:anyAttribute processContents="skip"/>
  </xs:complexType>
 
  <xs:complexType name="MockClassesType">
  <xs:sequence>
  <xs:element name="class" maxOccurs="unbounded" type="NameAttributeType" />
  </xs:sequence>
- <xs:attribute ref="xml:base" />
+ <xs:anyAttribute processContents="skip"/>
  </xs:complexType>
 
  <xs:complexType name="UniversalObjectCratesType">
  <xs:sequence>
  <xs:element name="class" maxOccurs="unbounded" type="NameAttributeType" />
  </xs:sequence>
- <xs:attribute ref="xml:base" />
+ <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:attribute ref="xml:base" />
+ <xs:anyAttribute processContents="skip"/>
  </xs:complexType>
 
  <xs:complexType name="StubsType">
  <xs:sequence>
  <xs:element name="file" maxOccurs="unbounded" type="StubsAttributeType" />
  </xs:sequence>
- <xs:attribute ref="xml:base" />
+ <xs:anyAttribute processContents="skip"/>
  </xs:complexType>
 
  <xs:complexType name="ExitFunctionsType">
  <xs:sequence>
  <xs:element name="function" maxOccurs="unbounded" type="NameAttributeType" />
  </xs:sequence>
- <xs:attribute ref="xml:base" />
+ <xs:anyAttribute processContents="skip"/>
  </xs:complexType>
 
  <xs:complexType name="PluginsType">
@@ -200,7 +199,7 @@
  </xs:complexType>
  </xs:element>
  </xs:choice>
- <xs:attribute ref="xml:base" />
+ <xs:anyAttribute/>
  </xs:complexType>
 
  <xs:complexType name="IssueHandlersType">
@@ -227,6 +226,8 @@
  <xs:element name="DocblockTypeContradiction" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="DuplicateArrayKey" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="DuplicateClass" type="IssueHandlerType" minOccurs="0" />
+ <xs:element name="DuplicateEnumCase" type="ClassIssueHandlerType" minOccurs="0" />
+ <xs:element name="DuplicateEnumCaseValue" type="ClassIssueHandlerType" minOccurs="0" />
  <xs:element name="DuplicateFunction" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="DuplicateMethod" type="MethodIssueHandlerType" minOccurs="0" />
  <xs:element name="DuplicateParam" type="IssueHandlerType" minOccurs="0" />
@@ -236,6 +237,7 @@
  <xs:element name="FalseOperand" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="ForbiddenCode" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="ForbiddenEcho" type="IssueHandlerType" minOccurs="0" />
+ <xs:element name="IfThisIsMismatch" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="ImplementationRequirementViolation" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="ImplementedParamTypeMismatch" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="ImplementedReturnTypeMismatch" type="IssueHandlerType" minOccurs="0" />
@@ -266,6 +268,8 @@
  <xs:element name="InvalidClone" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="InvalidDocblock" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="InvalidDocblockParamName" type="IssueHandlerType" minOccurs="0" />
+ <xs:element name="InvalidEnumBackingType" type="ClassIssueHandlerType" minOccurs="0" />
+ <xs:element name="InvalidEnumCaseValue" type="ClassIssueHandlerType" minOccurs="0" />
  <xs:element name="InvalidExtendClass" type="ClassIssueHandlerType" minOccurs="0" />
  <xs:element name="InvalidFalsableReturnType" type="IssueHandlerType" minOccurs="0" />
  <xs:element name="InvalidFunctionCall" type="IssueHandlerType" minOccurs="0" />
@@ -477,7 +481,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:anyAttribute/>
  </xs:complexType>
 
  <xs:complexType name="IssueHandlerType">
@@ -627,7 +631,7 @@
  <xs:sequence>
  <xs:element name="var" maxOccurs="unbounded" type="IdentifierType" />
  </xs:sequence>
- <xs:attribute ref="xml:base" />
+ <xs:anyAttribute/>
  </xs:complexType>
 
  <xs:complexType name="IdentifierType">