refactor: rename TestRunnerObserverFactory to ObserverFactory, export PresetName type

- Shorten factory class and file name
- Extract PresetName type from resolveFormat for shared use
- Fix package.json preset enum to match actual values: progress, collision, pretty
- Update README EN/ZH with correct preset descriptions

Author: recca0120

packages/extension/README.md

@@ -68,7 +68,7 @@ Add to `.vscode/settings.json`. All settings use the `phpunit.*` prefix.
   // Save all open files before running tests (default: false)
   "phpunit.saveBeforeTest": false,
 
-  // Output format preset: "collision" (detailed per-test) or "phpunit" (dot-progress)
+  // Output format preset: "collision" (detailed per-test), "progress" (dot-progress), or "pretty" (per-test without icons)
   "phpunit.output.preset": "collision",
 
   // Override individual format fields from the preset (see phpunit package docs)

packages/extension/README.zh-TW.md

@@ -68,7 +68,7 @@
   // 執行測試前儲存所有開啟的檔案（預設：false）
   "phpunit.saveBeforeTest": false,
 
-  // 輸出格式預設："collision"（逐條詳細顯示）或 "phpunit"（點進度模式）
+  // 輸出格式預設："collision"（逐條詳細顯示）、"progress"（點進度模式）或 "pretty"（逐條無圖示）
   "phpunit.output.preset": "collision",
 
   // 覆寫預設的個別格式欄位（詳見 phpunit 套件文件）

packages/extension/package.json

@@ -137,11 +137,12 @@
                 "phpunit.output.preset": {
                     "type": "string",
                     "enum": [
-                        "phpunit",
-                        "collision"
+                        "progress",
+                        "collision",
+                        "pretty"
                     ],
                     "default": "collision",
-                    "description": "Output format preset. 'collision' shows detailed per-test results; 'phpunit' shows dot-progress.",
+                    "description": "Output format preset. 'collision' shows detailed per-test results; 'progress' shows dot-progress; 'pretty' shows per-test without icons.",
                     "scope": "resource"
                 },
                 "phpunit.output.format": {

…ervers/TestRunnerObserverFactory.test.ts …on/src/Observers/ObserverFactory.test.tspackages/extension/src/Observers/TestRunnerObserverFactory.test.ts renamed to packages/extension/src/Observers/ObserverFactory.test.ts packages/extension/src/Observers/TestRunnerObserverFactory.test.ts renamed to packages/extension/src/Observers/ObserverFactory.test.ts

@@ -4,12 +4,12 @@ import type { OutputChannel, TestItem, TestRun } from 'vscode';
 import type { Configuration } from '../Configuration';
 import type { TestCollection } from '../TestCollection/TestCollection';
 import { DatasetObserver } from './DatasetObserver';
+import { ObserverFactory } from './ObserverFactory';
 import { PrinterObserver } from './PrinterObserver';
 import { TestResultObserver } from './TestResultObserver';
-import { TestRunnerObserverFactory } from './TestRunnerObserverFactory';
 
-describe('TestRunnerObserverFactory', () => {
-    let factory: TestRunnerObserverFactory;
+describe('ObserverFactory', () => {
+    let factory: ObserverFactory;
     let outputChannel: OutputChannel;
 
     beforeEach(() => {
@@ -25,12 +25,7 @@ describe('TestRunnerObserverFactory', () => {
         } as unknown as OutputChannel;
         const configuration = { get: vi.fn() } as unknown as Configuration;
         const phpUnitXML = new PHPUnitXML();
-        factory = new TestRunnerObserverFactory(
-            testCollection,
-            outputChannel,
-            configuration,
-            phpUnitXML,
-        );
+        factory = new ObserverFactory(testCollection, outputChannel, configuration, phpUnitXML);
     });
 
     it('should create observers including DatasetObserver, TestResultObserver, and PrinterObserver', () => {

…c/Observers/TestRunnerObserverFactory.ts …tension/src/Observers/ObserverFactory.tspackages/extension/src/Observers/TestRunnerObserverFactory.ts renamed to packages/extension/src/Observers/ObserverFactory.ts packages/extension/src/Observers/TestRunnerObserverFactory.ts renamed to packages/extension/src/Observers/ObserverFactory.ts

@@ -1,6 +1,7 @@
 import {
     type IConfiguration,
     PHPUnitXML,
+    type PresetName,
     Printer,
     type PrinterFormat,
     resolveFormat,
@@ -20,7 +21,7 @@ import { TestResultObserver } from './TestResultObserver';
 import { TestRunWriter } from './Writers';
 
 @injectable()
-export class TestRunnerObserverFactory {
+export class ObserverFactory {
     constructor(
         @inject(TestCollection) private testCollection: TestCollection,
         @inject(TYPES.OutputChannel) private outputChannel: OutputChannel,
@@ -31,10 +32,7 @@ export class TestRunnerObserverFactory {
     create(queue: Map<TestDefinition, TestItem>, testRun: TestRun): TestRunnerObserver[] {
         const testItemById = new Map([...queue.values()].map((item) => [item.id, item]));
         const format = resolveFormat(
-            (this.configuration.get('output.preset') ?? 'collision') as
-                | 'progress'
-                | 'collision'
-                | 'pretty',
+            (this.configuration.get('output.preset') ?? 'collision') as PresetName,
             this.configuration.get('output.format') as Partial<PrinterFormat> | undefined,
         );
 

packages/extension/src/Observers/index.ts

@@ -1,7 +1,7 @@
 export * from './DatasetObserver';
 export * from './ErrorDialogObserver';
+export * from './ObserverFactory';
 export * from './PrinterObserver';
 export * from './RawOutputObserver';
 export * from './TestResultObserver';
-export * from './TestRunnerObserverFactory';
 export * from './Writers';

packages/extension/src/TestExecution/TestRunHandler.ts

@@ -9,7 +9,7 @@ import {
 import { inject, injectable } from 'inversify';
 import type { CancellationToken, TestController, TestItem, TestRun, TestRunRequest } from 'vscode';
 import { FileCoverageAdapter } from '../FileCoverageAdapter';
-import { TestRunnerObserverFactory } from '../Observers';
+import { ObserverFactory } from '../Observers';
 import { TestCollection } from '../TestCollection';
 import { TYPES } from '../types';
 import { DebugSessionManager } from './DebugSessionManager';
@@ -25,7 +25,7 @@ export class TestRunHandler {
         @inject(TYPES.TestController) private ctrl: TestController,
         @inject(ProcessBuilderFactory) private processBuilderFactory: ProcessBuilderFactory,
         @inject(TestCollection) private testCollection: TestCollection,
-        @inject(TestRunnerObserverFactory) private observerFactory: TestRunnerObserverFactory,
+        @inject(ObserverFactory) private observerFactory: ObserverFactory,
         @inject(TestQueueBuilder) private testQueueBuilder: TestQueueBuilder,
         @inject(DebugSessionManager) private debugSession: DebugSessionManager,
     ) {}

packages/extension/src/container.ts

@@ -16,7 +16,7 @@ import {
     workspace,
 } from 'vscode';
 import { Configuration } from './Configuration';
-import { TestRunnerObserverFactory } from './Observers';
+import { ObserverFactory } from './Observers';
 import { TestCollection } from './TestCollection';
 import { TestFileDiscovery, TestFileWatcher, TestWatchManager } from './TestDiscovery';
 import {
@@ -90,7 +90,7 @@ function createChildContainer(parent: Container, workspaceFolder: WorkspaceFolde
 
     // Per-folder services
     child.bind(ProcessBuilderFactory).toSelf().inSingletonScope();
-    child.bind(TestRunnerObserverFactory).toSelf().inSingletonScope();
+    child.bind(ObserverFactory).toSelf().inSingletonScope();
     child.bind(TestCollection).toSelf().inSingletonScope();
     child.bind(TestQueueBuilder).toSelf().inSingletonScope();
     child.bind(DebugSessionManager).toSelf().inSingletonScope();

packages/phpunit/src/Printer/PrinterConfig.ts

@@ -152,8 +152,10 @@ export const PRESET_PRETTY: PrinterFormat = {
     },
 };
 
+export type PresetName = 'progress' | 'collision' | 'pretty';
+
 export function resolveFormat(
-    preset: 'progress' | 'collision' | 'pretty',
+    preset: PresetName,
     overrides?: Partial<PrinterFormat>,
 ): PrinterFormat {
     const presets: Record<string, PrinterFormat> = {