Merge pull request #78 from smeghead/feat-77-remove-php-version-options

remove `--php5` `--php7` `--php8` options

Author: smeghead

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 
  * rename directory doc to docs.
+ * Tests refactoring #75 by @pmaasz
+ * remove --php5 --php7 --php8 options #78
 
 ## v1.3.1 (2024-07-05)
 

README.md

@@ -114,9 +114,6 @@ OPTIONS
       --hide-private-properties    hide private properties.
       --hide-private-methods       hide private methods.
       --svg-topurl                 specifies the top URL when displaying the class as a link when outputting in SVG format.
-      --php5                       parse php source file as php5.
-      --php7                       parse php source file as php7.
-      --php8                       parse php source file as php8. (not supported)
       --header='header string'     additional header string. You can specify multiple header values.
       --include='wildcard'         include target file pattern. (default: `*.php`) You can specify multiple include patterns.
       --exclude='wildcard'         exclude target file pattern. You can specify multiple exclude patterns.

bin/php-class-diagram

@@ -34,8 +34,6 @@ $options = getopt('hv', [
     'hide-private-properties',
     'hide-private-methods',
     'svg-topurl::',
-    'php7',
-    'php8',
     'header::',
     'include::',
     'exclude::',
@@ -64,9 +62,6 @@ OPTIONS
       --hide-private-properties    hide private properties.
       --hide-private-methods       hide private methods.
       --svg-topurl                 Specifies the top URL when displaying the class as a link when outputting in SVG format.
-      --php5                       parse php source file as php5.
-      --php7                       parse php source file as php7.
-      --php8                       parse php source file as php8. (not supported)
       --header='header string'     additional header string. You can specify multiple header values.
       --include='wildcard'         include target file pattern. (default: `*.php`) You can specify multiple include patterns.
       --exclude='wildcard'         exclude target file pattern. You can specify multiple exclude patterns.

src/Config/Options.php

@@ -9,10 +9,6 @@ final class Options
     /** @var array<string, mixed> */
     private array $opt;
 
-    public const PHP5 = 'php5';
-    public const PHP7 = 'php7';
-    public const PHP8 = 'php8';
-
     public const DIAGRAM_CLASS = 'class';
     public const DIAGRAM_PACKAGE = 'package';
     public const DIAGRAM_JIG = 'jig';
@@ -91,21 +87,6 @@ public function classNameSummary(): bool
         return true;
     }
 
-    public function phpVersion(): string
-    {
-        if (isset($this->opt['php5'])) {
-            return self::PHP5;
-        }
-        if (isset($this->opt['php7'])) {
-            return self::PHP7;
-        }
-        if (isset($this->opt['php8'])) {
-            return self::PHP8;
-        }
-        // default
-        return self::PHP7;
-    }
-
     /**
      * @return string[] specified headers
      */

src/Php/PhpReader.php

@@ -33,13 +33,7 @@ public static function parseFile(string $directory, string $filename, Options $o
     {
         $code = (string)file_get_contents($filename);
 
-        $targetVersion = match ($options->phpVersion()) {
-            'php5' => ParserFactory::PREFER_PHP5,
-            'php7', 'php8' => ParserFactory::PREFER_PHP7, // php-parser でまだ php8 がサポートされていない。
-            default => throw new RuntimeException(sprintf("invalid php version %s\n", ParserFactory::PREFER_PHP7)),
-        };
-
-        $parser = (new ParserFactory)->create($targetVersion);
+        $parser = (new ParserFactory)->createForHostVersion();
         try {
             $ast = $parser->parse($code);
             $nameResolver = new NameResolver();

test/OptionsTest.php

@@ -131,28 +131,6 @@ public function testClassNameSummaryDefault(): void
         $this->assertTrue($options->classNameSummary(), 'classNameSummary is default on.');
     }
 
-    public function testPhp7(): void
-    {
-        $opt = [
-            'php7' => true,
-        ];
-
-        $options = new Options($opt);
-
-        $this->assertSame(Options::PHP7, $options->phpVersion(), 'php version is 7.');
-    }
-
-    public function testPhp8(): void
-    {
-        $opt = [
-            'php8' => true,
-        ];
-
-        $options = new Options($opt);
-
-        $this->assertSame(Options::PHP8, $options->phpVersion(), 'php version is 8.');
-    }
-
     /**
      * @dataProvider provideDiagrams
      */