diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1f0e16e..f62d294 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,40 +6,39 @@ on: pull_request: branches: [ master ] +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: build: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - php: [7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2] + php: ['8.1', '8.2', '8.3', '8.4', '8.5'] name: PHP ${{ matrix.php }} + timeout-minutes: 10 steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup PHP uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - tools: composer:v1 + tools: composer:v2 + coverage: none - name: Install Dependencies run: composer update - name: Run phpunit tests - run: | - mkdir -p build/logs - vendor/bin/phpunit --coverage-clover ./build/logs/clover.xml + run: vendor/bin/phpunit --stop-on-error - name: Run phpcs run: composer cs - name: Run phpstan run: composer static - - - name: Coverage upload - if: matrix.php == '7.4' - run: bash <(curl -s https://codecov.io/bash) - diff --git a/README.md b/README.md index 6e5109e..b4cc6bc 100644 --- a/README.md +++ b/README.md @@ -12,11 +12,15 @@ CLI Markdown Renderer addExtension(new CommonMarkCoreExtension()); + +$parser = new MarkdownParser($environment); $cliRenderer = (new CliRendererFactory)->__invoke(); $ast = $parser->parse(file_get_contents('path/to/file.md')); @@ -26,7 +30,7 @@ echo $cliRenderer->renderBlock($ast); ### Syntax Highlighting `FencedCode` can be syntax highlighted. By default only PHP source code is Syntax Highlighted using: [kadet/keylighter](https://github.com/kadet1090/KeyLighter) -If you want to add syntax highlighting for other languages you should create a class which implements `\AydinHassan\CliMdRenderer\SyntaxHighlighterInterface` +If you want to add syntax highlighting for other languages you should create a class which implements `\PhpSchool\CliMdRenderer\SyntaxHighlighterInterface` It accepts code as a string and should return highlighted code as a string. You register your highlighter like so @@ -46,7 +50,9 @@ If you need to do this you cannot use the factory so construction will look some require_once 'vendor/autoload.php'; use Colors\Color; -use League\CommonMark\Environment; +use League\CommonMark\Environment\Environment; +use PhpSchool\CliMdRenderer\CliExtension; +use PhpSchool\CliMdRenderer\CliRenderer; $environment = new Environment(); $environment->addExtension(new CliExtension()); diff --git a/composer.json b/composer.json index 00c9195..db970e2 100644 --- a/composer.json +++ b/composer.json @@ -9,15 +9,16 @@ } ], "require" : { - "php" : ">=7.1", - "league/commonmark": "^1.5.6", - "php-school/keylighter": "^0.8.4", + "php" : "^8.1", + "league/commonmark": "^2.8", + "nette/schema": "^1.2", + "php-school/keylighter": "^0.8.5", "kevinlebrun/colors.php": "^1.0" }, "require-dev": { - "phpunit/phpunit": "^7.0 | ^8.0 | ^9.0", - "squizlabs/php_codesniffer": "^3.0", - "phpstan/phpstan": "^0.12.50" + "phpunit/phpunit": "^10.5 || ^11.5 || ^12.0", + "squizlabs/php_codesniffer": "^3.10", + "phpstan/phpstan": "^2.1" }, "autoload" : { "psr-4" : { diff --git a/composer.lock b/composer.lock index 665b5bc..f964f05 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,83 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "65ae87097120ac4c491f830fd106ec19", + "content-hash": "21c93bcf5a5df8d12a1c5c4e30903407", "packages": [ + { + "name": "dflydev/dot-access-data", + "version": "v3.0.3", + "source": { + "type": "git", + "url": "https://github.com/dflydev/dflydev-dot-access-data.git", + "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dflydev/dflydev-dot-access-data/zipball/a23a2bf4f31d3518f3ecb38660c95715dfead60f", + "reference": "a23a2bf4f31d3518f3ecb38660c95715dfead60f", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^0.12.42", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.3", + "scrutinizer/ocular": "1.6.0", + "squizlabs/php_codesniffer": "^3.5", + "vimeo/psalm": "^4.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Dflydev\\DotAccessData\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Dragonfly Development Inc.", + "email": "info@dflydev.com", + "homepage": "http://dflydev.com" + }, + { + "name": "Beau Simensen", + "email": "beau@dflydev.com", + "homepage": "http://beausimensen.com" + }, + { + "name": "Carlos Frutos", + "email": "carlos@kiwing.it", + "homepage": "https://github.com/cfrutos" + }, + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com" + } + ], + "description": "Given a deep data structure, access data by dot notation.", + "homepage": "https://github.com/dflydev/dflydev-dot-access-data", + "keywords": [ + "access", + "data", + "dot", + "notation" + ], + "support": { + "issues": "https://github.com/dflydev/dflydev-dot-access-data/issues", + "source": "https://github.com/dflydev/dflydev-dot-access-data/tree/v3.0.3" + }, + "time": "2024-07-08T12:26:09+00:00" + }, { "name": "kevinlebrun/colors.php", "version": "1.0.3", @@ -63,42 +138,55 @@ }, { "name": "league/commonmark", - "version": "1.6.7", + "version": "2.10.4", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b" + "reference": "40821b7606d8d946bac57dbd2290076c722e3a65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/2b8185c13bc9578367a5bf901881d1c1b5bbd09b", - "reference": "2b8185c13bc9578367a5bf901881d1c1b5bbd09b", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/40821b7606d8d946bac57dbd2290076c722e3a65", + "reference": "40821b7606d8d946bac57dbd2290076c722e3a65", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": "^7.1 || ^8.0" - }, - "conflict": { - "scrutinizer/ocular": "1.7.*" + "league/config": "^1.1.1", + "php": "^7.4 || ^8.0", + "psr/event-dispatcher": "^1.0", + "symfony/deprecation-contracts": "^2.1 || ^3.0", + "symfony/polyfill-php80": "^1.16" }, "require-dev": { - "cebe/markdown": "~1.0", - "commonmark/commonmark.js": "0.29.2", - "erusev/parsedown": "~1.0", + "cebe/markdown": "^1.0", + "commonmark/cmark": "0.31.1", + "commonmark/commonmark.js": "0.31.1", + "composer/package-versions-deprecated": "^1.8", + "embed/embed": "^4.4", + "erusev/parsedown": "^1.0", "ext-json": "*", "github/gfm": "0.29.0", - "michelf/php-markdown": "~1.4", - "mikehaertl/php-shellcommand": "^1.4", - "phpstan/phpstan": "^0.12.90", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.2", - "scrutinizer/ocular": "^1.5", - "symfony/finder": "^4.2" + "michelf/php-markdown": "^1.4 || ^2.0", + "nyholm/psr7": "^1.5", + "phpstan/phpstan": "^2.0.0", + "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0 || ^12.0.0 || ^13.0.0", + "scrutinizer/ocular": "^1.8.1", + "symfony/finder": "^5.3 | ^6.0 | ^7.0 || ^8.0", + "symfony/process": "^5.4 | ^6.0 | ^7.0 || ^8.0", + "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0 | ^7.0 || ^8.0", + "unleashedtech/php-coding-standard": "^3.1.1", + "vimeo/psalm": "^4.24.0 || ^5.0.0 || ^6.0.0" + }, + "suggest": { + "symfony/yaml": "v2.3+ required if using the Front Matter extension" }, - "bin": [ - "bin/commonmark" - ], "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.11-dev" + } + }, "autoload": { "psr-4": { "League\\CommonMark\\": "src" @@ -116,7 +204,7 @@ "role": "Lead Developer" } ], - "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and Github-Flavored Markdown (GFM)", + "description": "Highly-extensible PHP Markdown parser which fully supports the CommonMark spec and GitHub-Flavored Markdown (GFM)", "homepage": "https://commonmark.thephpleague.com", "keywords": [ "commonmark", @@ -130,6 +218,7 @@ ], "support": { "docs": "https://commonmark.thephpleague.com/", + "forum": "https://github.com/thephpleague/commonmark/discussions", "issues": "https://github.com/thephpleague/commonmark/issues", "rss": "https://github.com/thephpleague/commonmark/releases.atom", "source": "https://github.com/thephpleague/commonmark" @@ -152,27 +241,267 @@ "type": "tidelift" } ], - "time": "2022-01-13T17:18:13+00:00" + "time": "2026-10-17T19:59:50+00:00" + }, + { + "name": "league/config", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/config.git", + "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/config/zipball/754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", + "reference": "754b3604fb2984c71f4af4a9cbe7b57f346ec1f3", + "shasum": "" + }, + "require": { + "dflydev/dot-access-data": "^3.0.1", + "nette/schema": "^1.2", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.8.2", + "phpunit/phpunit": "^9.5.5", + "scrutinizer/ocular": "^1.8.1", + "unleashedtech/php-coding-standard": "^3.1", + "vimeo/psalm": "^4.7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.2-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Config\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com", + "role": "Lead Developer" + } + ], + "description": "Define configuration arrays with strict schemas and access values with dot notation", + "homepage": "https://config.thephpleague.com", + "keywords": [ + "array", + "config", + "configuration", + "dot", + "dot-access", + "nested", + "schema" + ], + "support": { + "docs": "https://config.thephpleague.com/", + "issues": "https://github.com/thephpleague/config/issues", + "rss": "https://github.com/thephpleague/config/releases.atom", + "source": "https://github.com/thephpleague/config" + }, + "funding": [ + { + "url": "https://www.colinodell.com/sponsor", + "type": "custom" + }, + { + "url": "https://www.paypal.me/colinpodell/10.00", + "type": "custom" + }, + { + "url": "https://github.com/colinodell", + "type": "github" + } + ], + "time": "2022-12-11T20:36:23+00:00" + }, + { + "name": "nette/schema", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/nette/schema.git", + "reference": "af9fa8a86bfca9b02b10346220db26e62ef942ec" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nette/schema/zipball/af9fa8a86bfca9b02b10346220db26e62ef942ec", + "reference": "af9fa8a86bfca9b02b10346220db26e62ef942ec", + "shasum": "" + }, + "require": { + "nette/utils": "^4.0", + "php": "8.1 - 8.6" + }, + "require-dev": { + "nette/phpstan-rules": "^1.0.7", + "nette/tester": "^2.6", + "phpstan/extension-installer": "^1.4@stable", + "phpstan/phpstan": "^2.3@stable", + "tracy/tracy": "^2.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "psr-4": { + "Nette\\": "src" + }, + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause", + "GPL-2.0-only", + "GPL-3.0-only" + ], + "authors": [ + { + "name": "David Grudl", + "homepage": "https://davidgrudl.com" + } + ], + "description": "📐 Nette Schema: validates and normalizes data such as configuration or API input against a schema described in a few readable lines of PHP, with precise error messages.", + "homepage": "https://doc.nette.org/schema", + "keywords": [ + "configuration", + "data validation", + "nette", + "normalization", + "schema", + "validation" + ], + "support": { + "issues": "https://github.com/nette/schema/issues", + "source": "https://github.com/nette/schema/tree/v1.4.0" + }, + "time": "2026-10-22T02:12:50+00:00" + }, + { + "name": "nette/utils", + "version": "v4.1.6", + "source": { + "type": "git", + "url": "https://github.com/nette/utils.git", + "reference": "6bf24518accf32cf845bca305e0b92078700fd01" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nette/utils/zipball/6bf24518accf32cf845bca305e0b92078700fd01", + "reference": "6bf24518accf32cf845bca305e0b92078700fd01", + "shasum": "" + }, + "require": { + "php": "8.2 - 8.6" + }, + "conflict": { + "nette/finder": "<3", + "nette/schema": "<1.2.2" + }, + "require-dev": { + "jetbrains/phpstorm-attributes": "^1.2", + "nette/phpstan-rules": "^1.0", + "nette/tester": "^2.5", + "phpstan/extension-installer": "^1.4@stable", + "phpstan/phpstan": "^2.1@stable", + "tracy/tracy": "^2.9" + }, + "suggest": { + "ext-gd": "to use Image", + "ext-iconv": "to use Strings::chr(), ord() and reverse()", + "ext-intl": "to use Strings::webalize(), toAscii(), normalize() and compare()", + "ext-json": "to use Nette\\Utils\\Json", + "ext-mbstring": "to use Strings::lower() etc...", + "ext-tokenizer": "to use Nette\\Utils\\Reflection::getUseStatements()" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.1-dev" + } + }, + "autoload": { + "psr-4": { + "Nette\\": "src" + }, + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause", + "GPL-2.0-only", + "GPL-3.0-only" + ], + "authors": [ + { + "name": "David Grudl", + "homepage": "https://davidgrudl.com" + }, + { + "name": "Nette Community", + "homepage": "https://nette.org/contributors" + } + ], + "description": "🛠 Nette Utils: lightweight utilities for string & array manipulation, image handling, safe JSON encoding/decoding, validation, slug or strong password generating etc.", + "homepage": "https://nette.org", + "keywords": [ + "array", + "core", + "datetime", + "images", + "json", + "nette", + "paginator", + "password", + "slugify", + "string", + "unicode", + "utf-8", + "utility", + "validation" + ], + "support": { + "issues": "https://github.com/nette/utils/issues", + "source": "https://github.com/nette/utils/tree/v4.1.6" + }, + "time": "2026-10-20T17:07:56+00:00" }, { "name": "php-school/keylighter", - "version": "0.8.4", + "version": "0.8.5", "source": { "type": "git", "url": "https://github.com/php-school/KeyLighter.git", - "reference": "f534f8de4bf99d2a8f54991fa55661940e23210d" + "reference": "155bc2b3fb12e99d4339c5f77404dad7d173d07b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-school/KeyLighter/zipball/f534f8de4bf99d2a8f54991fa55661940e23210d", - "reference": "f534f8de4bf99d2a8f54991fa55661940e23210d", + "url": "https://api.github.com/repos/php-school/KeyLighter/zipball/155bc2b3fb12e99d4339c5f77404dad7d173d07b", + "reference": "155bc2b3fb12e99d4339c5f77404dad7d173d07b", "shasum": "" }, "require": { "php": "^7.1.3 | ^8.0" }, "require-dev": { - "phpunit/phpunit": "^8.0", + "phpunit/phpunit": "^8.0 | ^9.6", "symfony/console": "^2.8|^3.0" }, "suggest": { @@ -202,43 +531,36 @@ ], "description": "Yet another syntax highlighter for PHP", "support": { - "source": "https://github.com/php-school/KeyLighter/tree/0.8.4" + "source": "https://github.com/php-school/KeyLighter/tree/0.8.5" }, - "time": "2020-11-01T14:21:30+00:00" - } - ], - "packages-dev": [ + "time": "2026-10-22T12:11:43+00:00" + }, { - "name": "doctrine/instantiator", - "version": "1.4.1", + "name": "psr/event-dispatcher", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc" + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc", - "reference": "10dcfce151b967d20fde1b34ae6640712c3891bc", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "doctrine/coding-standard": "^9", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^0.16 || ^1", - "phpstan/phpstan": "^1.4", - "phpstan/phpstan-phpunit": "^1", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.22" + "php": ">=7.2.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + "Psr\\EventDispatcher\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -247,61 +569,204 @@ ], "authors": [ { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "description": "Standard interfaces for event handling.", "keywords": [ - "constructor", - "instantiate" + "events", + "psr", + "psr-14" ], "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.1" + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.7.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/f3202fa1b5097b0af062dc978b32ecf63404e31d", + "reference": "f3202fa1b5097b0af062dc978b32ecf63404e31d", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, + "branch-alias": { + "dev-main": "3.7-dev" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.7.1" }, "funding": [ { - "url": "https://www.doctrine-project.org/sponsorship.html", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2022-03-03T08:28:38+00:00" + "time": "2026-06-05T06:23:12+00:00" }, + { + "name": "symfony/polyfill-php80", + "version": "v1.43.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74", + "reference": "9c6a5d6b01ca51d486c813e9a9c0ed55f208bb74", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/tree/v1.43.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-09-25T15:50:05+00:00" + } + ], + "packages-dev": [ { "name": "myclabs/deep-copy", - "version": "1.11.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614" + "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614", - "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae", + "reference": "8680aa248f8e07bc8fb43f56f0f5fc77a0c96aae", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": "^8.0" }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -327,37 +792,38 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.14.0" }, "funding": [ { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" + "url": "https://github.com/mnapoli", + "type": "github" } ], - "time": "2022-03-03T13:19:32+00:00" + "time": "2026-08-11T10:17:44+00:00" }, { "name": "nikic/php-parser", - "version": "v4.15.1", + "version": "v5.9.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" + "reference": "9e33da9553fe7786f0962b35f4e4ecf01be89def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", - "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/9e33da9553fe7786f0962b35f4e4ecf01be89def", + "reference": "9e33da9553fe7786f0962b35f4e4ecf01be89def", "shasum": "" }, "require": { + "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.4" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^9.0" }, "bin": [ "bin/php-parse" @@ -365,7 +831,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.x-dev" } }, "autoload": { @@ -389,26 +855,27 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.9.0" }, - "time": "2022-09-04T07:30:47+00:00" + "time": "2026-09-13T18:51:52+00:00" }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -449,9 +916,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -506,20 +979,15 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.100", - "source": { - "type": "git", - "url": "https://github.com/phpstan/phpstan.git", - "reference": "48236ddf823547081b2b153d1cd2994b784328c3" - }, + "version": "2.3.1", "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/48236ddf823547081b2b153d1cd2994b784328c3", - "reference": "48236ddf823547081b2b153d1cd2994b784328c3", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/6155239b488e95d26d1ebd95c6b4bb294d7f09db", + "reference": "6155239b488e95d26d1ebd95c6b4bb294d7f09db", "shasum": "" }, "require": { - "php": "^7.1|^8.0" + "php": "^7.4|^8.0" }, "conflict": { "phpstan/phpstan-shim": "*" @@ -529,11 +997,6 @@ "phpstan.phar" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.12-dev" - } - }, "autoload": { "files": [ "bootstrap.php" @@ -543,10 +1006,28 @@ "license": [ "MIT" ], + "authors": [ + { + "name": "Ondřej Mirtes" + }, + { + "name": "Markus Staab" + }, + { + "name": "Vincent Langlet" + } + ], "description": "PHPStan - PHP Static Analysis Tool", + "keywords": [ + "dev", + "static analysis" + ], "support": { + "docs": "https://phpstan.org/user-guide/getting-started", + "forum": "https://github.com/phpstan/phpstan/discussions", "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.100" + "security": "https://github.com/phpstan/phpstan/security/policy", + "source": "https://github.com/phpstan/phpstan-src" }, "funding": [ { @@ -556,54 +1037,48 @@ { "url": "https://github.com/phpstan", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan", - "type": "tidelift" } ], - "time": "2022-11-01T09:52:08+00:00" + "time": "2026-10-08T21:09:11+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.18", + "version": "12.5.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" + "reference": "7440368d94738d54f2c1de24dbd3871793bbb0dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/7440368d94738d54f2c1de24dbd3871793bbb0dd", + "reference": "7440368d94738d54f2c1de24dbd3871793bbb0dd", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.14", - "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" + "nikic/php-parser": "^5.9.0", + "php": ">=8.3", + "phpunit/php-text-template": "^5.0.1", + "sebastian/complexity": "^5.0", + "sebastian/environment": "^8.1.2", + "sebastian/lines-of-code": "^4.0.1", + "sebastian/version": "^6.0", + "theseer/tokenizer": "^2.0.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.5.37" }, "suggest": { - "ext-pcov": "*", - "ext-xdebug": "*" + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "12.5.x-dev" } }, "autoload": { @@ -631,40 +1106,53 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/12.5.8" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-code-coverage", + "type": "tidelift" } ], - "time": "2022-10-27T13:35:33+00:00" + "time": "2026-10-03T14:03:50+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "3.0.6", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/a248d1640ab059b075f53a2ef0f9856e864e06b5", + "reference": "a248d1640ab059b075f53a2ef0f9856e864e06b5", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.5.33" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -691,36 +1179,49 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + "security": "https://github.com/sebastianbergmann/php-file-iterator/security/policy", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/6.0.2" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-file-iterator", + "type": "tidelift" } ], - "time": "2021-12-02T12:48:52+00:00" + "time": "2026-08-25T14:40:53+00:00" }, { "name": "phpunit/php-invoker", - "version": "3.1.1", + "version": "6.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + "reference": "12b54e689b07a25a9b41e57736dfab6ec9ae5406" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/12b54e689b07a25a9b41e57736dfab6ec9ae5406", + "reference": "12b54e689b07a25a9b41e57736dfab6ec9ae5406", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { "ext-pcntl": "*", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "suggest": { "ext-pcntl": "*" @@ -728,7 +1229,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -750,129 +1251,12 @@ "description": "Invoke callables with a timeout", "homepage": "https://github.com/sebastianbergmann/php-invoker/", "keywords": [ - "process" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-09-28T05:58:55+00:00" - }, - { - "name": "phpunit/php-text-template", - "version": "2.0.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", - "keywords": [ - "template" - ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-10-26T05:33:50+00:00" - }, - { - "name": "phpunit/php-timer", - "version": "5.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", - "keywords": [ - "timer" + "process" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "security": "https://github.com/sebastianbergmann/php-invoker/security/policy", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/6.0.0" }, "funding": [ { @@ -880,68 +1264,35 @@ "type": "github" } ], - "time": "2020-10-26T13:16:10+00:00" + "time": "2025-02-07T04:58:58+00:00" }, { - "name": "phpunit/phpunit", - "version": "9.5.26", + "name": "phpunit/php-text-template", + "version": "5.0.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "babab73b7ef9fae406f2eb3ee11323a61caa63d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", - "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/babab73b7ef9fae406f2eb3ee11323a61caa63d5", + "reference": "babab73b7ef9fae406f2eb3ee11323a61caa63d5", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", - "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.13", - "phpunit/php-file-iterator": "^3.0.5", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", - "sebastian/version": "^3.0.2" + "php": ">=8.3" }, - "suggest": { - "ext-soap": "*", - "ext-xdebug": "*" + "require-dev": { + "phpunit/phpunit": "^12.5.37" }, - "bin": [ - "phpunit" - ], "type": "library", "extra": { "branch-alias": { - "dev-master": "9.5-dev" + "dev-main": "5.0-dev" } }, "autoload": { - "files": [ - "src/Framework/Assert/Functions.php" - ], "classmap": [ "src/" ] @@ -957,57 +1308,60 @@ "role": "lead" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ - "phpunit", - "testing", - "xunit" + "template" ], "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "security": "https://github.com/sebastianbergmann/php-text-template/security/policy", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/5.0.1" }, "funding": [ - { - "url": "https://phpunit.de/sponsors.html", - "type": "custom" - }, { "url": "https://github.com/sebastianbergmann", "type": "github" }, { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/php-text-template", "type": "tidelift" } ], - "time": "2022-10-28T06:00:21+00:00" + "time": "2026-10-03T04:51:29+00:00" }, { - "name": "sebastian/cli-parser", - "version": "1.0.1", + "name": "phpunit/php-timer", + "version": "8.0.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc", + "reference": "f258ce36aa457f3aa3339f9ed4c81fc66dc8c2cc", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "8.0-dev" } }, "autoload": { @@ -1026,11 +1380,15 @@ "role": "lead" } ], - "description": "Library for parsing CLI options", - "homepage": "https://github.com/sebastianbergmann/cli-parser", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], "support": { - "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "security": "https://github.com/sebastianbergmann/php-timer/security/policy", + "source": "https://github.com/sebastianbergmann/php-timer/tree/8.0.0" }, "funding": [ { @@ -1038,35 +1396,63 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2025-02-07T04:59:38+00:00" }, { - "name": "sebastian/code-unit", - "version": "1.0.8", + "name": "phpunit/phpunit", + "version": "12.5.40", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "76bd3198f16aeb375a4d5f3626471445aed0966e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", - "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/76bd3198f16aeb375a4d5f3626471445aed0966e", + "reference": "76bd3198f16aeb375a4d5f3626471445aed0966e", "shasum": "" }, "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.3" + "ext-dom": "*", + "ext-filter": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.14.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "php": ">=8.3", + "phpunit/php-code-coverage": "^12.5.8", + "phpunit/php-file-iterator": "^6.0.2", + "phpunit/php-invoker": "^6.0.0", + "phpunit/php-text-template": "^5.0.1", + "phpunit/php-timer": "^8.0.0", + "sebastian/cli-parser": "^4.2.1", + "sebastian/comparator": "^7.1.8", + "sebastian/diff": "^7.0.1", + "sebastian/environment": "^8.1.2", + "sebastian/exporter": "^7.0.3", + "sebastian/global-state": "^8.0.3", + "sebastian/object-enumerator": "^7.0.0", + "sebastian/recursion-context": "^7.0.1", + "sebastian/type": "^6.0.4", + "sebastian/version": "^6.0.1", + "staabm/side-effects-detector": "^1.0.5" }, + "bin": [ + "phpunit" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "12.5-dev" } }, "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], "classmap": [ "src/" ] @@ -1082,44 +1468,50 @@ "role": "lead" } ], - "description": "Collection of value objects that represent the PHP code units", - "homepage": "https://github.com/sebastianbergmann/code-unit", + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], "support": { - "issues": "https://github.com/sebastianbergmann/code-unit/issues", - "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/12.5.40" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", - "type": "github" + "url": "https://phpunit.de/sponsoring.html", + "type": "other" } ], - "time": "2020-10-26T13:08:54+00:00" + "time": "2026-10-16T05:55:07+00:00" }, { - "name": "sebastian/code-unit-reverse-lookup", - "version": "2.0.3", + "name": "sebastian/cli-parser", + "version": "4.2.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "7d05781b13f7dec9043a629a21d086ed74582a15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", - "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/7d05781b13f7dec9043a629a21d086ed74582a15", + "reference": "7d05781b13f7dec9043a629a21d086ed74582a15", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.5.25" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "4.2-dev" } }, "autoload": { @@ -1134,49 +1526,68 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Looks up which function or method a line of code belongs to", - "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "security": "https://github.com/sebastianbergmann/cli-parser/security/policy", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/4.2.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/cli-parser", + "type": "tidelift" } ], - "time": "2020-09-28T05:30:19+00:00" + "time": "2026-05-17T05:29:34+00:00" }, { "name": "sebastian/comparator", - "version": "4.0.8", + "version": "7.1.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + "reference": "7c65c1e79836812819705b473a90c12399542485" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", - "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/7c65c1e79836812819705b473a90c12399542485", + "reference": "7c65c1e79836812819705b473a90c12399542485", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/diff": "^4.0", - "sebastian/exporter": "^4.0" + "ext-dom": "*", + "ext-mbstring": "*", + "php": ">=8.3", + "sebastian/diff": "^7.0", + "sebastian/exporter": "^7.0.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.5.25" + }, + "suggest": { + "ext-bcmath": "For comparing BcMath\\Number objects" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.1-dev" } }, "autoload": { @@ -1215,41 +1626,54 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + "security": "https://github.com/sebastianbergmann/comparator/security/policy", + "source": "https://github.com/sebastianbergmann/comparator/tree/7.1.8" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" } ], - "time": "2022-09-14T12:41:17+00:00" + "time": "2026-05-21T04:45:25+00:00" }, { "name": "sebastian/complexity", - "version": "2.0.2", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + "reference": "bad4316aba5303d0221f43f8cee37eb58d384bbb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", - "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/bad4316aba5303d0221f43f8cee37eb58d384bbb", + "reference": "bad4316aba5303d0221f43f8cee37eb58d384bbb", "shasum": "" }, "require": { - "nikic/php-parser": "^4.7", - "php": ">=7.3" + "nikic/php-parser": "^5.0", + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -1272,7 +1696,8 @@ "homepage": "https://github.com/sebastianbergmann/complexity", "support": { "issues": "https://github.com/sebastianbergmann/complexity/issues", - "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + "security": "https://github.com/sebastianbergmann/complexity/security/policy", + "source": "https://github.com/sebastianbergmann/complexity/tree/5.0.0" }, "funding": [ { @@ -1280,33 +1705,33 @@ "type": "github" } ], - "time": "2020-10-26T15:52:27+00:00" + "time": "2025-02-07T04:55:25+00:00" }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "7.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6", + "reference": "cd4cabe39f8a4e8ee6818ba99f10a05561ea4ad6", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3", - "symfony/process": "^4.2 || ^5" + "phpunit/phpunit": "^12.5.33", + "symfony/process": "^7.4.17" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -1338,35 +1763,48 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + "security": "https://github.com/sebastianbergmann/diff/security/policy", + "source": "https://github.com/sebastianbergmann/diff/tree/7.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/diff", + "type": "tidelift" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2026-08-25T15:35:54+00:00" }, { "name": "sebastian/environment", - "version": "5.1.4", + "version": "8.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" + "reference": "9d32c685773823b1983e256ae4ecd48a10d6e439" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", - "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/9d32c685773823b1983e256ae4ecd48a10d6e439", + "reference": "9d32c685773823b1983e256ae4ecd48a10d6e439", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.5.26" }, "suggest": { "ext-posix": "*" @@ -1374,7 +1812,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.1-dev" + "dev-main": "8.1-dev" } }, "autoload": { @@ -1393,7 +1831,7 @@ } ], "description": "Provides functionality to handle HHVM/PHP environments", - "homepage": "http://www.github.com/sebastianbergmann/environment", + "homepage": "https://github.com/sebastianbergmann/environment", "keywords": [ "Xdebug", "environment", @@ -1401,42 +1839,55 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" + "security": "https://github.com/sebastianbergmann/environment/security/policy", + "source": "https://github.com/sebastianbergmann/environment/tree/8.1.2" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/environment", + "type": "tidelift" } ], - "time": "2022-04-03T09:37:03+00:00" + "time": "2026-05-25T13:40:20+00:00" }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "7.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23", + "reference": "c5e21b5de653ce0a769fb36f5cdfcb5e7a32cf23", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/recursion-context": "^4.0" + "ext-mbstring": "*", + "php": ">=8.3", + "sebastian/recursion-context": "^7.0.1" }, "require-dev": { - "ext-mbstring": "*", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.5.25" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -1478,46 +1929,56 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "security": "https://github.com/sebastianbergmann/exporter/security/policy", + "source": "https://github.com/sebastianbergmann/exporter/tree/7.0.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2026-05-20T04:37:17+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "8.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "b164d3274d6537ab462591c5755f76a8f5b1aae9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b164d3274d6537ab462591c5755f76a8f5b1aae9", + "reference": "b164d3274d6537ab462591c5755f76a8f5b1aae9", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" + "php": ">=8.3", + "sebastian/object-reflector": "^5.0", + "sebastian/recursion-context": "^7.0.1" }, "require-dev": { "ext-dom": "*", - "phpunit/phpunit": "^9.3" - }, - "suggest": { - "ext-uopz": "*" + "phpunit/phpunit": "^12.5.28" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0-dev" + "dev-main": "8.0-dev" } }, "autoload": { @@ -1536,47 +1997,60 @@ } ], "description": "Snapshotting of global state", - "homepage": "http://www.github.com/sebastianbergmann/global-state", + "homepage": "https://www.github.com/sebastianbergmann/global-state", "keywords": [ "global state" ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.5" + "security": "https://github.com/sebastianbergmann/global-state/security/policy", + "source": "https://github.com/sebastianbergmann/global-state/tree/8.0.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state", + "type": "tidelift" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2026-06-01T15:10:33+00:00" }, { "name": "sebastian/lines-of-code", - "version": "1.0.3", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + "reference": "d543b8ef219dcd8da262cbb958639a96bedba10e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", - "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/d543b8ef219dcd8da262cbb958639a96bedba10e", + "reference": "d543b8ef219dcd8da262cbb958639a96bedba10e", "shasum": "" }, "require": { - "nikic/php-parser": "^4.6", - "php": ">=7.3" + "nikic/php-parser": "^5.7.0", + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.5.25" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-main": "4.0-dev" } }, "autoload": { @@ -1599,42 +2073,55 @@ "homepage": "https://github.com/sebastianbergmann/lines-of-code", "support": { "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", - "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + "security": "https://github.com/sebastianbergmann/lines-of-code/security/policy", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/4.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/lines-of-code", + "type": "tidelift" } ], - "time": "2020-11-28T06:42:11+00:00" + "time": "2026-05-19T16:22:07+00:00" }, { "name": "sebastian/object-enumerator", - "version": "4.0.4", + "version": "7.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + "reference": "1effe8e9b8e068e9ae228e542d5d11b5d16db894" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", - "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1effe8e9b8e068e9ae228e542d5d11b5d16db894", + "reference": "1effe8e9b8e068e9ae228e542d5d11b5d16db894", "shasum": "" }, "require": { - "php": ">=7.3", - "sebastian/object-reflector": "^2.0", - "sebastian/recursion-context": "^4.0" + "php": ">=8.3", + "sebastian/object-reflector": "^5.0", + "sebastian/recursion-context": "^7.0" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -1656,7 +2143,8 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + "security": "https://github.com/sebastianbergmann/object-enumerator/security/policy", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/7.0.0" }, "funding": [ { @@ -1664,32 +2152,32 @@ "type": "github" } ], - "time": "2020-10-26T13:12:34+00:00" + "time": "2025-02-07T04:57:48+00:00" }, { "name": "sebastian/object-reflector", - "version": "2.0.4", + "version": "5.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" + "reference": "4bfa827c969c98be1e527abd576533293c634f6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", - "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/4bfa827c969c98be1e527abd576533293c634f6a", + "reference": "4bfa827c969c98be1e527abd576533293c634f6a", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-main": "5.0-dev" } }, "autoload": { @@ -1711,7 +2199,8 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + "security": "https://github.com/sebastianbergmann/object-reflector/security/policy", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/5.0.0" }, "funding": [ { @@ -1719,32 +2208,32 @@ "type": "github" } ], - "time": "2020-10-26T13:14:26+00:00" + "time": "2025-02-07T04:58:17+00:00" }, { "name": "sebastian/recursion-context", - "version": "4.0.4", + "version": "7.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" + "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", - "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/0b01998a7d5b1f122911a66bebcb8d46f0c82d8c", + "reference": "0b01998a7d5b1f122911a66bebcb8d46f0c82d8c", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^12.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-main": "7.0-dev" } }, "autoload": { @@ -1771,98 +2260,56 @@ } ], "description": "Provides functionality to recursively process PHP variables", - "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/7.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" - } - ], - "time": "2020-10-26T13:17:30+00:00" - }, - { - "name": "sebastian/resource-operations", - "version": "3.0.3", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "shasum": "" - }, - "require": { - "php": ">=7.3" - }, - "require-dev": { - "phpunit/phpunit": "^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ + }, { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Provides a list of PHP built-in functions that operate on resources", - "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" - }, - "funding": [ + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, { - "url": "https://github.com/sebastianbergmann", - "type": "github" + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2025-08-13T04:44:59+00:00" }, { "name": "sebastian/type", - "version": "3.2.0", + "version": "6.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" + "reference": "82ff822c2edc46724be9f7411d3163021f602773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", - "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/82ff822c2edc46724be9f7411d3163021f602773", + "reference": "82ff822c2edc46724be9f7411d3163021f602773", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "require-dev": { - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^12.5.25" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.2-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -1885,37 +2332,50 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" + "security": "https://github.com/sebastianbergmann/type/security/policy", + "source": "https://github.com/sebastianbergmann/type/tree/6.0.4" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/type", + "type": "tidelift" } ], - "time": "2022-09-12T14:47:03+00:00" + "time": "2026-05-20T06:45:45+00:00" }, { "name": "sebastian/version", - "version": "3.0.2", + "version": "6.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "c6c1022351a901512170118436c764e473f6de8c" + "reference": "9e935a16187e14f39b0e79910dabd614972cdb26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", - "reference": "c6c1022351a901512170118436c764e473f6de8c", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/9e935a16187e14f39b0e79910dabd614972cdb26", + "reference": "9e935a16187e14f39b0e79910dabd614972cdb26", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=8.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "6.0-dev" } }, "autoload": { @@ -1938,28 +2398,41 @@ "homepage": "https://github.com/sebastianbergmann/version", "support": { "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + "security": "https://github.com/sebastianbergmann/version/security/policy", + "source": "https://github.com/sebastianbergmann/version/tree/6.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/version", + "type": "tidelift" } ], - "time": "2020-09-28T06:39:44+00:00" + "time": "2026-10-04T05:50:08+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.7.1", + "version": "3.13.6", "source": { "type": "git", - "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619" + "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", + "reference": "4c378e1a528ea066890fc2397cbdd2f94eb2fc91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619", - "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/4c378e1a528ea066890fc2397cbdd2f94eb2fc91", + "reference": "4c378e1a528ea066890fc2397cbdd2f94eb2fc91", "shasum": "" }, "require": { @@ -1969,18 +2442,13 @@ "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0" + "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" }, "bin": [ - "bin/phpcs", - "bin/phpcbf" + "bin/phpcbf", + "bin/phpcs" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -1988,41 +2456,121 @@ "authors": [ { "name": "Greg Sherwood", - "role": "lead" + "role": "Former lead" + }, + { + "name": "Juliette Reinders Folmer", + "role": "Current lead" + }, + { + "name": "Contributors", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", - "homepage": "https://github.com/squizlabs/PHP_CodeSniffer", + "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", - "standards" + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues", + "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy", + "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer", + "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki" + }, + "funding": [ + { + "url": "https://github.com/PHPCSStandards", + "type": "github" + }, + { + "url": "https://github.com/jrfnl", + "type": "github" + }, + { + "url": "https://opencollective.com/php_codesniffer", + "type": "open_collective" + }, + { + "url": "https://thanks.dev/u/gh/phpcsstandards", + "type": "thanks_dev" + } + ], + "time": "2026-08-06T00:17:32+00:00" + }, + { + "name": "staabm/side-effects-detector", + "version": "1.0.5", + "source": { + "type": "git", + "url": "https://github.com/staabm/side-effects-detector.git", + "reference": "d8334211a140ce329c13726d4a715adbddd0a163" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/staabm/side-effects-detector/zipball/d8334211a140ce329c13726d4a715adbddd0a163", + "reference": "d8334211a140ce329c13726d4a715adbddd0a163", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/extension-installer": "^1.4.3", + "phpstan/phpstan": "^1.12.6", + "phpunit/phpunit": "^9.6.21", + "symfony/var-dumper": "^5.4.43", + "tomasvotruba/type-coverage": "1.0.0", + "tomasvotruba/unused-public": "1.0.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "lib/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A static analysis tool to detect side effects in PHP code", + "keywords": [ + "static analysis" ], "support": { - "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", - "source": "https://github.com/squizlabs/PHP_CodeSniffer", - "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + "issues": "https://github.com/staabm/side-effects-detector/issues", + "source": "https://github.com/staabm/side-effects-detector/tree/1.0.5" }, - "time": "2022-06-18T07:21:10+00:00" + "funding": [ + { + "url": "https://github.com/staabm", + "type": "github" + } + ], + "time": "2024-10-20T05:08:20+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/7989e43bf381af0eac72e4f0ca5bcbfa81658be4", + "reference": "7989e43bf381af0eac72e4f0ca5bcbfa81658be4", "shasum": "" }, "require": { "ext-dom": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": "^7.2 || ^8.0" + "php": "^8.1" }, "type": "library", "autoload": { @@ -2044,7 +2592,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/2.0.1" }, "funding": [ { @@ -2052,17 +2600,17 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2025-12-08T11:19:18+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.1" + "php": "^8.1" }, - "platform-dev": [], - "plugin-api-version": "2.3.0" + "platform-dev": {}, + "plugin-api-version": "2.9.0" } diff --git a/phpunit.xml b/phpunit.xml index b2de215..47ada4f 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -1,11 +1,15 @@ - - + + ./src - - - ./test - + + + + ./test + ./test/Renderer/AbstractRendererTest.php + ./test/InlineRenderer/AbstractInlineRendererTest.php + + diff --git a/src/CliExtension.php b/src/CliExtension.php index 5b9ebbe..1cd801d 100644 --- a/src/CliExtension.php +++ b/src/CliExtension.php @@ -19,27 +19,54 @@ use PhpSchool\CliMdRenderer\Renderer\ListItemRenderer; use PhpSchool\CliMdRenderer\Renderer\ParagraphRenderer; use Kadet\Highlighter\KeyLighter; -use League\CommonMark\Block\Element\Document; -use League\CommonMark\Block\Element\FencedCode; -use League\CommonMark\Block\Element\Heading; -use League\CommonMark\Block\Element\ListBlock; -use League\CommonMark\Block\Element\ListItem; -use League\CommonMark\Block\Element\Paragraph; -use League\CommonMark\Block\Element\ThematicBreak; -use League\CommonMark\Block\Parser as BlockParser; -use League\CommonMark\ConfigurableEnvironmentInterface; -use League\CommonMark\Extension\ExtensionInterface; -use League\CommonMark\Inline\Element\Code; -use League\CommonMark\Inline\Element\Emphasis; -use League\CommonMark\Inline\Element\Link; -use League\CommonMark\Inline\Element\Newline; -use League\CommonMark\Inline\Element\Strong; -use League\CommonMark\Inline\Element\Text; -use League\CommonMark\Inline\Parser as InlineParser; +use League\CommonMark\Environment\EnvironmentBuilderInterface; +use League\CommonMark\Extension\CommonMark\Node\Block\FencedCode; +use League\CommonMark\Extension\CommonMark\Node\Block\Heading; +use League\CommonMark\Extension\CommonMark\Node\Block\ListBlock; +use League\CommonMark\Extension\CommonMark\Node\Block\ListItem; +use League\CommonMark\Extension\CommonMark\Node\Block\ThematicBreak; +use League\CommonMark\Extension\CommonMark\Node\Inline\Code; +use League\CommonMark\Extension\CommonMark\Node\Inline\Emphasis; +use League\CommonMark\Extension\CommonMark\Node\Inline\Link; +use League\CommonMark\Extension\CommonMark\Node\Inline\Strong; +use League\CommonMark\Extension\CommonMark\Parser\Block as BlockParser; +use League\CommonMark\Extension\CommonMark\Parser\Inline as InlineParser; +use League\CommonMark\Extension\ConfigurableExtensionInterface; +use League\CommonMark\Node\Block\Document; +use League\CommonMark\Node\Block\Paragraph; +use League\CommonMark\Node\Inline\Newline; +use League\CommonMark\Node\Inline\Text; +use League\CommonMark\Parser\Inline\NewlineParser; +use League\Config\ConfigurationBuilderInterface; +use Nette\Schema\Expect; -class CliExtension implements ExtensionInterface +class CliExtension implements ConfigurableExtensionInterface { - public function register(ConfigurableEnvironmentInterface $environment): void + /** + * Take precedence over any HTML renderers registered by other extensions (e.g. the CommonMark core extension). + */ + private const RENDERER_PRIORITY = 10; + + public function configureSchema(ConfigurationBuilderInterface $builder): void + { + //required by the CommonMark list parser, identical to the schema of the CommonMark core extension + $builder->addSchema('commonmark', Expect::structure([ + 'use_asterisk' => Expect::bool(true), + 'use_underscore' => Expect::bool(true), + 'enable_strong' => Expect::bool(true), + 'enable_em' => Expect::bool(true), + 'unordered_list_markers' => Expect::listOf('string') + ->min(1) + ->default(['*', '+', '-']) + ->mergeDefaults(false), + ])); + + $builder->addSchema('renderer', Expect::structure([ + 'width' => Expect::int(30), + ])->otherItems(Expect::mixed())); + } + + public function register(EnvironmentBuilderInterface $environment): void { $codeRender = new FencedCodeRenderer(); $keyLighter = new KeyLighter(); @@ -47,17 +74,15 @@ public function register(ConfigurableEnvironmentInterface $environment): void $codeRender->addSyntaxHighlighter('php', new PhpHighlighter($keyLighter)); $environment - ->addBlockParser(new BlockParser\BlockQuoteParser(), 70) - ->addBlockParser(new BlockParser\ATXHeadingParser(), 60) - ->addBlockParser(new BlockParser\FencedCodeParser(), 50) - ->addBlockParser(new BlockParser\HtmlBlockParser(), 40) - ->addBlockParser(new BlockParser\SetExtHeadingParser(), 30) - ->addBlockParser(new BlockParser\ThematicBreakParser(), 20) - ->addBlockParser(new BlockParser\ListParser(), 10) - ->addBlockParser(new BlockParser\IndentedCodeParser(), -100) - ->addBlockParser(new BlockParser\LazyParagraphParser(), -200) + ->addBlockStartParser(new BlockParser\BlockQuoteStartParser(), 70) + ->addBlockStartParser(new BlockParser\HeadingStartParser(), 60) + ->addBlockStartParser(new BlockParser\FencedCodeStartParser(), 50) + ->addBlockStartParser(new BlockParser\HtmlBlockStartParser(), 40) + ->addBlockStartParser(new BlockParser\ThematicBreakStartParser(), 20) + ->addBlockStartParser(new BlockParser\ListBlockStartParser(), 10) + ->addBlockStartParser(new BlockParser\IndentedCodeStartParser(), -100) - ->addInlineParser(new InlineParser\NewlineParser(), 200) + ->addInlineParser(new NewlineParser(), 200) ->addInlineParser(new InlineParser\BacktickParser(), 150) ->addInlineParser(new InlineParser\EscapableParser(), 80) ->addInlineParser(new InlineParser\EntityParser(), 70) @@ -67,19 +92,19 @@ public function register(ConfigurableEnvironmentInterface $environment): void ->addInlineParser(new InlineParser\OpenBracketParser(), 20) ->addInlineParser(new InlineParser\BangParser(), 10) - ->addBlockRenderer(Document::class, new DocumentRenderer()) - ->addBlockRenderer(Heading::class, new HeaderRenderer()) - ->addBlockRenderer(ThematicBreak::class, new HorizontalRuleRenderer()) - ->addBlockRenderer(Paragraph::class, new ParagraphRenderer()) - ->addBlockRenderer(FencedCode::class, $codeRender) - ->addBlockRenderer(ListBlock::class, new ListBlockRenderer()) - ->addBlockRenderer(ListItem::class, new ListItemRenderer()) + ->addRenderer(Document::class, new DocumentRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(Heading::class, new HeaderRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(ThematicBreak::class, new HorizontalRuleRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(Paragraph::class, new ParagraphRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(FencedCode::class, $codeRender, self::RENDERER_PRIORITY) + ->addRenderer(ListBlock::class, new ListBlockRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(ListItem::class, new ListItemRenderer(), self::RENDERER_PRIORITY) - ->addInlineRenderer(Text::class, new TextRenderer()) - ->addInlineRenderer(Code::class, new CodeRenderer()) - ->addInlineRenderer(Emphasis::class, new EmphasisRenderer()) - ->addInlineRenderer(Strong::class, new StrongRenderer()) - ->addInlineRenderer(Newline::class, new NewlineRenderer()) - ->addInlineRenderer(Link::class, new LinkRenderer()); + ->addRenderer(Text::class, new TextRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(Code::class, new CodeRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(Emphasis::class, new EmphasisRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(Strong::class, new StrongRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(Newline::class, new NewlineRenderer(), self::RENDERER_PRIORITY) + ->addRenderer(Link::class, new LinkRenderer(), self::RENDERER_PRIORITY); } } diff --git a/src/CliRenderer.php b/src/CliRenderer.php index 14786be..c81b7e7 100644 --- a/src/CliRenderer.php +++ b/src/CliRenderer.php @@ -5,14 +5,15 @@ use PhpSchool\CliMdRenderer\InlineRenderer\CliInlineRendererInterface; use PhpSchool\CliMdRenderer\Renderer\CliBlockRendererInterface; use Colors\Color; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Renderer\BlockRendererInterface; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\EnvironmentInterface; -use League\CommonMark\Inline\Element\AbstractInline; +use League\CommonMark\Environment\EnvironmentInterface; +use League\CommonMark\Node\Block\AbstractBlock; +use League\CommonMark\Node\Inline\AbstractInline; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\Config\Exception\ConfigurationExceptionInterface; use RuntimeException; -class CliRenderer implements ElementRendererInterface +class CliRenderer implements ChildNodeRendererInterface { /** * @var EnvironmentInterface @@ -38,7 +39,11 @@ public function __construct(EnvironmentInterface $environment, Color $color) */ public function getOption(string $option, $default = null) { - return $this->environment->getConfig('renderer/' . $option, $default); + try { + return $this->environment->getConfiguration()->get('renderer/' . $option) ?? $default; + } catch (ConfigurationExceptionInterface $e) { + return $default; + } } /** @@ -58,12 +63,15 @@ public function style(string $string, $colourOrStyle): string return $this->color->__toString(); } - return $this->color->__invoke($string)->apply($colourOrStyle, $string); + /** @var string $styled colors.php is untyped, with a text argument it always returns a string */ + $styled = $this->color->apply($colourOrStyle, $string); + + return $styled; } - public function renderInline(AbstractInline $inline): string + public function renderInline(Node $inline): string { - $renderers = $this->environment->getInlineRenderersForClass(get_class($inline)); + $renderers = $this->environment->getRenderersForClass(get_class($inline)); foreach ($renderers as $renderer) { if (($result = $renderer->render($inline, $this)) !== null) { @@ -77,7 +85,7 @@ public function renderInline(AbstractInline $inline): string } /** - * @param AbstractInline[] $inlines + * @param iterable $inlines * * @return string */ @@ -88,7 +96,7 @@ public function renderInlines(iterable $inlines): string return implode( "", array_map( - function (AbstractInline $inline) { + function (Node $inline) { return $this->renderInline($inline); }, $inlines @@ -96,13 +104,12 @@ function (AbstractInline $inline) { ); } - public function renderBlock(AbstractBlock $block, bool $inTightList = false): string + public function renderBlock(Node $block): string { - $renderers = $this->environment->getBlockRenderersForClass(\get_class($block)); + $renderers = $this->environment->getRenderersForClass(get_class($block)); - /** @var BlockRendererInterface $renderer */ foreach ($renderers as $renderer) { - if (($result = $renderer->render($block, $this, $inTightList)) !== null) { + if (($result = $renderer->render($block, $this)) !== null) { return $result; } } @@ -113,22 +120,60 @@ public function renderBlock(AbstractBlock $block, bool $inTightList = false): st } /** - * @param AbstractBlock[] $blocks + * @param iterable $blocks * * @return string */ - public function renderBlocks(iterable $blocks, bool $inTightList = false): string + public function renderBlocks(iterable $blocks): string { $blocks = is_array($blocks) ? $blocks : iterator_to_array($blocks); return implode( "\n", array_map( - function (AbstractBlock $block) { + function (Node $block) { return $this->renderBlock($block); }, $blocks ) ); } + + /** + * Renders a list of nodes. Block nodes are separated by a newline, inline nodes are concatenated. + * + * @param iterable $nodes + */ + public function renderNodes(iterable $nodes): string + { + $output = ''; + $previous = null; + + foreach ($nodes as $node) { + if ($node instanceof AbstractBlock) { + $output .= ($previous instanceof AbstractBlock ? $this->getBlockSeparator() : '') . + $this->renderBlock($node); + } elseif ($node instanceof AbstractInline) { + $output .= $this->renderInline($node); + } else { + throw new RuntimeException( + sprintf('Unable to find corresponding renderer for node type: "%s"', get_class($node)) + ); + } + + $previous = $node; + } + + return $output; + } + + public function getBlockSeparator(): string + { + return "\n"; + } + + public function getInnerSeparator(): string + { + return "\n"; + } } diff --git a/src/CliRendererFactory.php b/src/CliRendererFactory.php index 39a3074..5e43df1 100644 --- a/src/CliRendererFactory.php +++ b/src/CliRendererFactory.php @@ -3,12 +3,12 @@ namespace PhpSchool\CliMdRenderer; use Colors\Color; -use League\CommonMark\Environment; +use League\CommonMark\Environment\Environment; class CliRendererFactory { /** - * @param array $environmentConfig + * @param array $environmentConfig * @return CliRenderer */ public function __invoke(array $environmentConfig = []): CliRenderer diff --git a/src/Highlighter/PhpHighlighter.php b/src/Highlighter/PhpHighlighter.php index 063309a..e2d9037 100644 --- a/src/Highlighter/PhpHighlighter.php +++ b/src/Highlighter/PhpHighlighter.php @@ -21,6 +21,9 @@ public function __construct(KeyLighter $keyLighter) public function highlight(string $code): string { - return $this->keyLighter->highlight($code, new Php(), new CliFormatter()); + /** @var string $highlighted KeyLighter is untyped, the CLI formatter returns a string */ + $highlighted = $this->keyLighter->highlight($code, new Php(), new CliFormatter()); + + return $highlighted; } } diff --git a/src/InlineRenderer/CliInlineRendererInterface.php b/src/InlineRenderer/CliInlineRendererInterface.php index 8b19443..e324c6f 100644 --- a/src/InlineRenderer/CliInlineRendererInterface.php +++ b/src/InlineRenderer/CliInlineRendererInterface.php @@ -2,11 +2,11 @@ namespace PhpSchool\CliMdRenderer\InlineRenderer; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Element\AbstractInline; -use League\CommonMark\Inline\Renderer\InlineRendererInterface; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\CommonMark\Renderer\NodeRendererInterface; -interface CliInlineRendererInterface extends InlineRendererInterface +interface CliInlineRendererInterface extends NodeRendererInterface { - public function render(AbstractInline $inline, ElementRendererInterface $htmlRenderer): string; + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string; } diff --git a/src/InlineRenderer/CodeRenderer.php b/src/InlineRenderer/CodeRenderer.php index f5182cc..3f7b41e 100644 --- a/src/InlineRenderer/CodeRenderer.php +++ b/src/InlineRenderer/CodeRenderer.php @@ -3,22 +3,22 @@ namespace PhpSchool\CliMdRenderer\InlineRenderer; use PhpSchool\CliMdRenderer\CliRenderer; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Element\AbstractInline; -use League\CommonMark\Inline\Element\Code; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\CommonMark\Extension\CommonMark\Node\Inline\Code; class CodeRenderer implements CliInlineRendererInterface { - public function render(AbstractInline $inline, ElementRendererInterface $renderer): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($inline instanceof Code)) { - throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($inline))); + if (!($node instanceof Code)) { + throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($node))); } - return $renderer->style($inline->getContent(), 'yellow'); + return $childRenderer->style($node->getLiteral(), 'yellow'); } } diff --git a/src/InlineRenderer/EmphasisRenderer.php b/src/InlineRenderer/EmphasisRenderer.php index a2e4f89..a6a1444 100644 --- a/src/InlineRenderer/EmphasisRenderer.php +++ b/src/InlineRenderer/EmphasisRenderer.php @@ -2,23 +2,23 @@ namespace PhpSchool\CliMdRenderer\InlineRenderer; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Element\AbstractInline; -use League\CommonMark\Inline\Element\Emphasis; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\CommonMark\Extension\CommonMark\Node\Inline\Emphasis; use PhpSchool\CliMdRenderer\CliRenderer; class EmphasisRenderer implements CliInlineRendererInterface { - public function render(AbstractInline $inline, ElementRendererInterface $renderer): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($inline instanceof Emphasis)) { - throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($inline))); + if (!($node instanceof Emphasis)) { + throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($node))); } - return $renderer->style($renderer->renderInlines($inline->children()), 'italic'); + return $childRenderer->style($childRenderer->renderInlines($node->children()), 'italic'); } } diff --git a/src/InlineRenderer/LinkRenderer.php b/src/InlineRenderer/LinkRenderer.php index 8776435..de7b380 100644 --- a/src/InlineRenderer/LinkRenderer.php +++ b/src/InlineRenderer/LinkRenderer.php @@ -2,23 +2,26 @@ namespace PhpSchool\CliMdRenderer\InlineRenderer; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Element\AbstractInline; -use League\CommonMark\Inline\Element\Link; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\CommonMark\Extension\CommonMark\Node\Inline\Link; use PhpSchool\CliMdRenderer\CliRenderer; class LinkRenderer implements CliInlineRendererInterface { - public function render(AbstractInline $inline, ElementRendererInterface $renderer): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($inline instanceof Link)) { - throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($inline))); + if (!($node instanceof Link)) { + throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($node))); } - return $renderer->style($renderer->renderInlines($inline->children()), ['underline', 'bold', 'light_blue']); + return $childRenderer->style( + $childRenderer->renderInlines($node->children()), + ['underline', 'bold', 'light_blue'] + ); } } diff --git a/src/InlineRenderer/NewlineRenderer.php b/src/InlineRenderer/NewlineRenderer.php index 9feb95c..d857201 100644 --- a/src/InlineRenderer/NewlineRenderer.php +++ b/src/InlineRenderer/NewlineRenderer.php @@ -2,21 +2,21 @@ namespace PhpSchool\CliMdRenderer\InlineRenderer; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Element\AbstractInline; -use League\CommonMark\Inline\Element\Newline; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\CommonMark\Node\Inline\Newline; use PhpSchool\CliMdRenderer\CliRenderer; class NewlineRenderer implements CliInlineRendererInterface { - public function render(AbstractInline $inline, ElementRendererInterface $renderer): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($inline instanceof Newline)) { - throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($inline))); + if (!($node instanceof Newline)) { + throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($node))); } return "\n"; diff --git a/src/InlineRenderer/StrongRenderer.php b/src/InlineRenderer/StrongRenderer.php index 6a5c7de..17c2b8d 100644 --- a/src/InlineRenderer/StrongRenderer.php +++ b/src/InlineRenderer/StrongRenderer.php @@ -2,23 +2,23 @@ namespace PhpSchool\CliMdRenderer\InlineRenderer; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Element\AbstractInline; -use League\CommonMark\Inline\Element\Strong; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\CommonMark\Extension\CommonMark\Node\Inline\Strong; use PhpSchool\CliMdRenderer\CliRenderer; class StrongRenderer implements CliInlineRendererInterface { - public function render(AbstractInline $inline, ElementRendererInterface $renderer): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($inline instanceof Strong)) { - throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($inline))); + if (!($node instanceof Strong)) { + throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($node))); } - return $renderer->style($renderer->renderInlines($inline->children()), 'bold'); + return $childRenderer->style($childRenderer->renderInlines($node->children()), 'bold'); } } diff --git a/src/InlineRenderer/TextRenderer.php b/src/InlineRenderer/TextRenderer.php index 11c23ba..6cd3af0 100644 --- a/src/InlineRenderer/TextRenderer.php +++ b/src/InlineRenderer/TextRenderer.php @@ -2,23 +2,23 @@ namespace PhpSchool\CliMdRenderer\InlineRenderer; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Element\AbstractInline; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\CommonMark\Node\Inline\Text; use PhpSchool\CliMdRenderer\CliRenderer; class TextRenderer implements CliInlineRendererInterface { - public function render(AbstractInline $inline, ElementRendererInterface $renderer): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($inline instanceof Text)) { - throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($inline))); + if (!($node instanceof Text)) { + throw new \InvalidArgumentException(sprintf('Incompatible inline type: "%s"', get_class($node))); } - return $inline->getContent(); + return $node->getLiteral(); } } diff --git a/src/Renderer/CliBlockRendererInterface.php b/src/Renderer/CliBlockRendererInterface.php index a8578db..2a78da0 100644 --- a/src/Renderer/CliBlockRendererInterface.php +++ b/src/Renderer/CliBlockRendererInterface.php @@ -2,15 +2,11 @@ namespace PhpSchool\CliMdRenderer\Renderer; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Renderer\BlockRendererInterface; -use League\CommonMark\ElementRendererInterface; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; +use League\CommonMark\Renderer\NodeRendererInterface; -interface CliBlockRendererInterface extends BlockRendererInterface +interface CliBlockRendererInterface extends NodeRendererInterface { - public function render( - AbstractBlock $block, - ElementRendererInterface $htmlRenderer, - bool $inTightList = false - ): string; + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string; } diff --git a/src/Renderer/DocumentRenderer.php b/src/Renderer/DocumentRenderer.php index 17b2d26..d7e277f 100644 --- a/src/Renderer/DocumentRenderer.php +++ b/src/Renderer/DocumentRenderer.php @@ -2,26 +2,24 @@ namespace PhpSchool\CliMdRenderer\Renderer; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Element\Document; -use League\CommonMark\ElementRendererInterface; +use League\CommonMark\Node\Block\Document; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; use PhpSchool\CliMdRenderer\CliRenderer; class DocumentRenderer implements CliBlockRendererInterface { - public function render(AbstractBlock $block, ElementRendererInterface $renderer, bool $inTightList = false): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($block instanceof Document)) { - throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($block))); + if (!($node instanceof Document)) { + throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($node))); } - /** @var array $nodes */ - $nodes = $block->children(); - $wholeDoc = $renderer->renderBlocks($nodes); + $wholeDoc = $childRenderer->renderBlocks($node->children()); return $wholeDoc === '' ? '' : $wholeDoc . "\n"; } } diff --git a/src/Renderer/FencedCodeRenderer.php b/src/Renderer/FencedCodeRenderer.php index cd49117..515c1de 100644 --- a/src/Renderer/FencedCodeRenderer.php +++ b/src/Renderer/FencedCodeRenderer.php @@ -3,14 +3,12 @@ namespace PhpSchool\CliMdRenderer\Renderer; use PhpSchool\CliMdRenderer\SyntaxHighlighterInterface; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Element\FencedCode; +use League\CommonMark\Extension\CommonMark\Node\Block\FencedCode; use PhpSchool\CliMdRenderer\CliRenderer; -use League\CommonMark\Block\Renderer\BlockRendererInterface; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Renderer\InlineRendererInterface; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; -class FencedCodeRenderer implements BlockRendererInterface +class FencedCodeRenderer implements CliBlockRendererInterface { /** * @var array @@ -40,28 +38,28 @@ public function getSyntaxHighlighters(): array return $this->highlighters; } - public function render(AbstractBlock $block, ElementRendererInterface $renderer, bool $inTightList = false): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($block instanceof FencedCode)) { - throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($block))); + if (!($node instanceof FencedCode)) { + throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($node))); } - $infoWords = $block->getInfoWords(); + $infoWords = $node->getInfoWords(); $codeType = null; if (count($infoWords) !== 0 && strlen($infoWords[0]) !== 0) { $codeType = $infoWords[0]; } if (null === $codeType || !isset($this->highlighters[$codeType])) { - return $this->indent($renderer->style($block->getStringContent(), 'yellow')); + return $this->indent($childRenderer->style($node->getLiteral(), 'yellow')); } return $this->indent( - sprintf("%s\n", $this->highlighters[$codeType]->highlight($block->getStringContent())) + sprintf("%s\n", $this->highlighters[$codeType]->highlight($node->getLiteral())) ); } diff --git a/src/Renderer/HeaderRenderer.php b/src/Renderer/HeaderRenderer.php index e8b2424..03a62f6 100644 --- a/src/Renderer/HeaderRenderer.php +++ b/src/Renderer/HeaderRenderer.php @@ -2,32 +2,30 @@ namespace PhpSchool\CliMdRenderer\Renderer; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Element\Heading; +use League\CommonMark\Extension\CommonMark\Node\Block\Heading; use PhpSchool\CliMdRenderer\CliRenderer; -use League\CommonMark\Block\Renderer\BlockRendererInterface; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Renderer\InlineRendererInterface; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; -class HeaderRenderer implements BlockRendererInterface +class HeaderRenderer implements CliBlockRendererInterface { - public function render(AbstractBlock $block, ElementRendererInterface $renderer, bool $inTightList = false): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($block instanceof Heading)) { - throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($block))); + if (!($node instanceof Heading)) { + throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($node))); } - $level = $block->getLevel(); - $text = $renderer->renderInlines($block->children()); + $level = $node->getLevel(); + $text = $childRenderer->renderInlines($node->children()); return sprintf( "\n%s %s\n", - $renderer->style(str_repeat('#', $level), 'dark_gray'), - $renderer->style($text, ['bold', 'cyan']) + $childRenderer->style(str_repeat('#', $level), 'dark_gray'), + $childRenderer->style($text, ['bold', 'cyan']) ); } } diff --git a/src/Renderer/HorizontalRuleRenderer.php b/src/Renderer/HorizontalRuleRenderer.php index a153874..95a43c4 100644 --- a/src/Renderer/HorizontalRuleRenderer.php +++ b/src/Renderer/HorizontalRuleRenderer.php @@ -2,27 +2,26 @@ namespace PhpSchool\CliMdRenderer\Renderer; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Element\ThematicBreak; +use League\CommonMark\Extension\CommonMark\Node\Block\ThematicBreak; use PhpSchool\CliMdRenderer\CliRenderer; -use League\CommonMark\Block\Renderer\BlockRendererInterface; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Renderer\InlineRendererInterface; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; -class HorizontalRuleRenderer implements BlockRendererInterface +class HorizontalRuleRenderer implements CliBlockRendererInterface { - public function render(AbstractBlock $block, ElementRendererInterface $renderer, bool $inTightList = false): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - $width = $renderer->getOption('width', 30); + /** @var int $width validated as an int by the schema registered in CliExtension */ + $width = $childRenderer->getOption('width', 30); - if (!($block instanceof ThematicBreak)) { - throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($block))); + if (!($node instanceof ThematicBreak)) { + throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($node))); } - return $renderer->style(str_repeat('-', $width), 'dark_gray'); + return $childRenderer->style(str_repeat('-', $width), 'dark_gray'); } } diff --git a/src/Renderer/ListBlockRenderer.php b/src/Renderer/ListBlockRenderer.php index 972f017..b98772c 100644 --- a/src/Renderer/ListBlockRenderer.php +++ b/src/Renderer/ListBlockRenderer.php @@ -2,24 +2,23 @@ namespace PhpSchool\CliMdRenderer\Renderer; -use League\CommonMark\Block\Element\AbstractBlock; use PhpSchool\CliMdRenderer\CliRenderer; -use League\CommonMark\Block\Element\ListBlock; -use League\CommonMark\Block\Renderer\BlockRendererInterface; -use League\CommonMark\ElementRendererInterface; +use League\CommonMark\Extension\CommonMark\Node\Block\ListBlock; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; -class ListBlockRenderer implements BlockRendererInterface +class ListBlockRenderer implements CliBlockRendererInterface { - public function render(AbstractBlock $block, ElementRendererInterface $renderer, bool $inTightList = false): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($block instanceof ListBlock)) { - throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($block))); + if (!($node instanceof ListBlock)) { + throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($node))); } - return $renderer->renderBlocks($block->children()); + return $childRenderer->renderBlocks($node->children()); } } diff --git a/src/Renderer/ListItemRenderer.php b/src/Renderer/ListItemRenderer.php index 74e676c..d88754b 100644 --- a/src/Renderer/ListItemRenderer.php +++ b/src/Renderer/ListItemRenderer.php @@ -2,25 +2,23 @@ namespace PhpSchool\CliMdRenderer\Renderer; -use League\CommonMark\Block\Element\AbstractBlock; use PhpSchool\CliMdRenderer\CliRenderer; -use League\CommonMark\Block\Element\ListItem; -use League\CommonMark\Block\Renderer\BlockRendererInterface; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Renderer\InlineRendererInterface; +use League\CommonMark\Extension\CommonMark\Node\Block\ListItem; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; -class ListItemRenderer implements BlockRendererInterface +class ListItemRenderer implements CliBlockRendererInterface { - public function render(AbstractBlock $block, ElementRendererInterface $renderer, bool $inTightList = false): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($block instanceof ListItem)) { - throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($block))); + if (!($node instanceof ListItem)) { + throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($node))); } - return $renderer->style(' * ', 'yellow') . $renderer->renderBlocks($block->children()); + return $childRenderer->style(' * ', 'yellow') . $childRenderer->renderBlocks($node->children()); } } diff --git a/src/Renderer/ParagraphRenderer.php b/src/Renderer/ParagraphRenderer.php index b3a5627..7a312a7 100644 --- a/src/Renderer/ParagraphRenderer.php +++ b/src/Renderer/ParagraphRenderer.php @@ -2,25 +2,23 @@ namespace PhpSchool\CliMdRenderer\Renderer; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Element\Paragraph; +use League\CommonMark\Node\Block\Paragraph; use PhpSchool\CliMdRenderer\CliRenderer; -use League\CommonMark\Block\Renderer\BlockRendererInterface; -use League\CommonMark\ElementRendererInterface; -use League\CommonMark\Inline\Renderer\InlineRendererInterface; +use League\CommonMark\Node\Node; +use League\CommonMark\Renderer\ChildNodeRendererInterface; -class ParagraphRenderer implements BlockRendererInterface +class ParagraphRenderer implements CliBlockRendererInterface { - public function render(AbstractBlock $block, ElementRendererInterface $renderer, bool $inTightList = false): string + public function render(Node $node, ChildNodeRendererInterface $childRenderer): string { - if (!($renderer instanceof CliRenderer)) { - throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($renderer))); + if (!($childRenderer instanceof CliRenderer)) { + throw new \InvalidArgumentException(sprintf('Incompatible renderer type: "%s"', get_class($childRenderer))); } - if (!($block instanceof Paragraph)) { - throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($block))); + if (!($node instanceof Paragraph)) { + throw new \InvalidArgumentException(sprintf('Incompatible block type: "%s"', get_class($node))); } - return $renderer->renderInlines($block->children()) . "\n"; + return $childRenderer->renderInlines($node->children()) . "\n"; } } diff --git a/test/CliExtensionTest.php b/test/CliExtensionTest.php index 694102b..1132399 100644 --- a/test/CliExtensionTest.php +++ b/test/CliExtensionTest.php @@ -20,39 +20,38 @@ use PhpSchool\CliMdRenderer\Renderer\ListBlockRenderer; use PhpSchool\CliMdRenderer\Renderer\ListItemRenderer; use PhpSchool\CliMdRenderer\Renderer\ParagraphRenderer; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Element\Document; -use League\CommonMark\Block\Element\FencedCode; -use League\CommonMark\Block\Element\Heading; -use League\CommonMark\Block\Element\ListBlock; -use League\CommonMark\Block\Element\ListItem; -use League\CommonMark\Block\Element\Paragraph; -use League\CommonMark\Block\Element\ThematicBreak; -use League\CommonMark\Block\Parser\ATXHeadingParser; -use League\CommonMark\Block\Parser\BlockQuoteParser; -use League\CommonMark\Block\Parser\FencedCodeParser; -use League\CommonMark\Block\Parser\HtmlBlockParser; -use League\CommonMark\Block\Parser\IndentedCodeParser; -use League\CommonMark\Block\Parser\LazyParagraphParser; -use League\CommonMark\Block\Parser\ListParser; -use League\CommonMark\Block\Parser\SetExtHeadingParser; -use League\CommonMark\Block\Parser\ThematicBreakParser; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Code; -use League\CommonMark\Inline\Element\Emphasis; -use League\CommonMark\Inline\Element\Link; -use League\CommonMark\Inline\Element\Newline; -use League\CommonMark\Inline\Element\Strong; -use League\CommonMark\Inline\Element\Text; -use League\CommonMark\Inline\Parser\AutolinkParser; -use League\CommonMark\Inline\Parser\BacktickParser; -use League\CommonMark\Inline\Parser\BangParser; -use League\CommonMark\Inline\Parser\CloseBracketParser; -use League\CommonMark\Inline\Parser\EntityParser; -use League\CommonMark\Inline\Parser\EscapableParser; -use League\CommonMark\Inline\Parser\HtmlInlineParser; -use League\CommonMark\Inline\Parser\NewlineParser; -use League\CommonMark\Inline\Parser\OpenBracketParser; +use League\CommonMark\Node\Block\Document; +use League\CommonMark\Extension\CommonMark\Node\Block\FencedCode; +use League\CommonMark\Extension\CommonMark\Node\Block\Heading; +use League\CommonMark\Extension\CommonMark\Node\Block\ListBlock; +use League\CommonMark\Extension\CommonMark\Node\Block\ListItem; +use League\CommonMark\Node\Block\Paragraph; +use League\CommonMark\Extension\CommonMark\Node\Block\ThematicBreak; +use League\CommonMark\Extension\CommonMark\Parser\Block\HeadingStartParser; +use League\CommonMark\Extension\CommonMark\Parser\Block\BlockQuoteStartParser; +use League\CommonMark\Extension\CommonMark\Parser\Block\FencedCodeStartParser; +use League\CommonMark\Extension\CommonMark\Parser\Block\HtmlBlockStartParser; +use League\CommonMark\Extension\CommonMark\Parser\Block\IndentedCodeStartParser; +use League\CommonMark\Extension\CommonMark\Parser\Block\ListBlockStartParser; +use League\CommonMark\Parser\Block\SkipLinesStartingWithLettersParser; +use League\CommonMark\Extension\CommonMark\Parser\Block\ThematicBreakStartParser; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\Node\Inline\Code; +use League\CommonMark\Extension\CommonMark\Node\Inline\Emphasis; +use League\CommonMark\Extension\CommonMark\Node\Inline\Link; +use League\CommonMark\Node\Inline\Newline; +use League\CommonMark\Extension\CommonMark\Node\Inline\Strong; +use League\CommonMark\Node\Inline\Text; +use League\CommonMark\Extension\CommonMark\Parser\Inline\AutolinkParser; +use League\CommonMark\Extension\CommonMark\Parser\Inline\BacktickParser; +use League\CommonMark\Extension\CommonMark\Parser\Inline\BangParser; +use League\CommonMark\Extension\CommonMark\Parser\Inline\CloseBracketParser; +use League\CommonMark\Extension\CommonMark\Parser\Inline\EntityParser; +use League\CommonMark\Extension\CommonMark\Parser\Inline\EscapableParser; +use League\CommonMark\Extension\CommonMark\Parser\Inline\HtmlInlineParser; +use League\CommonMark\Parser\Inline\NewlineParser; +use League\CommonMark\Extension\CommonMark\Parser\Inline\OpenBracketParser; +use League\CommonMark\Node\Node; use PHPUnit\Framework\TestCase; class CliExtensionTest extends TestCase @@ -76,21 +75,20 @@ public function testExtensionConfiguresEnvironment(): void $this->assertInlineRenderer($environment, Newline::class, NewlineRenderer::class); $this->assertInlineRenderer($environment, Link::class, LinkRenderer::class); - $blockParsers = array_map('get_class', iterator_to_array($environment->getBlockParsers())); + $blockParsers = array_map('get_class', iterator_to_array($environment->getBlockStartParsers())); self::assertSame([ - BlockQuoteParser::class, - ATXHeadingParser::class, - FencedCodeParser::class, - HtmlBlockParser::class, - SetExtHeadingParser::class, - ThematicBreakParser::class, - ListParser::class, - IndentedCodeParser::class, - LazyParagraphParser::class, + SkipLinesStartingWithLettersParser::class, + BlockQuoteStartParser::class, + HeadingStartParser::class, + FencedCodeStartParser::class, + HtmlBlockStartParser::class, + ThematicBreakStartParser::class, + ListBlockStartParser::class, + IndentedCodeStartParser::class, ], $blockParsers); - $characters = ["\n", '`', '\\', '&', '<', '[', ']', '!']; - $expectedParsers = [ + $inlineParsers = array_map('get_class', iterator_to_array($environment->getInlineParsers())); + self::assertSame([ NewlineParser::class, BacktickParser::class, EscapableParser::class, @@ -100,43 +98,40 @@ public function testExtensionConfiguresEnvironment(): void CloseBracketParser::class, OpenBracketParser::class, BangParser::class, - ]; - foreach ($characters as $character) { - $inlineParsers = array_map( - 'get_class', - iterator_to_array($environment->getInlineParsersForCharacter($character)) - ); - foreach ($inlineParsers as $inlineParser) { - self::assertContains($inlineParser, $expectedParsers); - } - } + ], $inlineParsers); } /** * @param Environment $environment - * @param class-string $blockClass + * @param class-string $blockClass * @param class-string $rendererClass * @return void */ private function assertBlockRenderer(Environment $environment, string $blockClass, string $rendererClass): void { - $classes = $environment->getBlockRenderersForClass($blockClass); - $classes = $classes instanceof \Traversable ? iterator_to_array($classes) : $classes; - $classes = array_map('get_class', $classes); - self::assertSame([$rendererClass], $classes); + $this->assertRenderer($environment, $blockClass, $rendererClass); } /** * @param Environment $environment - * @param class-string $blockClass + * @param class-string $nodeClass * @param class-string $rendererClass * @return void */ - private function assertInlineRenderer(Environment $environment, string $blockClass, string $rendererClass): void + private function assertInlineRenderer(Environment $environment, string $nodeClass, string $rendererClass): void + { + $this->assertRenderer($environment, $nodeClass, $rendererClass); + } + + /** + * Our renderer must be the first one tried, the CommonMark HTML renderers are only fallbacks. + * + * @param class-string $nodeClass + * @param class-string $rendererClass + */ + private function assertRenderer(Environment $environment, string $nodeClass, string $rendererClass): void { - $classes = $environment->getInlineRenderersForClass($blockClass); - $classes = $classes instanceof \Traversable ? iterator_to_array($classes) : $classes; - $classes = array_map('get_class', $classes); - self::assertSame([$rendererClass], $classes); + $classes = array_map('get_class', iterator_to_array($environment->getRenderersForClass($nodeClass), false)); + self::assertSame($rendererClass, $classes[0]); } } diff --git a/test/CliRendererTest.php b/test/CliRendererTest.php index 53dccc0..3e7bd4c 100644 --- a/test/CliRendererTest.php +++ b/test/CliRendererTest.php @@ -6,9 +6,9 @@ use PhpSchool\CliMdRenderer\InlineRenderer\CliInlineRendererInterface; use PhpSchool\CliMdRenderer\Renderer\CliBlockRendererInterface; use Colors\Color; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\AbstractInline; +use League\CommonMark\Node\Block\AbstractBlock; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Node\Inline\AbstractInline; use PHPUnit\Framework\TestCase; use RuntimeException; @@ -16,7 +16,7 @@ class CliRendererTest extends TestCase { public function testRenderBlockThrowsExceptionIfNoRenderer(): void { - $block = $this->createMock(AbstractBlock::class); + $block = $this->createStub(AbstractBlock::class); $this->expectException(RuntimeException::class); $this->expectExceptionMessage( @@ -29,49 +29,49 @@ public function testRenderBlockThrowsExceptionIfNoRenderer(): void public function testRenderBlock(): void { - $block = $this->createMock(AbstractBlock::class); + $block = $this->createStub(AbstractBlock::class); $class = get_class($block); $blockRenderer = $this->createMock(CliBlockRendererInterface::class); $environment = new Environment(); - $environment->addBlockRenderer($class, $blockRenderer); + $environment->addRenderer($class, $blockRenderer); $renderer = new CliRenderer($environment, new Color()); $blockRenderer ->expects($this->once()) ->method('render') - ->with($block, $renderer); + ->with($block, $renderer) + ->willReturn('block'); $renderer->renderBlock($block); } public function testRenderBlocks(): void { - $block1 = $this->createMock(AbstractBlock::class); - $block2 = $this->createMock(AbstractBlock::class); + $block1 = $this->createStub(AbstractBlock::class); + $block2 = $this->createStub(AbstractBlock::class); $blockRenderer = $this->createMock(CliBlockRendererInterface::class); $environment = new Environment(); $environment - ->addBlockRenderer(get_class($block1), $blockRenderer) - ->addBlockRenderer(get_class($block2), $blockRenderer); + ->addRenderer(get_class($block1), $blockRenderer) + ->addRenderer(get_class($block2), $blockRenderer); $renderer = new CliRenderer($environment, new Color()); $blockRenderer ->expects($this->exactly(2)) ->method('render') - ->withConsecutive([$block1, $renderer], [$block2, $renderer]) - ->willReturnOnConsecutiveCalls( - 'block1', - 'block2' - ); + ->willReturnMap([ + [$block1, $renderer, 'block1'], + [$block2, $renderer, 'block2'], + ]); - $renderer->renderBlocks([$block1, $block2]); + $this->assertSame("block1\nblock2", $renderer->renderBlocks([$block1, $block2])); } public function testRenderInlineBlocksThrowsExceptionIfNoRenderer(): void { - $block = $this->createMock(AbstractInline::class); + $block = $this->createStub(AbstractInline::class); $this->expectException(RuntimeException::class); $this->expectExceptionMessage( @@ -84,25 +84,24 @@ public function testRenderInlineBlocksThrowsExceptionIfNoRenderer(): void public function testRenderInlineBlocks(): void { - $block1 = $this->createMock(AbstractInline::class); - $block2 = $this->createMock(AbstractInline::class); + $block1 = $this->createStub(AbstractInline::class); + $block2 = $this->createStub(AbstractInline::class); $inlineRenderer = $this->createMock(CliInlineRendererInterface::class); $environment = new Environment(); $environment - ->addInlineRenderer(get_class($block1), $inlineRenderer) - ->addInlineRenderer(get_class($block2), $inlineRenderer); + ->addRenderer(get_class($block1), $inlineRenderer) + ->addRenderer(get_class($block2), $inlineRenderer); $renderer = new CliRenderer($environment, new Color()); $inlineRenderer ->expects($this->exactly(2)) ->method('render') - ->withConsecutive([$block1, $renderer], [$block2, $renderer]) - ->willReturnOnConsecutiveCalls( - 'inline1', - 'inline2' - ); + ->willReturnMap([ + [$block1, $renderer, 'inline1'], + [$block2, $renderer, 'inline2'], + ]); $this->assertEquals('inline1inline2', $renderer->renderInlines([$block1, $block2])); } diff --git a/test/E2ETest.php b/test/E2ETest.php index e12c2dc..bfd9694 100644 --- a/test/E2ETest.php +++ b/test/E2ETest.php @@ -3,20 +3,22 @@ namespace PhpSchool\CliMdRendererTest; use PhpSchool\CliMdRenderer\CliRendererFactory; -use League\CommonMark\DocParser; -use League\CommonMark\Environment; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\CommonMarkCoreExtension; +use League\CommonMark\Parser\MarkdownParser; +use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\TestCase; class E2ETest extends TestCase { - /** - * @dataProvider e2eProvider - */ + #[DataProvider('e2eProvider')] public function testFullRender(string $markdown, string $expected): void { $factory = new CliRendererFactory(); $renderer = $factory->__invoke(); - $parser = new DocParser(Environment::createCommonMarkEnvironment()); + $environment = new Environment(); + $environment->addExtension(new CommonMarkCoreExtension()); + $parser = new MarkdownParser($environment); $this->assertEquals($expected, $renderer->renderBlock($parser->parse($markdown))); } @@ -24,7 +26,7 @@ public function testFullRender(string $markdown, string $expected): void /** * @return \Generator */ - public function e2eProvider() + public static function e2eProvider() { foreach (glob(__DIR__ . '/res/e2e/*.md') as $markdownFile) { $markdownContent = file_get_contents($markdownFile); diff --git a/test/InlineRenderer/AbstractInlineRendererTest.php b/test/InlineRenderer/AbstractInlineRendererTest.php index 10aa9ff..6ef519e 100644 --- a/test/InlineRenderer/AbstractInlineRendererTest.php +++ b/test/InlineRenderer/AbstractInlineRendererTest.php @@ -3,7 +3,7 @@ namespace PhpSchool\CliMdRendererTest\InlineRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; -use League\CommonMark\Inline\Element\AbstractInline; +use League\CommonMark\Node\Inline\AbstractInline; use PHPUnit\Framework\TestCase; use PhpSchool\CliMdRenderer\CliRenderer; use InvalidArgumentException; @@ -16,12 +16,10 @@ public function testExceptionIsThrownIfNotCorrectBlock(): void $this->markTestSkipped('Not a Renderer'); } - $block = $this->createMock(AbstractInline::class); + $block = $this->createStub(AbstractInline::class); $class = $this->getRendererClass(); - $cliRenderer = $this->getMockBuilder(CliRenderer::class) - ->disableOriginalConstructor() - ->getMock(); + $cliRenderer = $this->createStub(CliRenderer::class); $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage(sprintf('Incompatible inline type: "%s"', get_class($block))); diff --git a/test/InlineRenderer/CodeRendererTest.php b/test/InlineRenderer/CodeRendererTest.php index cee82c8..3e065dc 100644 --- a/test/InlineRenderer/CodeRendererTest.php +++ b/test/InlineRenderer/CodeRendererTest.php @@ -6,8 +6,8 @@ use PhpSchool\CliMdRenderer\InlineRenderer\CodeRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Code; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\Node\Inline\Code; class CodeRendererTest extends AbstractInlineRendererTest implements RendererTestInterface { diff --git a/test/InlineRenderer/EmphasisRendererTest.php b/test/InlineRenderer/EmphasisRendererTest.php index de9e9d9..51238f8 100644 --- a/test/InlineRenderer/EmphasisRendererTest.php +++ b/test/InlineRenderer/EmphasisRendererTest.php @@ -7,9 +7,9 @@ use PhpSchool\CliMdRenderer\InlineRenderer\TextRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Emphasis; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\Node\Inline\Emphasis; +use League\CommonMark\Node\Inline\Text; class EmphasisRendererTest extends AbstractInlineRendererTest implements RendererTestInterface { @@ -27,7 +27,7 @@ public function testRender(): void $color = new Color(); $color->setForceStyle(true); - $environment = (new Environment())->addInlineRenderer(Text::class, new TextRenderer()); + $environment = (new Environment())->addRenderer(Text::class, new TextRenderer()); $cliRenderer = new CliRenderer($environment, $color); $this->assertEquals( diff --git a/test/InlineRenderer/LinkRendererTest.php b/test/InlineRenderer/LinkRendererTest.php index 719a110..3b81486 100644 --- a/test/InlineRenderer/LinkRendererTest.php +++ b/test/InlineRenderer/LinkRendererTest.php @@ -7,9 +7,9 @@ use PhpSchool\CliMdRenderer\InlineRenderer\TextRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Link; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\Node\Inline\Link; +use League\CommonMark\Node\Inline\Text; class LinkRendererTest extends AbstractInlineRendererTest implements RendererTestInterface { @@ -27,7 +27,7 @@ public function testRender(): void $color = new Color(); $color->setForceStyle(true); - $environment = (new Environment())->addInlineRenderer(Text::class, new TextRenderer()); + $environment = (new Environment())->addRenderer(Text::class, new TextRenderer()); $cliRenderer = new CliRenderer($environment, $color); $this->assertSame( diff --git a/test/InlineRenderer/NewlineRendererTest.php b/test/InlineRenderer/NewlineRendererTest.php index 6db3c4c..7e1fb85 100644 --- a/test/InlineRenderer/NewlineRendererTest.php +++ b/test/InlineRenderer/NewlineRendererTest.php @@ -6,8 +6,8 @@ use PhpSchool\CliMdRenderer\InlineRenderer\NewlineRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Newline; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Node\Inline\Newline; class NewlineRendererTest extends AbstractInlineRendererTest implements RendererTestInterface { diff --git a/test/InlineRenderer/StrongRendererTest.php b/test/InlineRenderer/StrongRendererTest.php index 970b335..e4233e2 100644 --- a/test/InlineRenderer/StrongRendererTest.php +++ b/test/InlineRenderer/StrongRendererTest.php @@ -7,9 +7,9 @@ use PhpSchool\CliMdRenderer\InlineRenderer\TextRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Strong; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Extension\CommonMark\Node\Inline\Strong; +use League\CommonMark\Node\Inline\Text; class StrongRendererTest extends AbstractInlineRendererTest implements RendererTestInterface { @@ -27,7 +27,7 @@ public function testRender(): void $color = new Color(); $color->setForceStyle(true); - $environment = (new Environment())->addInlineRenderer(Text::class, new TextRenderer()); + $environment = (new Environment())->addRenderer(Text::class, new TextRenderer()); $cliRenderer = new CliRenderer($environment, $color); $this->assertEquals( diff --git a/test/InlineRenderer/TextRendererTest.php b/test/InlineRenderer/TextRendererTest.php index 5a8c681..f3d1d8d 100644 --- a/test/InlineRenderer/TextRendererTest.php +++ b/test/InlineRenderer/TextRendererTest.php @@ -6,8 +6,8 @@ use PhpSchool\CliMdRenderer\InlineRenderer\TextRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Node\Inline\Text; class TextRendererTest extends AbstractInlineRendererTest implements RendererTestInterface { diff --git a/test/Renderer/AbstractRendererTest.php b/test/Renderer/AbstractRendererTest.php index ee98f67..60c858e 100644 --- a/test/Renderer/AbstractRendererTest.php +++ b/test/Renderer/AbstractRendererTest.php @@ -3,7 +3,7 @@ namespace PhpSchool\CliMdRendererTest\Renderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; -use League\CommonMark\Block\Element\AbstractBlock; +use League\CommonMark\Node\Block\AbstractBlock; use PHPUnit\Framework\TestCase; use PhpSchool\CliMdRenderer\CliRenderer; use InvalidArgumentException; @@ -16,12 +16,10 @@ public function testExceptionIsThrownIfNotCorrectBlock(): void $this->markTestSkipped('Not a Renderer'); } - $block = $this->createMock(AbstractBlock::class); + $block = $this->createStub(AbstractBlock::class); $class = $this->getRendererClass(); - $cliRenderer = $this->getMockBuilder(CliRenderer::class) - ->disableOriginalConstructor() - ->getMock(); + $cliRenderer = $this->createStub(CliRenderer::class); $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage(sprintf('Incompatible block type: "%s"', get_class($block))); diff --git a/test/Renderer/DocumentRendererTest.php b/test/Renderer/DocumentRendererTest.php index b87c04b..acdc908 100644 --- a/test/Renderer/DocumentRendererTest.php +++ b/test/Renderer/DocumentRendererTest.php @@ -7,9 +7,9 @@ use PhpSchool\CliMdRenderer\Renderer\ParagraphRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Block\Element\Document; -use League\CommonMark\Block\Element\Paragraph; -use League\CommonMark\Environment; +use League\CommonMark\Node\Block\Document; +use League\CommonMark\Node\Block\Paragraph; +use League\CommonMark\Environment\Environment; class DocumentRendererTest extends AbstractRendererTest implements RendererTestInterface { @@ -27,7 +27,7 @@ public function testRender(): void $color = new Color(); $color->setForceStyle(true); - $environment = (new Environment())->addBlockRenderer(Paragraph::class, new ParagraphRenderer()); + $environment = (new Environment())->addRenderer(Paragraph::class, new ParagraphRenderer()); $cliRenderer = new CliRenderer($environment, $color); $this->assertEquals( diff --git a/test/Renderer/FencedCodeRendererTest.php b/test/Renderer/FencedCodeRendererTest.php index dca53c5..20cbb70 100644 --- a/test/Renderer/FencedCodeRendererTest.php +++ b/test/Renderer/FencedCodeRendererTest.php @@ -9,10 +9,10 @@ use Colors\Color; use InvalidArgumentException; use Kadet\Highlighter\KeyLighter; -use League\CommonMark\Block\Element\AbstractBlock; -use League\CommonMark\Block\Element\FencedCode; +use League\CommonMark\Node\Block\AbstractBlock; +use League\CommonMark\Extension\CommonMark\Node\Block\FencedCode; use PhpSchool\CliMdRenderer\Renderer\FencedCodeRenderer; -use League\CommonMark\Environment; +use League\CommonMark\Environment\Environment; class FencedCodeRendererTest extends AbstractRendererTest implements RendererTestInterface { @@ -24,7 +24,7 @@ public function getRendererClass(): string public function testAddSyntaxHighlighterViaConstructor(): void { $renderer = new FencedCodeRenderer( - ['php' => $highlighter = $this->createMock(SyntaxHighlighterInterface::class)] + ['php' => $highlighter = $this->createStub(SyntaxHighlighterInterface::class)] ); $this->assertSame($renderer->getSyntaxHighlighters(), ['php' => $highlighter]); @@ -33,7 +33,7 @@ public function testAddSyntaxHighlighterViaConstructor(): void public function testAddSyntaxHighlighter(): void { $renderer = new FencedCodeRenderer(); - $renderer->addSyntaxHighlighter('php', $highlighter = $this->createMock(SyntaxHighlighterInterface::class)); + $renderer->addSyntaxHighlighter('php', $highlighter = $this->createStub(SyntaxHighlighterInterface::class)); $this->assertSame($renderer->getSyntaxHighlighters(), ['php' => $highlighter]); } @@ -41,18 +41,9 @@ public function testAddSyntaxHighlighter(): void public function testRenderPhpCode(): void { $renderer = $this->getRenderer(); - $code = $this->getMockBuilder(FencedCode::class) - ->disableOriginalConstructor() - ->getMock(); - $code - ->expects($this->once()) - ->method('getStringContent') - ->willReturn('expects($this->once()) - ->method('getInfoWords') - ->willReturn(['php']); + $code = new FencedCode(3, '`', 0); + $code->setInfo('php'); + $code->setLiteral('setForceStyle(true); @@ -68,18 +59,9 @@ public function testRenderNonePhpCodeIsRendererYellow(): void { $renderer = $this->getRenderer(); - $code = $this->getMockBuilder(FencedCode::class) - ->disableOriginalConstructor() - ->getMock(); - $code - ->expects($this->once()) - ->method('getStringContent') - ->willReturn('console.log("lol js???")'); - - $code - ->expects($this->once()) - ->method('getInfoWords') - ->willReturn(['js']); + $code = new FencedCode(3, '`', 0); + $code->setInfo('js'); + $code->setLiteral('console.log("lol js???")'); $color = new Color(); $color->setForceStyle(true); @@ -93,11 +75,9 @@ public function testRenderNonePhpCodeIsRendererYellow(): void public function testExceptionIsThrownIfNotCorrectBlock(): void { - $block = $this->createMock(AbstractBlock::class); + $block = $this->createStub(AbstractBlock::class); - $cliRenderer = $this->getMockBuilder(CliRenderer::class) - ->disableOriginalConstructor() - ->getMock(); + $cliRenderer = $this->createStub(CliRenderer::class); $this->expectException(InvalidArgumentException::class); $this->expectExceptionMessage(sprintf('Incompatible block type: "%s"', get_class($block))); diff --git a/test/Renderer/HeaderRendererTest.php b/test/Renderer/HeaderRendererTest.php index 93cd990..a4ff23f 100644 --- a/test/Renderer/HeaderRendererTest.php +++ b/test/Renderer/HeaderRendererTest.php @@ -7,9 +7,9 @@ use PhpSchool\CliMdRenderer\Renderer\HeaderRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Block\Element\Heading; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Extension\CommonMark\Node\Block\Heading; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Node\Inline\Text; class HeaderRendererTest extends AbstractRendererTest implements RendererTestInterface { @@ -22,13 +22,13 @@ public function testRender(): void { $class = $this->getRendererClass(); $renderer = new $class(); - $header = new Heading(2, 'HEADING!!'); + $header = new Heading(2); $header->appendChild(new Text('HEADING!!')); $color = new Color(); $color->setForceStyle(true); - $environment = (new Environment())->addInlineRenderer(Text::class, new TextRenderer()); + $environment = (new Environment())->addRenderer(Text::class, new TextRenderer()); $cliRenderer = new CliRenderer($environment, $color); $this->assertEquals( diff --git a/test/Renderer/HorizontalRuleRendererTest.php b/test/Renderer/HorizontalRuleRendererTest.php index 46193ad..f61cec7 100644 --- a/test/Renderer/HorizontalRuleRendererTest.php +++ b/test/Renderer/HorizontalRuleRendererTest.php @@ -2,12 +2,13 @@ namespace PhpSchool\CliMdRendererTest\Renderer; +use PhpSchool\CliMdRenderer\CliExtension; use PhpSchool\CliMdRenderer\CliRenderer; use PhpSchool\CliMdRenderer\Renderer\HorizontalRuleRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Block\Element\ThematicBreak; -use League\CommonMark\Environment; +use League\CommonMark\Extension\CommonMark\Node\Block\ThematicBreak; +use League\CommonMark\Environment\Environment; class HorizontalRuleRendererTest extends AbstractRendererTest implements RendererTestInterface { @@ -40,7 +41,9 @@ public function testRendererWithWidthOptionOnEnvironment(): void $color = new Color(); $color->setForceStyle(true); - $cliRenderer = new CliRenderer(new Environment(['renderer' => ['width' => 10]]), $color); + $environment = new Environment(['renderer' => ['width' => 10]]); + $environment->addExtension(new CliExtension()); + $cliRenderer = new CliRenderer($environment, $color); $this->assertEquals( "----------", diff --git a/test/Renderer/ListBlockRendererTest.php b/test/Renderer/ListBlockRendererTest.php index b566ead..13d7992 100644 --- a/test/Renderer/ListBlockRendererTest.php +++ b/test/Renderer/ListBlockRendererTest.php @@ -9,12 +9,12 @@ use PhpSchool\CliMdRenderer\Renderer\ParagraphRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Block\Element\ListBlock; -use League\CommonMark\Block\Element\ListData; -use League\CommonMark\Block\Element\ListItem; -use League\CommonMark\Block\Element\Paragraph; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Extension\CommonMark\Node\Block\ListBlock; +use League\CommonMark\Extension\CommonMark\Node\Block\ListData; +use League\CommonMark\Extension\CommonMark\Node\Block\ListItem; +use League\CommonMark\Node\Block\Paragraph; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Node\Inline\Text; class ListBlockRendererTest extends AbstractRendererTest implements RendererTestInterface { @@ -32,7 +32,7 @@ public function testRender(): void $color = new Color(); $color->setForceStyle(true); $environment = new Environment(); - $environment->addInlineRenderer(Text::class, new TextRenderer()); + $environment->addRenderer(Text::class, new TextRenderer()); $cliRenderer = new CliRenderer($environment, $color); $this->assertEquals('', $renderer->render($list, $cliRenderer)); @@ -61,9 +61,9 @@ public function testRenderWithChildren(): void $color->setForceStyle(true); $environment = (new Environment()) - ->addBlockRenderer(Paragraph::class, new ParagraphRenderer()) - ->addBlockRenderer(ListItem::class, new ListItemRenderer()) - ->addInlineRenderer(Text::class, new TextRenderer()); + ->addRenderer(Paragraph::class, new ParagraphRenderer()) + ->addRenderer(ListItem::class, new ListItemRenderer()) + ->addRenderer(Text::class, new TextRenderer()); $cliRenderer = new CliRenderer($environment, $color); diff --git a/test/Renderer/ListItemRendererTest.php b/test/Renderer/ListItemRendererTest.php index 3d24442..c4ec870 100644 --- a/test/Renderer/ListItemRendererTest.php +++ b/test/Renderer/ListItemRendererTest.php @@ -8,11 +8,11 @@ use PhpSchool\CliMdRenderer\Renderer\ParagraphRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Block\Element\ListData; -use League\CommonMark\Block\Element\ListItem; -use League\CommonMark\Block\Element\Paragraph; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Extension\CommonMark\Node\Block\ListData; +use League\CommonMark\Extension\CommonMark\Node\Block\ListItem; +use League\CommonMark\Node\Block\Paragraph; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Node\Inline\Text; class ListItemRendererTest extends AbstractRendererTest implements RendererTestInterface { @@ -34,8 +34,8 @@ public function testRender(): void $color = new Color(); $color->setForceStyle(true); $environment = (new Environment()) - ->addBlockRenderer(Paragraph::class, new ParagraphRenderer()) - ->addInlineRenderer(Text::class, new TextRenderer()); + ->addRenderer(Paragraph::class, new ParagraphRenderer()) + ->addRenderer(Text::class, new TextRenderer()); $cliRenderer = new CliRenderer($environment, $color); diff --git a/test/Renderer/ParagraphRendererTest.php b/test/Renderer/ParagraphRendererTest.php index 3ae48e9..5d44bd6 100644 --- a/test/Renderer/ParagraphRendererTest.php +++ b/test/Renderer/ParagraphRendererTest.php @@ -7,9 +7,9 @@ use PhpSchool\CliMdRenderer\Renderer\ParagraphRenderer; use PhpSchool\CliMdRendererTest\RendererTestInterface; use Colors\Color; -use League\CommonMark\Block\Element\Paragraph; -use League\CommonMark\Environment; -use League\CommonMark\Inline\Element\Text; +use League\CommonMark\Node\Block\Paragraph; +use League\CommonMark\Environment\Environment; +use League\CommonMark\Node\Inline\Text; class ParagraphRendererTest extends AbstractRendererTest implements RendererTestInterface { @@ -28,7 +28,7 @@ public function testRender(): void $color = new Color(); $color->setForceStyle(true); - $environment = (new Environment())->addInlineRenderer(Text::class, new TextRenderer()); + $environment = (new Environment())->addRenderer(Text::class, new TextRenderer()); $cliRenderer = new CliRenderer($environment, $color); $this->assertEquals(