Merge remote-tracking branch 'origin/main' into main

* origin/main:
  Misc code improvements
  Improve README
  Fix CI, add tools
  Improve bootstrap
  Update README.md
  Update README.md
  Update README.md
  Update README.md

# Conflicts:
#	README.md
#	src/voku/PhpDocFixer/CliCommand/PhpDocFixerCommand.php
#	src/voku/PhpDocFixer/ReadXmlDocs/XmlReader.php

Author: voku

.phive/phars.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phive xmlns="https://phar.io/phive">
+  <phar name="scrutinizer-ci/ocular" version="^1.6.0" installed="1.6.0" location="./tools/ocular" copy="false"/>
+  <phar name="box-project/box" version="^3.9.0" installed="3.9.0" location="./tools/box" copy="false"/>
+  <phar name="php-cs-fixer" version="^2.16.4" installed="2.16.4" location="./tools/php-cs-fixer" copy="false"/>
+</phive>

.travis.yml

@@ -17,14 +17,13 @@ jobs:
   fast_finish: true
   include:
     - php: 7.4
-    - php: 7.3
       after_script:
         - travis_retry composer require --no-interaction --prefer-dist --optimize-autoloader php-coveralls/php-coveralls
         - vendor/bin/php-coveralls -v
         - tools/ocular code-coverage:upload --format=php-clover build/logs/clover.xml
         - bash <(curl -s "https://codecov.io/bash") -Z
-    - php: 7.2
-    - php: nightly
+    - name: "PHP 8.0"
+      php: nightly
     - name: "Coding style"
       php: 7.4
       install: "skip"
@@ -34,10 +33,9 @@ jobs:
     - name: "Static analysis"
       php: 7.4
       install:
-        - travis_retry composer require --no-interaction --prefer-dist --optimize-autoloader phpstan/phpstan
-        - travis_retry composer require --no-interaction --prefer-dist --optimize-autoloader vimeo/psalm
+        - travis_retry composer require --no-interaction --prefer-dist --optimize-autoloader phpstan/phpstan vimeo/psalm
       script:
-        - php bin/phpdocfixer analyse src
+        - php bin/phpdocfixer run src/
         - vendor/bin/phpstan analyse
         - vendor/bin/psalm
     - name: "Compile PHAR"

README.md

@@ -1,33 +1,12 @@
-[![Build Status](https://travis-ci.com/voku/php-doc-fixer.svg?branch=master)](https://travis-ci.com/voku/php-doc-fixer)
-[![Latest Stable Version](https://poser.pugx.org/voku/php-doc-fixer/v/stable)](https://packagist.org/packages/voku/php-doc-fixer) 
-[![License](https://poser.pugx.org/voku/php-doc-fixer/license)](https://packagist.org/packages/voku/php-doc-fixer)
-[![Donate to this project using Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.me/moelleken)
-[![Donate to this project using Patreon](https://img.shields.io/badge/patreon-donate-yellow.svg)](https://www.patreon.com/voku)
 
 # ***PHP-Documentation-Check***
 
 This is a experiment! Lets check and fix the php documentation automatically.
 
+```bash
+git clone https://github.com/php/doc-en.git
+git clone https://github.com/voku/php-doc-fixer.git
+cd php-doc-fixer/
+composer update --prefer-dist
+php bin/phpdocfixer run [--auto-fix="true"] ../doc-en/reference
 ```
-git clone https://github.com/php/doc-en
-cd ..
-git clone https://github.com/voku/php-doc-fixer
-composer install
-php bin/phpdocfixer run [--auto-fix="true"] doc-en/reference
-```
-
-### Support
-
-For support and donations please visit [Github](https://github.com/voku/simple_html_dom/) | [Issues](https://github.com/voku/simple_html_dom/issues) | [PayPal](https://paypal.me/moelleken) | [Patreon](https://www.patreon.com/voku).
-
-For status updates and release announcements please visit [Releases](https://github.com/voku/simple_html_dom/releases) | [Twitter](https://twitter.com/suckup_de) | [Patreon](https://www.patreon.com/voku/posts).
-
-For professional support please contact [me](https://about.me/voku).
-
-### Thanks
-
-- Thanks to [GitHub](https://github.com) (Microsoft) for hosting the code and a good infrastructure including Issues-Managment, etc.
-- Thanks to [IntelliJ](https://www.jetbrains.com) as they make the best IDEs for PHP and they gave me an open source license for PhpStorm!
-- Thanks to [Travis CI](https://travis-ci.com/) for being the most awesome, easiest continous integration tool out there!
-- Thanks to [StyleCI](https://styleci.io/) for the simple but powerfull code style check.
-- Thanks to [PHPStan](https://github.com/phpstan/phpstan) && [Psalm](https://github.com/vimeo/psalm) for really great Static analysis tools and for discover bugs in the code!

bin/phpdocfixer.php

@@ -6,13 +6,13 @@
 
 use Symfony\Component\Console\Application;
 
-require_once __DIR__ . "/../vendor/autoload.php";
+require_once dirname(__DIR__) . '/vendor/autoload.php';
 
 (static function () {
     error_reporting(E_ALL);
     ini_set('display_errors', 'stderr');
 
-    \define('__PHPDOCFIXER_RUNNING__', true);
+    define('__PHPDOCFIXER_RUNNING__', true);
 
     $app = new Application('PhpDocFixer');
 

psalm.xml

@@ -3,8 +3,8 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
-    totallyTyped="false"
-    allowPhpStormGenerics="true"
+    totallyTyped="true"
+    errorLevel="1"
 >
     <projectFiles>
         <directory name="src" />
@@ -14,14 +14,8 @@
     </projectFiles>
 
     <issueHandlers>
-        <InternalClass errorLevel="suppress" />
         <MoreSpecificReturnType errorLevel="suppress" />
         <LessSpecificReturnStatement errorLevel="suppress" />
-        <MoreSpecificImplementedParamType errorLevel="suppress" />
-        <UnresolvableInclude errorLevel="suppress" />
-        <ParamNameMismatch errorLevel="suppress" />
-        <ForbiddenCode errorLevel="suppress" />
-        <RedundantCondition errorLevel="suppress" />
     </issueHandlers>
 
 </psalm>

src/voku/PhpDocFixer/PhpStormStubs/PhpStormStubsReader.php

@@ -33,10 +33,11 @@ public function parse(): array
 
         foreach ($phpCode->getClasses() as $class) {
             $methodInfo = $class->getMethodsInfo();
+            $className = (string) $class->name;
             foreach ($methodInfo as $methodName => $info) {
-                $return[$class->name . '::' . $methodName]['return'] = \ltrim($info['returnTypes']['typeFromPhpDocSimple'] ?? '', '\\');
+                $return[$className . '::' . $methodName]['return'] = \ltrim($info['returnTypes']['typeFromPhpDocSimple'] ?? '', '\\');
                 foreach ($info['paramsTypes'] as $paramName => $paramTypes) {
-                    $return[$class->name . '::' . $methodName]['params'][$paramName] = \ltrim($paramTypes['typeFromPhpDocSimple'] ?? '', '\\');
+                    $return[$className . '::' . $methodName]['params'][$paramName] = \ltrim($paramTypes['typeFromPhpDocSimple'] ?? '', '\\');
                 }
             }
         }