diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 30896b9..fd2470a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,7 +69,6 @@ jobs: - "composer:normalize" - "composer:psr-verify" - "json:lint" - - "php:copypaste" - "php:cs-fixer" - "php:sniff" - "php:stan" diff --git a/.github/workflows/predefined.yml b/.github/workflows/predefined.yml index 1041f54..688e6c5 100644 --- a/.github/workflows/predefined.yml +++ b/.github/workflows/predefined.yml @@ -86,15 +86,6 @@ jobs: uses: TYPO3-Continuous-Integration/TYPO3-CI-PHPStan@v1 with: config_file: './phpstan.neon' - copypaste-detector: - name: "Copy'n'paste detector" - runs-on: ubuntu-22.04 - needs: php-lint - steps: - - name: "Checkout" - uses: actions/checkout@v3 - - name: "Run the Copy'n'paste Detector" - uses: TYPO3-Continuous-Integration/TYPO3-CI-Copy-Paste-Detector@v1 code-quality: name: "Code quality checks" runs-on: ubuntu-22.04 diff --git a/.gitlab/pipeline/jobs/php-copypaste-check.yml b/.gitlab/pipeline/jobs/php-copypaste-check.yml deleted file mode 100644 index 926b94a..0000000 --- a/.gitlab/pipeline/jobs/php-copypaste-check.yml +++ /dev/null @@ -1,8 +0,0 @@ -php-copypaste-check: - extends: .default - stage: codestyle - needs: - - build-composer-dependencies - - php-lint-php7.4 - script: - - composer ci:php:copypaste diff --git a/Documentation/DependencyManager.rst b/Documentation/DependencyManager.rst index e7bcdb8..e459971 100644 --- a/Documentation/DependencyManager.rst +++ b/Documentation/DependencyManager.rst @@ -15,7 +15,4 @@ a separate PHAR. This helps avoid dependency hell (which means that you cannot install or upgrade some tool as the tool's dependencies conflict with the dependencies on another library). It also allows running versions of tools that require a PHP version that is higher than the lowest allowed PHP version -for this project. Currently, we use PHIVE for -`PHP Copy/Paste Detector `__, -that requires PHP >= 7.3, which conflicts with this project's PHP version -support (we also support PHP 7.2). +for this project. diff --git a/Documentation/Running.rst b/Documentation/Running.rst index 532e36b..e2fe747 100644 --- a/Documentation/Running.rst +++ b/Documentation/Running.rst @@ -68,13 +68,6 @@ Lints the JSON files. Runs all static checks for the PHP files. -.. index:: Commands; composer ci:php:copypaste -.. code-block:: bash - - ddev composer ci:php:copypaste - -Checks for copy\'n\'pasted PHP code. - .. index:: Commands; composer ci:php:cs-fixer .. code-block:: bash diff --git a/composer.json b/composer.json index 9f0c990..e037e85 100644 --- a/composer.json +++ b/composer.json @@ -125,13 +125,11 @@ ], "ci:json:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' -name '*.json' | xargs -r php .Build/vendor/bin/jsonlint -q", "ci:php": [ - "@ci:php:copypaste", "@ci:php:cs-fixer", "@ci:php:lint", "@ci:php:sniff", "@ci:php:stan" ], - "ci:php:copypaste": "@php ./tools/phpcpd Classes", "ci:php:cs-fixer": "php-cs-fixer fix --config .php-cs-fixer.php -v --dry-run --using-cache no --diff", "ci:php:lint": "find .*.php *.php Classes Configuration Tests -name '*.php' -print0 | xargs -r -0 -n 1 -P 4 php -l", "ci:php:sniff": "phpcs Classes Configuration Tests", @@ -139,7 +137,6 @@ "ci:static": [ "@ci:composer:normalize", "@ci:json:lint", - "@ci:php:copypaste", "@ci:php:cs-fixer", "@ci:php:lint", "@ci:php:sniff", @@ -202,7 +199,6 @@ "ci:dynamic": "Runs all PHPUnit tests (unit and functional).", "ci:json:lint": "Lints the JSON files.", "ci:php": "Runs all static checks for the PHP files.", - "ci:php:copypaste": "Checks for copy'n'pasted PHP code.", "ci:php:cs-fixer": "Checks the code style with the PHP Coding Standards Fixer (PHP-CS-Fixer).", "ci:php:lint": "Lints the PHP files for syntax errors.", "ci:php:sniff": "Checks the code style with PHP_CodeSniffer (PHPCS).", diff --git a/phive.xml b/phive.xml index 7ec6a97..e90bf18 100644 --- a/phive.xml +++ b/phive.xml @@ -1,6 +1,5 @@ - diff --git a/tools/phpcpd b/tools/phpcpd deleted file mode 100755 index 4ae9e33..0000000 Binary files a/tools/phpcpd and /dev/null differ