Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit bd51f0f

Browse files
author
DKravtsov
committed
Updated composer dependencies. Added xalan tool for generating phpcpd html report.
1 parent dbb9ace commit bd51f0f

File tree

22 files changed

+811
-714
lines changed

22 files changed

+811
-714
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
make phpmd
6565
6666
- run:
67-
name: Run PHP copy past detector
67+
name: Run PHP copy paste detector
6868
command: |
6969
make phpcpd
7070

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
run: make phpinsights
5151
- name: Run php mess detector
5252
run: make phpmd
53-
- name: Run php copy past detector
53+
- name: Run php copy paste detector
5454
run: make phpcpd
5555
- name: Stop the docker images
5656
run: make stop-test
@@ -72,7 +72,7 @@ jobs:
7272
# - name: 'Install dependencies'
7373
# run: COMPOSER_MEMORY_LIMIT=-1 composer install
7474
# - name: 'Download coverage data for Qodana'
75-
# uses: actions/download-artifact@v3
75+
# uses: actions/download-artifact@v4
7676
# with:
7777
# name: php-coverage-data
7878
# path: .qodana/code-coverage

‎.idea/htdocs.iml

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/php.xml

Lines changed: 125 additions & 125 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
4545
wget \
4646
librabbitmq-dev \
4747
debsecan \
48+
xalan \
4849
&& pecl install amqp \
4950
&& docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \
5051
&& docker-php-ext-configure intl \

‎Makefile

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,19 @@ else
322322
endif
323323

324324
phpcpd: ## Runs php copy/paste detector
325-
@make exec cmd="php ./vendor/bin/phpcpd --fuzzy --verbose src tests"
325+
@make exec-bash cmd="mkdir -p reports/phpcpd && php ./vendor/bin/phpcpd --fuzzy --verbose --log-pmd=reports/phpcpd/phpcpd-report-v1.xml src tests"
326+
327+
phpcpd-html-report: ## Generates phpcpd html report
328+
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
329+
@if [ ! -f reports/phpcpd/phpcpd-report-v1.xml ] ; then \
330+
printf "033円[32;49mreports/phpcpd/phpcpd-report-v1.xml not found, please run phpcpd.033円[39m\n" ; \
331+
else \
332+
printf "033円[32;49mCreating reports/phpcpd/phpcpd-report-v1.html report...033円[39m\n" ; \
333+
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 ; \
334+
fi;
335+
else
336+
@make exec-bash cmd="make phpcpd-html-report"
337+
endif
326338

327339
phpmd: ## Runs php mess detector
328340
@make exec cmd="php ./vendor/bin/phpmd src,tests text phpmd_ruleset.xml --suffixes php"

‎composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"doctrine/annotations": "^2.0.2",
3636
"doctrine/doctrine-bundle": "^2.14.0",
3737
"doctrine/doctrine-migrations-bundle": "^3.4.1",
38-
"doctrine/orm": "^2.20.2",
38+
"doctrine/orm": "^2.20.3",
3939
"phpdocumentor/reflection-docblock": "^5.6.2",
4040
"dukecity/command-scheduler-bundle": "^6.0.4",
4141
"symfony/apache-pack": "^1.0.1",
@@ -74,8 +74,8 @@
7474
"symfony/validator": "7.2.*",
7575
"symfony/web-link": "7.2.*",
7676
"symfony/yaml": "7.2.*",
77-
"twig/extra-bundle": "^2.12|^3.20",
78-
"twig/twig": "^2.12|^3.20"
77+
"twig/extra-bundle": "^2.12|^3.21",
78+
"twig/twig": "^2.12|^3.21.1"
7979
},
8080
"conflict": {
8181
"symfony/debug": "<3.3",
@@ -89,7 +89,7 @@
8989
"roave/security-advisories": "dev-latest",
9090
"symfony/browser-kit": "7.2.*",
9191
"symfony/debug-bundle": "7.2.*",
92-
"symfony/maker-bundle": "^1.62.1",
92+
"symfony/maker-bundle": "^1.63.0",
9393
"symfony/requirements-checker": "^2.0.3",
9494
"symfony/stopwatch": "7.2.*",
9595
"symfony/var-dumper": "7.2.*",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /