Merge pull request #96 from smeghead/chore/vendor-update

chore: supported php version make >=8.2 and update vendors.

Author: smeghead

.github/workflows/php.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['8.0', '8.1', '8.2', '8.3', '8.4']
+        php-versions: ['8.2', '8.3', '8.4']
     name: PHP ${{ matrix.php-versions }} Test
     steps:
     - uses: actions/checkout@v4

CHANGELOG.md

@@ -3,6 +3,8 @@
 ### Features
 
  * doc: add Extension Visual Studio Code.
+ * chore: supported php version >=8.2.
+ * chore: update vendors.
 
 ## v1.5.3 (2024-12-26)
 

Dockerfile

@@ -1,6 +1,21 @@
 FROM plantuml/plantuml
 
-RUN apt-get update && apt-get install -y php8.1-cli php-xml php-mbstring php-xdebug fonts-noto-cjk git zip && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y \
+    software-properties-common \
+    ca-certificates \
+    wget \
+    gnupg \
+    fonts-noto-cjk \
+    git \
+    zip \
+    && add-apt-repository ppa:ondrej/php \
+    && apt-get update && apt-get install -y \
+    php8.2-cli \
+    php8.2-mbstring \
+    php8.2-xml \
+    php8.2-curl \
+    php8.2-xdebug \
+    && rm -rf /var/lib/apt/lists/*
 RUN echo '#!/bin/sh' > /usr/bin/plantuml && echo 'java -jar /opt/plantuml.jar "$@"' >> /usr/bin/plantuml && chmod +x /usr/bin/plantuml
 
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer

composer.json

@@ -7,13 +7,13 @@
         "PlantUML"
     ],
     "require": {
-        "php" : ">=8.0",
+        "php" : ">=8.2",
         "symfony/finder": "^5.3|^6.0|^7.0",
         "nikic/php-parser": "^5.2",
-        "phpstan/phpdoc-parser": "^1.30"
+        "phpstan/phpdoc-parser": "^2.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.6",
+        "phpunit/phpunit": "^11.5",
         "clue/phar-composer": "^1.2",
         "phpstan/phpstan": "^1.10",
         "smeghead/php-vendor-credits": "~0.0.4"

src/Php/Doc/PhpDocComment.php

@@ -12,6 +12,7 @@
 use PHPStan\PhpDocParser\Parser\PhpDocParser;
 use PHPStan\PhpDocParser\Parser\TokenIterator;
 use PHPStan\PhpDocParser\Parser\TypeParser;
+use PHPStan\PhpDocParser\ParserConfig;
 
 final class PhpDocComment
 {
@@ -79,11 +80,15 @@ public function getReturnTypeName(): string {
 
     private function getParseResult(): PhpDocNode
     {
-        $lexer = new Lexer();
-        $constExprParser = new ConstExprParser();
-        $typeParser = new TypeParser($constExprParser);
-        $phpDocParser = new PhpDocParser($typeParser, $constExprParser);
+        $config = new ParserConfig([]);
+
+        $lexer = new Lexer($config);
+        $constExprParser = new ConstExprParser($config);
+        $typeParser = new TypeParser($config, $constExprParser);
+        $phpDocParser = new PhpDocParser($config, $typeParser, $constExprParser);
+
         $tokens = new TokenIterator($lexer->tokenize('/** ' . $this->text . ' */'));
+
         return $phpDocParser->parse($tokens); // PhpDocNode
     }
 

test/OptionsTest.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 
 use Smeghead\PhpClassDiagram\Config\Options;
@@ -131,17 +132,15 @@ public function testClassNameSummaryDefault(): void
         $this->assertTrue($options->classNameSummary(), 'classNameSummary is default on.');
     }
 
-    /**
-     * @dataProvider provideDiagrams
-     */
+    #[DataProvider('provideDiagrams')]
     public function testDiagrams(array $options, string $expected): void
     {
         $options = new Options($options);
 
         $this->assertSame($expected, $options->diagram(), sprintf('diagram is %s.', $expected));
     }
 
-    public function provideDiagrams(): array
+    public static function provideDiagrams(): array
     {
         return [
             [[], Options::DIAGRAM_CLASS],// default

test/PhpReflectionTest.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use PHPUnit\Framework\Attributes\RequiresPhp;
 use PHPUnit\Framework\TestCase;
 
 use Smeghead\PhpClassDiagram\Config\Options;
@@ -343,10 +344,7 @@ public function testTrait(): void
         $this->assertSame('string', $data->getMethods()[0]->getParams()[0]->getType()->getName(), 'parameter type.');
         $this->assertSame([], $data->getMethods()[0]->getParams()[0]->getType()->getTypes()[0]->getNamespace(), 'parameter type namespace.');
     }
-    /**
-     * @requires PHP >= 8.1
-     * PHP8.0 dose not have `enum`. 
-     */
+
     public function testEnum(): void
     {
         $options = new Options([]);