diff -pruN 3.0.1-4/.github/CONTRIBUTING.md 4.0.0-2/.github/CONTRIBUTING.md --- 3.0.1-4/.github/CONTRIBUTING.md 1970-01-01 00:00:00.000000000 +0000 +++ 4.0.0-2/.github/CONTRIBUTING.md 2025-02-07 04:57:28.000000000 +0000 @@ -0,0 +1,75 @@ +# Contributing to `sebastian/lines-of-code` + +## Welcome! + +We look forward to your contributions! Here are some examples how you can contribute: + +* [Report a bug](https://github.com/sebastianbergmann/lines-of-code/issues/new) +* [Send a pull request to fix a bug](https://github.com/sebastianbergmann/lines-of-code/pulls) + +Please do not send pull requests that expand the scope of this project (see below). + + +## Any contributions you make will be under the BSD-3-Clause License + +When you submit code changes, your submissions are understood to be under the same [BSD-3-Clause License](https://github.com/sebastianbergmann/lines-of-code/blob/main/LICENSE) that covers the project. By contributing to this project, you agree that your contributions will be licensed under its BSD-3-Clause License. + + +## Write bug reports with detail, background, and sample code + +[This is an example](https://github.com/sebastianbergmann/phpunit/issues/4376) of a bug report I wrote, and I think it's not too bad. + +In your bug report, please provide the following: + +* A quick summary and/or background +* Steps to reproduce + * Be specific! + * Give sample code if you can. +* What you expected would happen +* What actually happens +* Notes (possibly including why you think this might be happening, or stuff you tried that didn't work) + +Please post code and output as text ([using proper markup](https://guides.github.com/features/mastering-markdown/)). Do not post screenshots of code or output. + + +## Workflow for Pull Requests + +1. Fork the repository. +2. Create your branch from the oldest branch that is affected by the bug you plan to fix. +3. Implement your change and add tests for it. +4. Ensure the test suite passes. +5. Ensure the code complies with our coding guidelines (see below). +6. Send that pull request! + +Please make sure you have [set up your username and email address](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup) for use with Git. Strings such as `silly nick name ` look really stupid in the commit history of a project. + +We encourage you to [sign your Git commits with your GPG key](https://docs.github.com/en/github/authenticating-to-github/signing-commits). + + +## Development + +This project uses [PHPUnit](https://phpunit.de/) for testing: + +```shell +./vendor/bin/phpunit +``` + +This project uses [PHPStan](https://phpstan.org/) for static analysis: + +```shell +./tools/phpstan +``` + +This project uses [PHP-CS-Fixer](https://cs.symfony.com/) to enforce coding guidelines: + +```shell +./tools/php-cs-fixer fix +``` + +The commands shown above require an autoloader script at `vendor/autoload.php`. This can be generated like so: + +```shell +./tools/composer dump-autoload +``` + +Please understand that we will not accept a pull request when its changes violate this project's coding guidelines or break the test suite. diff -pruN 3.0.1-4/.github/workflows/ci.yml 4.0.0-2/.github/workflows/ci.yml --- 3.0.1-4/.github/workflows/ci.yml 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/.github/workflows/ci.yml 2025-02-07 04:57:28.000000000 +0000 @@ -7,7 +7,7 @@ on: name: "CI" env: - COMPOSER_ROOT_VERSION: "3.0-dev" + COMPOSER_ROOT_VERSION: "4.0.x-dev" permissions: contents: read @@ -61,9 +61,9 @@ jobs: fail-fast: false matrix: php-version: - - "8.2" - "8.3" - "8.4" + - "8.5" steps: - name: "Checkout" @@ -73,15 +73,21 @@ jobs: uses: "shivammathur/setup-php@v2" with: php-version: "${{ matrix.php-version }}" - coverage: "pcov" + coverage: "xdebug" - name: "Install dependencies with Composer" run: "./tools/composer update --no-ansi --no-interaction --no-progress" - name: "Run tests with PHPUnit" - run: "vendor/bin/phpunit --coverage-clover=coverage.xml" + run: "vendor/bin/phpunit --log-junit junit.xml --coverage-clover=coverage.xml" - - name: "Send code coverage report to Codecov.io" - env: - CODECOV_TOKEN: "${{ secrets.CODECOV_TOKEN }}" - run: "bash <(curl -s https://codecov.io/bash) || true" + - name: Upload test results to Codecov.io + if: ${{ !cancelled() }} + uses: codecov/test-results-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + + - name: Upload code coverage data to Codecov.io + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} diff -pruN 3.0.1-4/.phive/phars.xml 4.0.0-2/.phive/phars.xml --- 3.0.1-4/.phive/phars.xml 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/.phive/phars.xml 2025-02-07 04:57:28.000000000 +0000 @@ -1,7 +1,7 @@ - - - - + + + + diff -pruN 3.0.1-4/.php-cs-fixer.dist.php 4.0.0-2/.php-cs-fixer.dist.php --- 3.0.1-4/.php-cs-fixer.dist.php 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/.php-cs-fixer.dist.php 2025-02-07 04:57:28.000000000 +0000 @@ -100,7 +100,7 @@ $config->setFinder($finder) 'explicit_string_variable' => true, 'fopen_flag_order' => true, 'full_opening_tag' => true, - 'fully_qualified_strict_types' => true, + 'fully_qualified_strict_types' => ['import_symbols' => true], 'function_declaration' => true, 'function_to_constant' => true, 'get_class_to_class_keyword' => true, @@ -136,7 +136,7 @@ $config->setFinder($finder) 'modernize_types_casting' => true, 'multiline_comment_opening_closing' => true, 'multiline_whitespace_before_semicolons' => true, - 'native_constant_invocation' => false, + 'native_constant_invocation' => true, 'native_function_casing' => false, 'native_function_invocation' => [ 'include' => [ @@ -159,7 +159,23 @@ $config->setFinder($finder) 'no_empty_comment' => true, 'no_empty_phpdoc' => true, 'no_empty_statement' => true, - 'no_extra_blank_lines' => true, + 'no_extra_blank_lines' => [ + 'tokens' => [ + 'attribute', + 'break', + 'case', + 'continue', + 'curly_brace_block', + 'default', + 'extra', + 'parenthesis_brace_block', + 'return', + 'square_brace_block', + 'switch', + 'throw', + 'use', + ], + ], 'no_homoglyph_names' => true, 'no_leading_import_slash' => true, 'no_leading_namespace_whitespace' => true, @@ -198,6 +214,7 @@ $config->setFinder($finder) 'no_whitespace_in_blank_line' => true, 'non_printable_character' => true, 'normalize_index_brace' => true, + 'nullable_type_declaration_for_default_null_value' => true, 'object_operator_without_whitespace' => true, 'octal_notation' => true, 'operator_linebreak' => [ @@ -341,6 +358,8 @@ $config->setFinder($finder) 'whitespace_after_comma_in_array' => true, ]); -$config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache/' . sha1(@trim((string) @shell_exec('git rev-parse --abbrev-ref HEAD')))); +$config->setCacheFile(__DIR__ . '/.php-cs-fixer.cache/' . json_decode((string) @file_get_contents('composer.json'), true)["extra"]["branch-alias"]["dev-main"] ?? 'unknown'); + +$config->setParallelConfig(\PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect()); return $config; diff -pruN 3.0.1-4/ChangeLog.md 4.0.0-2/ChangeLog.md --- 3.0.1-4/ChangeLog.md 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/ChangeLog.md 2025-02-07 04:57:28.000000000 +0000 @@ -2,6 +2,12 @@ All notable changes are documented in this file using the [Keep a CHANGELOG](https://keepachangelog.com/) principles. +## [4.0.0] - 2025-02-07 + +### Removed + +* This component is no longer supported on PHP 8.2 + ## [3.0.1] - 2024-07-03 ### Changed @@ -59,6 +65,7 @@ All notable changes are documented in th * Initial release +[4.0.0]: https://github.com/sebastianbergmann/lines-of-code/compare/3.0...4.0.0 [3.0.1]: https://github.com/sebastianbergmann/lines-of-code/compare/3.0.0...3.0.1 [3.0.0]: https://github.com/sebastianbergmann/lines-of-code/compare/2.0...3.0.0 [2.0.2]: https://github.com/sebastianbergmann/lines-of-code/compare/2.0.1...2.0.2 diff -pruN 3.0.1-4/LICENSE 4.0.0-2/LICENSE --- 3.0.1-4/LICENSE 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/LICENSE 2025-02-07 04:57:28.000000000 +0000 @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2020-2024, Sebastian Bergmann +Copyright (c) 2020-2025, Sebastian Bergmann All rights reserved. Redistribution and use in source and binary forms, with or without diff -pruN 3.0.1-4/README.md 4.0.0-2/README.md --- 3.0.1-4/README.md 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/README.md 2025-02-07 04:57:28.000000000 +0000 @@ -1,4 +1,4 @@ -[![Latest Stable Version](https://poser.pugx.org/sebastian/lines-of-code/v/stable.png)](https://packagist.org/packages/sebastian/lines-of-code) +[![Latest Stable Version](https://poser.pugx.org/sebastian/lines-of-code/v)](https://packagist.org/packages/sebastian/lines-of-code) [![CI Status](https://github.com/sebastianbergmann/lines-of-code/workflows/CI/badge.svg)](https://github.com/sebastianbergmann/lines-of-code/actions) [![codecov](https://codecov.io/gh/sebastianbergmann/lines-of-code/branch/main/graph/badge.svg)](https://codecov.io/gh/sebastianbergmann/lines-of-code) diff -pruN 3.0.1-4/composer.json 4.0.0-2/composer.json --- 3.0.1-4/composer.json 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/composer.json 2025-02-07 04:57:28.000000000 +0000 @@ -17,15 +17,15 @@ }, "prefer-stable": true, "require": { - "php": ">=8.2", + "php": ">=8.3", "nikic/php-parser": "^5.0" }, "require-dev": { - "phpunit/phpunit": "^11.0" + "phpunit/phpunit": "^12.0" }, "config": { "platform": { - "php": "8.2" + "php": "8.3" }, "optimize-autoloader": true, "sort-packages": true @@ -37,7 +37,7 @@ }, "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "4.0-dev" } } } diff -pruN 3.0.1-4/debian/changelog 4.0.0-2/debian/changelog --- 3.0.1-4/debian/changelog 2025-05-04 18:39:25.000000000 +0000 +++ 4.0.0-2/debian/changelog 2025-09-29 06:29:19.000000000 +0000 @@ -1,12 +1,25 @@ -phpunit-lines-of-code (3.0.1-4) unstable; urgency=medium +phpunit-lines-of-code (4.0.0-2) unstable; urgency=medium - * Upload for the reproducible effort + * Upload to unstable in sync with PHPunit + * Update Standards-Version to 4.7.2 + * Remove Rules-Requires-Root + + -- David Prévot Mon, 29 Sep 2025 08:29:19 +0200 + +phpunit-lines-of-code (4.0.0-1) experimental; urgency=medium + + * Upload new major to experimental + + [ Sebastian Bergmann ] + * Bump copyright year + * Prepare release + + [ David Prévot ] * Revert "Force system dependencies loading" * Simplify build - * Update Standards-Version to 4.7.2 - * Track version 3 for Trixie + * Update copyright (years) - -- David Prévot Sun, 04 May 2025 20:39:25 +0200 + -- David Prévot Sat, 08 Feb 2025 19:29:48 +0100 phpunit-lines-of-code (3.0.1-3) unstable; urgency=medium diff -pruN 3.0.1-4/debian/control 4.0.0-2/debian/control --- 3.0.1-4/debian/control 2025-05-04 18:39:25.000000000 +0000 +++ 4.0.0-2/debian/control 2025-09-29 06:27:45.000000000 +0000 @@ -11,9 +11,8 @@ Build-Depends: debhelper-compat (= 13), phpunit Standards-Version: 4.7.2 Homepage: https://github.com/sebastianbergmann/lines-of-code -Vcs-Git: https://salsa.debian.org/php-team/pear/phpunit-lines-of-code.git -b debian/3.x +Vcs-Git: https://salsa.debian.org/php-team/pear/phpunit-lines-of-code.git Vcs-Browser: https://salsa.debian.org/php-team/pear/phpunit-lines-of-code -Rules-Requires-Root: no Package: phpunit-lines-of-code Architecture: all diff -pruN 3.0.1-4/debian/copyright 4.0.0-2/debian/copyright --- 3.0.1-4/debian/copyright 2025-05-04 18:37:53.000000000 +0000 +++ 4.0.0-2/debian/copyright 2025-09-29 06:27:45.000000000 +0000 @@ -4,7 +4,7 @@ Upstream-Contact: Sebastian Bergmann +Copyright: 2020-2025, Sebastian Bergmann License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff -pruN 3.0.1-4/debian/gbp.conf 4.0.0-2/debian/gbp.conf --- 3.0.1-4/debian/gbp.conf 2025-05-04 18:39:25.000000000 +0000 +++ 4.0.0-2/debian/gbp.conf 2025-09-29 06:27:29.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/3.x +debian-branch = debian/latest filter = [ '.gitattributes', 'tools' ] pristine-tar = True upstream-vcs-tag = %(version%~%-)s diff -pruN 3.0.1-4/debian/watch 4.0.0-2/debian/watch --- 3.0.1-4/debian/watch 2025-05-04 18:39:25.000000000 +0000 +++ 4.0.0-2/debian/watch 2025-09-29 06:27:29.000000000 +0000 @@ -2,4 +2,4 @@ version=4 options=uversionmangle=s/-?([^\d.]+)/~$1/;tr/A-Z/a-z/,\ mode=git,gitmode=full,gitexport=all,pgpmode=gittag \ https://github.com/sebastianbergmann/lines-of-code \ -refs/tags/v?(3.+) +refs/tags/v?(\d.+) diff -pruN 3.0.1-4/phpstan.neon 4.0.0-2/phpstan.neon --- 3.0.1-4/phpstan.neon 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/phpstan.neon 2025-02-07 04:57:28.000000000 +0000 @@ -1,16 +1,6 @@ parameters: - level: 9 + level: 10 paths: - src - tests/unit - tests/integration - ignoreErrors: - - - message: "#^Return type \\(void\\) of method SebastianBergmann\\\\LinesOfCode\\\\LineCountingVisitor\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitor\\:\\:enterNode\\(\\)$#" - count: 1 - path: src/LineCountingVisitor.php - - - - message: "#^Return type \\(void\\) of method SebastianBergmann\\\\LinesOfCode\\\\LineCountingVisitor\\:\\:enterNode\\(\\) should be compatible with return type \\(array\\\\|int\\|PhpParser\\\\Node\\|null\\) of method PhpParser\\\\NodeVisitorAbstract\\:\\:enterNode\\(\\)$#" - count: 1 - path: src/LineCountingVisitor.php diff -pruN 3.0.1-4/phpunit.xml 4.0.0-2/phpunit.xml --- 3.0.1-4/phpunit.xml 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/phpunit.xml 2025-02-07 04:57:28.000000000 +0000 @@ -1,12 +1,13 @@ diff -pruN 3.0.1-4/src/Counter.php 4.0.0-2/src/Counter.php --- 3.0.1-4/src/Counter.php 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/src/Counter.php 2025-02-07 04:57:28.000000000 +0000 @@ -48,7 +48,6 @@ final class Counter assert($nodes !== null); return $this->countInAbstractSyntaxTree($linesOfCode, $nodes); - // @codeCoverageIgnoreStart } catch (Error $error) { throw new RuntimeException( diff -pruN 3.0.1-4/src/Exception/NegativeValueException.php 4.0.0-2/src/Exception/NegativeValueException.php --- 3.0.1-4/src/Exception/NegativeValueException.php 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/src/Exception/NegativeValueException.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ -namespace SebastianBergmann\LinesOfCode; - -use InvalidArgumentException; - -final class NegativeValueException extends InvalidArgumentException implements Exception -{ -} diff -pruN 3.0.1-4/src/LineCountingVisitor.php 4.0.0-2/src/LineCountingVisitor.php --- 3.0.1-4/src/LineCountingVisitor.php 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/src/LineCountingVisitor.php 2025-02-07 04:57:28.000000000 +0000 @@ -43,15 +43,17 @@ final class LineCountingVisitor extends $this->linesOfCode = $linesOfCode; } - public function enterNode(Node $node): void + public function enterNode(Node $node): null { $this->comments = array_merge($this->comments, $node->getComments()); if (!$node instanceof Expr) { - return; + return null; } $this->linesWithStatements[] = $node->getStartLine(); + + return null; } public function result(): LinesOfCode diff -pruN 3.0.1-4/src/LinesOfCode.php 4.0.0-2/src/LinesOfCode.php --- 3.0.1-4/src/LinesOfCode.php 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/src/LinesOfCode.php 2025-02-07 04:57:28.000000000 +0000 @@ -41,30 +41,9 @@ final readonly class LinesOfCode * @param non-negative-int $logicalLinesOfCode * * @throws IllogicalValuesException - * @throws NegativeValueException */ public function __construct(int $linesOfCode, int $commentLinesOfCode, int $nonCommentLinesOfCode, int $logicalLinesOfCode) { - /** @phpstan-ignore smaller.alwaysFalse */ - if ($linesOfCode < 0) { - throw new NegativeValueException('$linesOfCode must not be negative'); - } - - /** @phpstan-ignore smaller.alwaysFalse */ - if ($commentLinesOfCode < 0) { - throw new NegativeValueException('$commentLinesOfCode must not be negative'); - } - - /** @phpstan-ignore smaller.alwaysFalse */ - if ($nonCommentLinesOfCode < 0) { - throw new NegativeValueException('$nonCommentLinesOfCode must not be negative'); - } - - /** @phpstan-ignore smaller.alwaysFalse */ - if ($logicalLinesOfCode < 0) { - throw new NegativeValueException('$logicalLinesOfCode must not be negative'); - } - if ($linesOfCode - $commentLinesOfCode !== $nonCommentLinesOfCode) { throw new IllogicalValuesException('$linesOfCode !== $commentLinesOfCode + $nonCommentLinesOfCode'); } diff -pruN 3.0.1-4/tests/unit/LinesOfCodeTest.php 4.0.0-2/tests/unit/LinesOfCodeTest.php --- 3.0.1-4/tests/unit/LinesOfCodeTest.php 2024-07-03 04:58:38.000000000 +0000 +++ 4.0.0-2/tests/unit/LinesOfCodeTest.php 2025-02-07 04:57:28.000000000 +0000 @@ -42,42 +42,6 @@ final class LinesOfCodeTest extends Test $this->assertSame(0, $this->linesOfCode()->logicalLinesOfCode()); } - public function testLinesOfCodeCannotBeNegative(): void - { - $this->expectException(NegativeValueException::class); - $this->expectExceptionMessage('$linesOfCode must not be negative'); - - /** @phpstan-ignore argument.type */ - new LinesOfCode(-1, 0, 0, 0); - } - - public function testCommentLinesOfCodeCannotBeNegative(): void - { - $this->expectException(NegativeValueException::class); - $this->expectExceptionMessage('$commentLinesOfCode must not be negative'); - - /** @phpstan-ignore argument.type */ - new LinesOfCode(0, -1, 0, 0); - } - - public function testNonCommentLinesOfCodeCannotBeNegative(): void - { - $this->expectException(NegativeValueException::class); - $this->expectExceptionMessage('$nonCommentLinesOfCode must not be negative'); - - /** @phpstan-ignore argument.type */ - new LinesOfCode(0, 0, -1, 0); - } - - public function testLogicalLinesOfCodeCannotBeNegative(): void - { - $this->expectException(NegativeValueException::class); - $this->expectExceptionMessage('$logicalLinesOfCode must not be negative'); - - /** @phpstan-ignore argument.type */ - new LinesOfCode(0, 0, 0, -1); - } - #[TestDox('Lines of Code = Comment Lines of Code + Non-Comment Lines of Code')] public function testNumbersHaveToMakeSense(): void { Binary files 3.0.1-4/tools/composer and 4.0.0-2/tools/composer differ Binary files 3.0.1-4/tools/infection and 4.0.0-2/tools/infection differ Binary files 3.0.1-4/tools/php-cs-fixer and 4.0.0-2/tools/php-cs-fixer differ Binary files 3.0.1-4/tools/phpstan and 4.0.0-2/tools/phpstan differ