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 b38094e

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

File tree

21 files changed

+880
-787
lines changed

21 files changed

+880
-787
lines changed

‎.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
make phpmd
7171
7272
- run:
73-
name: Run PHP copy past detector
73+
name: Run PHP copy paste detector
7474
command: |
7575
make phpcpd
7676

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
run: make phpinsights
6363
- name: Run php mess detector
6464
run: make phpmd
65-
- name: Run php copy past detector
65+
- name: Run php copy paste detector
6666
run: make phpcpd
6767
- name: Stop the docker images
6868
run: make stop-test
@@ -84,7 +84,7 @@ jobs:
8484
# - name: 'Install dependencies'
8585
# run: COMPOSER_MEMORY_LIMIT=-1 composer install
8686
# - name: 'Download coverage data for Qodana'
87-
# uses: actions/download-artifact@v3
87+
# uses: actions/download-artifact@v4
8888
# with:
8989
# name: php-coverage-data
9090
# 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: 144 additions & 144 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
@@ -392,7 +392,19 @@ else
392392
endif
393393

394394
phpcpd: ## Runs php copy/paste detector
395-
@make exec cmd="php ./vendor/bin/phpcpd --fuzzy --verbose src tests"
395+
@make exec-bash cmd="mkdir -p reports/phpcpd && php ./vendor/bin/phpcpd --fuzzy --verbose --log-pmd=reports/phpcpd/phpcpd-report-v1.xml src tests"
396+
397+
phpcpd-html-report: ## Generates phpcpd html report
398+
ifeq ($(INSIDE_DOCKER_CONTAINER), 1)
399+
@if [ ! -f reports/phpcpd/phpcpd-report-v1.xml ] ; then \
400+
printf "033円[32;49mreports/phpcpd/phpcpd-report-v1.xml not found, please run phpcpd.033円[39m\n" ; \
401+
else \
402+
printf "033円[32;49mCreating reports/phpcpd/phpcpd-report-v1.html report...033円[39m\n" ; \
403+
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 ; \
404+
fi;
405+
else
406+
@make exec-bash cmd="make phpcpd-html-report"
407+
endif
396408

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

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"Elasticsearch"
1515
],
1616
"homepage": "https://github.com/systemsdk/docker-symfony-api",
17-
"version": "v3.4.4",
17+
"version": "v3.4.5",
1818
"license": "MIT",
1919
"authors": [
2020
{
@@ -44,7 +44,7 @@
4444
"beberlei/doctrineextensions": "^1.5",
4545
"doctrine/doctrine-bundle": "^2.14.0",
4646
"doctrine/doctrine-migrations-bundle": "^3.4.1",
47-
"doctrine/orm": "^2.20.2",
47+
"doctrine/orm": "^2.20.3",
4848
"dukecity/command-scheduler-bundle": "^6.0.4",
4949
"elasticsearch/elasticsearch": "^7.17.2",
5050
"gedmo/doctrine-extensions": "^3.20.0",
@@ -91,8 +91,8 @@
9191
"symfony/validator": "7.2.*",
9292
"symfony/web-link": "7.2.*",
9393
"symfony/yaml": "7.2.*",
94-
"twig/extra-bundle": "^2.12|^3.20",
95-
"twig/twig": "^2.12|^3.20"
94+
"twig/extra-bundle": "^2.12|^3.21",
95+
"twig/twig": "^2.12|^3.21.1"
9696
},
9797
"conflict": {
9898
"symfony/debug": "<3.3",
@@ -106,7 +106,7 @@
106106
"roave/security-advisories": "dev-latest",
107107
"symfony/browser-kit": "7.2.*",
108108
"symfony/debug-bundle": "7.2.*",
109-
"symfony/maker-bundle": "^1.62.1",
109+
"symfony/maker-bundle": "^1.63.0",
110110
"symfony/requirements-checker": "^2.0.3",
111111
"symfony/stopwatch": "7.2.*",
112112
"symfony/var-dumper": "7.2.*",

0 commit comments

Comments
(0)

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