Updated composer dependencies. Added xalan tool for generating phpcpd html report.

Author: DKravtsov

.circleci/config.yml

@@ -70,7 +70,7 @@ jobs:
             make phpmd
 
       - run:
-          name: Run PHP copy past detector
+          name: Run PHP copy paste detector
           command: |
             make phpcpd
 

.github/workflows/ci.yml

@@ -62,7 +62,7 @@ jobs:
               run: make phpinsights
             - name: Run php mess detector
               run: make phpmd
-            - name: Run php copy past detector
+            - name: Run php copy paste detector
               run: make phpcpd
             - name: Stop the docker images
               run: make stop-test
@@ -84,7 +84,7 @@ jobs:
 #            - name: 'Install dependencies'
 #              run: COMPOSER_MEMORY_LIMIT=-1 composer install
 #            - name: 'Download coverage data for Qodana'
-#              uses: actions/download-artifact@v3
+#              uses: actions/download-artifact@v4
 #              with:
 #                  name: php-coverage-data
 #                  path: .qodana/code-coverage

.idea/htdocs.iml

@@ -45,6 +45,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
       wget \
       librabbitmq-dev \
       debsecan \
+      xalan \
     && pecl install amqp \
     && docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
     && docker-php-ext-configure intl \

.idea/php.xml

@@ -392,7 +392,19 @@ else
 endif
 
 phpcpd: ## Runs php copy/paste detector
-	@make exec cmd="php ./vendor/bin/phpcpd --fuzzy --verbose src tests"
+	@make exec-bash cmd="mkdir -p reports/phpcpd && php ./vendor/bin/phpcpd --fuzzy --verbose --log-pmd=reports/phpcpd/phpcpd-report-v1.xml src tests"
+
+phpcpd-html-report: ## Generates phpcpd html report
+ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
+	@if [ ! -f reports/phpcpd/phpcpd-report-v1.xml ] ; then \
+		printf "\033[32;49mreports/phpcpd/phpcpd-report-v1.xml not found, please run phpcpd.\033[39m\n" ; \
+	else \
+		printf "\033[32;49mCreating reports/phpcpd/phpcpd-report-v1.html report...\033[39m\n" ; \
+		xalan -in reports/phpcpd/phpcpd-report-v1.xml -xsl https://systemsdk.github.io/phpcpd/report/phpcpd-html-v1_0_0.xslt -out reports/phpcpd/phpcpd-report-v1.html ; \
+	fi;
+else
+	@make exec-bash cmd="make phpcpd-html-report"
+endif
 
 phpmd: ## Runs php mess detector
 	@make exec cmd="php ./vendor/bin/phpmd src,tests text phpmd_ruleset.xml --suffixes php"

Dockerfile

@@ -14,7 +14,7 @@
 		"Elasticsearch"
 	],
 	"homepage": "https://github.com/systemsdk/docker-symfony-api",
-	"version": "v3.4.4",
+	"version": "v3.4.5",
 	"license": "MIT",
 	"authors": [
 		{
@@ -44,7 +44,7 @@
 		"beberlei/doctrineextensions": "^1.5",
 		"doctrine/doctrine-bundle": "^2.14.0",
 		"doctrine/doctrine-migrations-bundle": "^3.4.1",
-		"doctrine/orm": "^2.20.2",
+		"doctrine/orm": "^2.20.3",
 		"dukecity/command-scheduler-bundle": "^6.0.4",
 		"elasticsearch/elasticsearch": "^7.17.2",
 		"gedmo/doctrine-extensions": "^3.20.0",
@@ -91,8 +91,8 @@
 		"symfony/validator": "7.2.*",
 		"symfony/web-link": "7.2.*",
 		"symfony/yaml": "7.2.*",
-		"twig/extra-bundle": "^2.12|^3.20",
-		"twig/twig": "^2.12|^3.20"
+		"twig/extra-bundle": "^2.12|^3.21",
+		"twig/twig": "^2.12|^3.21.1"
 	},
 	"conflict": {
 		"symfony/debug": "<3.3",
@@ -106,7 +106,7 @@
 		"roave/security-advisories": "dev-latest",
 		"symfony/browser-kit": "7.2.*",
 		"symfony/debug-bundle": "7.2.*",
-		"symfony/maker-bundle": "^1.62.1",
+		"symfony/maker-bundle": "^1.63.0",
 		"symfony/requirements-checker": "^2.0.3",
 		"symfony/stopwatch": "7.2.*",
 		"symfony/var-dumper": "7.2.*",