From 7a814c4af6f50604bb0b124a5700f76d5d7d43a5 Mon Sep 17 00:00:00 2001 From: Benni Mack Date: Fri, 4 Oct 2024 11:00:08 +0200 Subject: [PATCH] [TASK] Remove composer normalizer and phpcpd (#447) Change-Id: I14567be535e95dc7a75aeecc6e70af26d71053d2 --- .github/workflows/continuous-integration.yml | 42 -- composer.json | 9 - composer.lock | 522 +------------------ 3 files changed, 1 insertion(+), 572 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 889fd2a0..ceee68cb 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -55,9 +55,6 @@ jobs: - name: Validate composer.json run: composer ci:composer:validate - - name: Normalize composer.json - run: composer ci:composer:normalize - - name: Check dependencies run: composer ci:composer:require-checker @@ -305,44 +302,6 @@ jobs: - name: Validation of coding standards run: composer ci:php:sniff - php_copypaste_detector: - name: PHP Copy/Paste Detector - needs: - - php_lint - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - coverage: none - extensions: ctype, iconv, json, sqlite3, tokenizer, zip, zlib - ini-values: memory_limit=-1, error_reporting=E_ALL, display_errors=On - php-version: '8.2' - tools: composer:2 - - - name: Get Composer Cache Directory - id: composer-cache - run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT - - - name: Cache Composer dependencies - uses: actions/cache@v3 - with: - path: ${{ steps.composer-cache.outputs.dir }} - key: ${{ runner.os }}-composer-latest-${{ hashFiles('**/composer.lock') }} - restore-keys: | - ${{ runner.os }}-composer-latest- - ${{ runner.os }}-composer- - - - name: Install dependencies - run: composer install ${{ env.COMPOSER_INSTALL_FLAGS }} ${{ env.COMPOSER_FLAGS }} - - - name: Detection of copy/paste code in PHP files - run: composer ci:php:copypaste - php_stan: name: PHP Stan needs: @@ -545,7 +504,6 @@ jobs: - validation - php_coding_standards - php_sniff - - php_copypaste_detector - php_stan - php_rector - coveralls-finish diff --git a/composer.json b/composer.json index 1c07fd36..276795d7 100644 --- a/composer.json +++ b/composer.json @@ -95,7 +95,6 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8", "doctrine/doctrine-fixtures-bundle": "^3.4", - "ergebnis/composer-normalize": "^2.28", "fakerphp/faker": "^1.20", "roave/security-advisories": "dev-latest", "symfony/browser-kit": "^6.2", @@ -142,7 +141,6 @@ "config": { "allow-plugins": { "bamarni/composer-bin-plugin": true, - "ergebnis/composer-normalize": true, "symfony/flex": true, "symfony/runtime": true }, @@ -211,10 +209,8 @@ "@ci:php:rector", "@ci:php:cs-fixer", "@ci:php:sniff", - "@ci:php:copypaste", "@ci:php:stan" ], - "ci:php:copypaste": "@php phpcpd src tests", "ci:php:cs-fixer": "@php php-cs-fixer fix -v --dry-run --diff", "ci:php:lint": "@php phplint --no-progress", "ci:php:rector": "@php rector process --dry-run --no-progress-bar || true", @@ -237,13 +233,8 @@ "ci:tests:php:unit": "@php phpunit -c tests/Unit/phpunit.xml", "ci:yaml:lint": "@php yaml-lint .ddev config", "fix": [ - "@fix:composer", "@fix:php" ], - "fix:composer": [ - "@fix:composer:normalize" - ], - "fix:composer:normalize": "@composer normalize", "fix:php": [ "@fix:php:rector", "@fix:php:cs-fixer" diff --git a/composer.lock b/composer.lock index 13a1faef..861ea3de 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8e45195ccc6948efd511100ce273d880", + "content-hash": "07c424a01561cb39135e612b87512b38", "packages": [ { "name": "composer/ca-bundle", @@ -9342,396 +9342,6 @@ ], "time": "2023-04-11T12:37:36+00:00" }, - { - "name": "ergebnis/composer-normalize", - "version": "2.30.2", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/composer-normalize.git", - "reference": "54d58f7dc5517ae183ac2c06f1dcbd616876673c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/composer-normalize/zipball/54d58f7dc5517ae183ac2c06f1dcbd616876673c", - "reference": "54d58f7dc5517ae183ac2c06f1dcbd616876673c", - "shasum": "" - }, - "require": { - "composer-plugin-api": "^2.0.0", - "ergebnis/json": "^1.0.1", - "ergebnis/json-normalizer": "^4.0.2", - "ergebnis/json-printer": "^3.3.0", - "ext-json": "*", - "justinrainbow/json-schema": "^5.2.12", - "localheinz/diff": "^1.1.1", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" - }, - "require-dev": { - "composer/composer": "^2.5.1", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.3.1", - "fakerphp/faker": "^1.21.0", - "infection/infection": "~0.26.19", - "phpunit/phpunit": "^9.6.3", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.15.18", - "symfony/filesystem": "^6.0.13", - "vimeo/psalm": "^5.7.7" - }, - "type": "composer-plugin", - "extra": { - "class": "Ergebnis\\Composer\\Normalize\\NormalizePlugin", - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - } - }, - "autoload": { - "psr-4": { - "Ergebnis\\Composer\\Normalize\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com" - } - ], - "description": "Provides a composer plugin for normalizing composer.json.", - "homepage": "https://github.com/ergebnis/composer-normalize", - "keywords": [ - "composer", - "normalize", - "normalizer", - "plugin" - ], - "support": { - "issues": "https://github.com/ergebnis/composer-normalize/issues", - "source": "https://github.com/ergebnis/composer-normalize" - }, - "time": "2023-02-27T17:23:42+00:00" - }, - { - "name": "ergebnis/json", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json.git", - "reference": "d66ea30060856d0729a4aa319a02752519ca63a0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json/zipball/d66ea30060856d0729a4aa319a02752519ca63a0", - "reference": "d66ea30060856d0729a4aa319a02752519ca63a0", - "shasum": "" - }, - "require": { - "php": "^8.0" - }, - "require-dev": { - "ergebnis/composer-normalize": "^2.29.0", - "ergebnis/data-provider": "^1.2.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.0.0", - "ergebnis/phpstan-rules": "^1.0.0", - "fakerphp/faker": "^1.20.0", - "infection/infection": "~0.26.16", - "phpunit/phpunit": "^9.5.27", - "psalm/plugin-phpunit": "~0.18.4", - "vimeo/psalm": "^5.1.0" - }, - "type": "library", - "extra": { - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - } - }, - "autoload": { - "psr-4": { - "Ergebnis\\Json\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com" - } - ], - "description": "Provides a Json value object for representing a valid JSON string.", - "homepage": "https://github.com/ergebnis/json", - "keywords": [ - "json" - ], - "support": { - "issues": "https://github.com/ergebnis/json/issues", - "source": "https://github.com/ergebnis/json" - }, - "time": "2022-12-10T22:38:50+00:00" - }, - { - "name": "ergebnis/json-normalizer", - "version": "4.0.2", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json-normalizer.git", - "reference": "15df99fbf454da13b31008795a7397d3d7d73bb4" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-normalizer/zipball/15df99fbf454da13b31008795a7397d3d7d73bb4", - "reference": "15df99fbf454da13b31008795a7397d3d7d73bb4", - "shasum": "" - }, - "require": { - "ergebnis/json": "^1.0.1", - "ergebnis/json-pointer": "^3.2.0", - "ergebnis/json-printer": "^3.3.0", - "ergebnis/json-schema-validator": "^4.0.0", - "ext-json": "*", - "justinrainbow/json-schema": "^5.2.12", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" - }, - "require-dev": { - "composer/semver": "^3.2.1", - "ergebnis/data-provider": "^1.3.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.3.1", - "fakerphp/faker": "^1.21.0", - "infection/infection": "~0.26.19", - "phpunit/phpunit": "^9.6.3", - "psalm/plugin-phpunit": "~0.18.4", - "rector/rector": "~0.15.18", - "symfony/filesystem": "^6.0.19", - "symfony/finder": "^6.0.19", - "vimeo/psalm": "^5.7.7" - }, - "suggest": { - "composer/semver": "If you want to use ComposerJsonNormalizer or VersionConstraintNormalizer" - }, - "type": "library", - "autoload": { - "psr-4": { - "Ergebnis\\Json\\Normalizer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com" - } - ], - "description": "Provides generic and vendor-specific normalizers for normalizing JSON documents.", - "homepage": "https://github.com/ergebnis/json-normalizer", - "keywords": [ - "json", - "normalizer" - ], - "support": { - "issues": "https://github.com/ergebnis/json-normalizer/issues", - "source": "https://github.com/ergebnis/json-normalizer" - }, - "time": "2023-02-27T17:17:30+00:00" - }, - { - "name": "ergebnis/json-pointer", - "version": "3.2.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json-pointer.git", - "reference": "861516ff5afa1aa8905fdf3361315909523a1bf8" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-pointer/zipball/861516ff5afa1aa8905fdf3361315909523a1bf8", - "reference": "861516ff5afa1aa8905fdf3361315909523a1bf8", - "shasum": "" - }, - "require": { - "php": "^8.0" - }, - "require-dev": { - "ergebnis/composer-normalize": "^2.28.3", - "ergebnis/data-provider": "^1.2.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "^5.0.0", - "fakerphp/faker": "^1.20.0", - "infection/infection": "~0.26.16", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "~0.18.3", - "vimeo/psalm": "^4.30" - }, - "type": "library", - "extra": { - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - } - }, - "autoload": { - "psr-4": { - "Ergebnis\\Json\\Pointer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com" - } - ], - "description": "Provides JSON pointer as a value object.", - "homepage": "https://github.com/ergebnis/json-pointer", - "keywords": [ - "RFC6901", - "json", - "pointer" - ], - "support": { - "issues": "https://github.com/ergebnis/json-pointer/issues", - "source": "https://github.com/ergebnis/json-pointer" - }, - "time": "2022-11-28T17:03:31+00:00" - }, - { - "name": "ergebnis/json-printer", - "version": "3.3.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json-printer.git", - "reference": "18920367473b099633f644f0ca6dc8794345148f" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-printer/zipball/18920367473b099633f644f0ca6dc8794345148f", - "reference": "18920367473b099633f644f0ca6dc8794345148f", - "shasum": "" - }, - "require": { - "ext-json": "*", - "ext-mbstring": "*", - "php": "^8.0" - }, - "require-dev": { - "ergebnis/license": "^2.0.0", - "ergebnis/php-cs-fixer-config": "^4.11.0", - "fakerphp/faker": "^1.20.0", - "infection/infection": "~0.26.6", - "phpunit/phpunit": "^9.5.26", - "psalm/plugin-phpunit": "~0.18.3", - "vimeo/psalm": "^4.30.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Ergebnis\\Json\\Printer\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com" - } - ], - "description": "Provides a JSON printer, allowing for flexible indentation.", - "homepage": "https://github.com/ergebnis/json-printer", - "keywords": [ - "formatter", - "json", - "printer" - ], - "support": { - "issues": "https://github.com/ergebnis/json-printer/issues", - "source": "https://github.com/ergebnis/json-printer" - }, - "time": "2022-11-28T10:27:43+00:00" - }, - { - "name": "ergebnis/json-schema-validator", - "version": "4.0.0", - "source": { - "type": "git", - "url": "https://github.com/ergebnis/json-schema-validator.git", - "reference": "a6166272ac5691a9bc791f185841e5f92a6d4723" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/ergebnis/json-schema-validator/zipball/a6166272ac5691a9bc791f185841e5f92a6d4723", - "reference": "a6166272ac5691a9bc791f185841e5f92a6d4723", - "shasum": "" - }, - "require": { - "ergebnis/json": "^1.0.0", - "ergebnis/json-pointer": "^3.2.0", - "ext-json": "*", - "justinrainbow/json-schema": "^5.2.12", - "php": "^8.0" - }, - "require-dev": { - "ergebnis/composer-normalize": "^2.21.0", - "ergebnis/data-provider": "^1.2.0", - "ergebnis/license": "^2.1.0", - "ergebnis/php-cs-fixer-config": "~5.0.0", - "fakerphp/faker": "^1.20.0", - "infection/infection": "~0.26.16", - "phpunit/phpunit": "~9.5.27", - "psalm/plugin-phpunit": "~0.18.4", - "vimeo/psalm": "^5.1.0" - }, - "type": "library", - "extra": { - "composer-normalize": { - "indent-size": 2, - "indent-style": "space" - } - }, - "autoload": { - "psr-4": { - "Ergebnis\\Json\\SchemaValidator\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Andreas Möller", - "email": "am@localheinz.com" - } - ], - "description": "Provides a JSON schema validator, building on top of justinrainbow/json-schema.", - "homepage": "https://github.com/ergebnis/json-schema-validator", - "keywords": [ - "json", - "schema", - "validator" - ], - "support": { - "issues": "https://github.com/ergebnis/json-schema-validator/issues", - "source": "https://github.com/ergebnis/json-schema-validator" - }, - "time": "2022-12-10T14:50:15+00:00" - }, { "name": "fakerphp/faker", "version": "v1.21.0", @@ -9800,136 +9410,6 @@ }, "time": "2022-12-13T13:54:32+00:00" }, - { - "name": "justinrainbow/json-schema", - "version": "5.2.12", - "source": { - "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "reference": "ad87d5a5ca981228e0e205c2bc7dfb8e24559b60", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", - "json-schema/json-schema-test-suite": "1.2.0", - "phpunit/phpunit": "^4.8.35" - }, - "bin": [ - "bin/validate-json" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "JsonSchema\\": "src/JsonSchema/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bruno Prieto Reis", - "email": "bruno.p.reis@gmail.com" - }, - { - "name": "Justin Rainbow", - "email": "justin.rainbow@gmail.com" - }, - { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" - }, - { - "name": "Robert Schönthal", - "email": "seroscho@googlemail.com" - } - ], - "description": "A library to validate a json schema.", - "homepage": "https://github.com/justinrainbow/json-schema", - "keywords": [ - "json", - "schema" - ], - "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/5.2.12" - }, - "time": "2022-04-13T08:02:27+00:00" - }, - { - "name": "localheinz/diff", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/localheinz/diff.git", - "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/localheinz/diff/zipball/851bb20ea8358c86f677f5f111c4ab031b1c764c", - "reference": "851bb20ea8358c86f677f5f111c4ab031b1c764c", - "shasum": "" - }, - "require": { - "php": "^7.1 || ^8.0" - }, - "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^4.2 || ^5" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, - { - "name": "Kore Nordmann", - "email": "mail@kore-nordmann.de" - } - ], - "description": "Fork of sebastian/diff for use with ergebnis/composer-normalize", - "homepage": "https://github.com/localheinz/diff", - "keywords": [ - "diff", - "udiff", - "unidiff", - "unified diff" - ], - "support": { - "source": "https://github.com/localheinz/diff/tree/main" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], - "time": "2020-07-06T04:49:32+00:00" - }, { "name": "masterminds/html5", "version": "2.8.1",