composer update

2026-07-29 16:32:25 +02:00
parent 1ede9cc3af
commit 8ad8d279e6
1156 changed files with 22791 additions and 22591 deletions
@@ -1,76 +0,0 @@
-name: Tests
-
-on:
-  pull_request: null
-  push:
-    branches:
-      - 2.x
-
-jobs:
-  tests:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        php:
-          - '7.1'
-          - '7.2'
-          - '7.3'
-          - '7.4'
-          - '8.0'
-          - '8.1'
-        composer_version: ['v2']
-        include:
-          - description: '(prefer lowest)'
-            php: '7.1'
-            composer_version: '2.0.0'
-            dependencies: 'lowest'
-
-    name: PHP ${{ matrix.php }} tests ${{ matrix.description }}
-    steps:
-      # checkout git
-      - uses: actions/checkout@v2
-      # setup PHP
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          tools: composer:${{ matrix.composer_version }}
-          coverage: xdebug
-      - uses: "ramsey/composer-install@v1"
-        with:
-          dependency-versions: ${{ matrix.dependencies }}
-      - run: vendor/bin/phpunit --coverage-clover=coverage.xml
-      - uses: codecov/codecov-action@v1
-        with:
-          file: './coverage.xml'
-          fail_ci_if_error: true
-  PHP-CS-Fixer:
-    runs-on: ubuntu-latest
-    name: Code style
-    steps:
-      - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-          coverage: none
-      - uses: "ramsey/composer-install@v1"
-      - run: vendor/bin/php-cs-fixer fix --ansi --verbose --dry-run
-  PHPStan:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-          coverage: none
-      - uses: "ramsey/composer-install@v1"
-      - run: vendor/bin/phpstan analyse
-  Psalm:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: shivammathur/setup-php@v2
-        with:
-          php-version: '7.4'
-          coverage: none
-      - uses: "ramsey/composer-install@v1"
-      - run: vendor/bin/psalm
@@ -1,118 +0,0 @@
-<?php
-
-$config = new PhpCsFixer\Config('default');
-$config->setRiskyAllowed(true);
-$config->setRules([
-    '@PSR2' => true,
-    'align_multiline_comment' => true,
-    'array_indentation' => true,
-    'array_syntax' => [
-        'syntax' => 'short',
-    ],
-    'binary_operator_spaces' => [
-        'align_double_arrow' => false,
-        'align_equals' => false,
-    ],
-    'blank_line_after_namespace' => true,
-    'blank_line_after_opening_tag' => true,
-    'blank_line_before_statement' => [
-        'statements' => [
-            'return',
-        ],
-    ],
-    'cast_spaces' => [
-        'space' => 'single',
-    ],
-    'class_attributes_separation' => [
-        'elements' => [
-            'method' => 'one', 
-            'property' => 'one',
-        ],
-    ],
-    'compact_nullable_typehint' => true,
-    'concat_space' => [
-        'spacing' => 'one',
-    ],
-    'declare_equal_normalize' => true,
-    'declare_strict_types' => true,
-    'function_typehint_space' => true,
-    'include' => true,
-    'indentation_type' => true,
-    'lowercase_cast' => true,
-    'method_chaining_indentation' => true,
-    'method_separation' => true,
-    'multiline_comment_opening_closing' => true,
-    'native_function_casing' => true,
-    'new_with_braces' => true,
-    'no_blank_lines_after_phpdoc' => true,
-    'no_empty_comment' => true,
-    'no_empty_phpdoc' => true,
-    'no_empty_statement' => true,
-    'no_extra_consecutive_blank_lines' => [
-        'tokens' => [
-            'curly_brace_block',
-            'extra',
-            'parenthesis_brace_block',
-            'square_brace_block',
-            'throw',
-            'use',
-        ],
-    ],
-    'no_leading_import_slash' => true,
-    'no_leading_namespace_whitespace' => true,
-    'no_mixed_echo_print' => [
-        'use' => 'echo',
-    ],
-    'no_multiline_whitespace_around_double_arrow' => true,
-    'no_short_bool_cast' => true,
-    'no_singleline_whitespace_before_semicolons' => true,
-    'no_spaces_around_offset' => true,
-    'no_superfluous_phpdoc_tags' => [
-        'allow_mixed' => true,
-    ],
-    'no_trailing_comma_in_list_call' => true,
-    'no_trailing_comma_in_singleline_array' => true,
-    'no_unneeded_control_parentheses' => true,
-    'no_unused_imports' => true,
-    'no_whitespace_before_comma_in_array' => true,
-    'no_whitespace_in_blank_line' => true,
-    'not_operator_with_successor_space' => true,
-    'normalize_index_brace' => true,
-    'object_operator_without_whitespace' => true,
-    'ordered_imports' => true,
-    'phpdoc_align' => false,
-    'phpdoc_annotation_without_dot' => true,
-    'phpdoc_indent' => true,
-    'phpdoc_no_package' => true,
-    'phpdoc_no_useless_inheritdoc' => true,
-    'phpdoc_order' => true,
-    'phpdoc_scalar' => true,
-    'phpdoc_separation' => true,
-    'phpdoc_single_line_var_spacing' => true,
-    'phpdoc_to_comment' => true,
-    'phpdoc_trim' => true,
-    'phpdoc_trim_consecutive_blank_line_separation' => true,
-    'phpdoc_types' => true,
-    'phpdoc_var_without_name' => true,
-    'pre_increment' => true,
-    'psr4' => true,
-    'return_type_declaration' => true,
-    'short_scalar_cast' => true,
-    'single_blank_line_before_namespace' => true,
-    'single_class_element_per_statement' => true,
-    'single_quote' => true,
-    'space_after_semicolon' => true,
-    'standardize_not_equals' => true,
-    'ternary_operator_spaces' => true,
-    'ternary_to_null_coalescing' => true,
-    'trailing_comma_in_multiline_array' => true,
-    'trim_array_spaces' => true,
-    'unary_operator_spaces' => true,
-    'whitespace_after_comma_in_array' => true,
-]);
-
-$finder = PhpCsFixer\Finder::create();
-$finder->in(__DIR__);
-$config->setFinder($finder);
-
-return $config;
@@ -1,19 +0,0 @@
-pre-commit-check: composer cs phpstan psalm test
-
-composer:
-	composer install
-
-cs:
-	vendor/bin/php-cs-fixer fix --verbose
-
-cs-dry-run:
-	vendor/bin/php-cs-fixer fix --verbose --dry-run
-
-phpstan:
-	vendor/bin/phpstan analyze
-
-psalm:
-	vendor/bin/psalm
-
-test:
-	vendor/bin/phpunit
@@ -1 +0,0 @@
-comment: false
@@ -3,15 +3,16 @@
    "description": "A library to get pretty versions strings of installed dependencies",
    "type": "library",
    "require": {
-        "php": "^7.1|^8.0",
-        "composer-runtime-api": "^2.0.0"
+        "php": "^7.4|^8.0",
+        "composer-runtime-api": "^2.1.0"
    },
    "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.17",
+        "friendsofphp/php-cs-fixer": "^3.2",
        "jean85/composer-provided-replaced-stub-package": "^1.0",
-        "phpstan/phpstan": "^0.12.66",
-        "phpunit/phpunit": "^7.5|^8.5|^9.4",
-        "vimeo/psalm": "^4.3"
+        "phpstan/phpstan": "^2.0",
+        "phpunit/phpunit": "^7.5|^8.5|^9.6",
+        "rector/rector": "^2.0",
+        "vimeo/psalm": "^4.3 || ^5.0"
    },
    "license": "MIT",
    "authors": [
@@ -1,5 +0,0 @@
-parameters:
-    level: 8
-    paths:
-        - src/
-        - tests/
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="4"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="src" />
-        <directory name="tests" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>
@@ -43,14 +43,6 @@ class PrettyVersions

    protected static function checkProvidedPackages(string $packageName): void
    {
-        if (! method_exists(InstalledVersions::class, 'getAllRawData')) {
-            if (isset(InstalledVersions::getRawData()['versions'][$packageName]['provided'])) {
-                throw ProvidedPackageException::create($packageName);
-            }
-
-            return;
-        }
-
        foreach (InstalledVersions::getAllRawData() as $installed) {
            if (isset($installed['versions'][$packageName]['provided'])) {
                throw ProvidedPackageException::create($packageName);
@@ -60,14 +52,6 @@ class PrettyVersions

    protected static function checkReplacedPackages(string $packageName): void
    {
-        if (! method_exists(InstalledVersions::class, 'getAllRawData')) {
-            if (isset(InstalledVersions::getRawData()['versions'][$packageName]['replaced'])) {
-                throw ReplacedPackageException::create($packageName);
-            }
-
-            return;
-        }
-
        foreach (InstalledVersions::getAllRawData() as $installed) {
            if (isset($installed['versions'][$packageName]['replaced'])) {
                throw ReplacedPackageException::create($packageName);
@@ -8,17 +8,13 @@ class Version
 {
    private const SHORT_COMMIT_LENGTH = 7;

-    /** @var string */
-    private $packageName;
+    private string $packageName;

-    /** @var string */
-    private $prettyVersion;
+    private string $prettyVersion;

-    /** @var string */
-    private $reference;
+    private string $reference;

-    /** @var bool */
-    private $versionIsTagged;
+    private bool $versionIsTagged;

    public const NO_VERSION_TEXT = '{no version}';
    public const NO_REFERENCE_TEXT = '{no reference}';
@@ -28,7 +24,7 @@ class Version
        $this->packageName = $packageName;
        $this->prettyVersion = $prettyVersion ?? self::NO_VERSION_TEXT;
        $this->reference = $reference ?? self::NO_REFERENCE_TEXT;
-        $this->versionIsTagged = preg_match('/[^v\d.]/', $this->getShortVersion()) === 0;
+        $this->versionIsTagged = preg_match('/^v?(\d+\.)+\d+(-(beta|RC|alpha).?\d+)?/i', $this->getShortVersion()) === 1;
    }

    public function getPrettyVersion(): string
@@ -91,6 +87,10 @@ class Version

    public function getShortReference(): string
    {
+        if ($this->reference === self::NO_REFERENCE_TEXT) {
+            return self::NO_REFERENCE_TEXT;
+        }
+
        return substr($this->reference, 0, self::SHORT_COMMIT_LENGTH);
    }