Commit 40fb114

author

DKravtsov

committed

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

1 parent 95e95ee commit 40fb114Copy full SHA for 40fb114

File tree

22 files changed

+809

-707

lines changed

.circleci
- config.yml
.github/workflows
- ci.yml
.idea
- htdocs.iml
- php.xml
Dockerfile
Makefile
composer.json
composer.lock
docs
- commands.md
- development.md
readme.md
tools
- 01_phpunit
  - composer.lock
- 02_phpstan
  - composer.lock
- 03_ecs
  - composer.lock
- 04_php-coveralls
  - composer.lock
- 05_phpinsights
  - composer.lock
- 06_phpmd
  - composer.lock
- 07_phpmetrics
  - composer.lock
- 08_rector
  - composer.lock
- 09_composer
  - composer.lock
- 10_phpcpd
  - composer.json
  - composer.lock

22 files changed

+809

-707

lines changed

`‎.circleci/config.yml‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ jobs:`
`64`	`64`	`make phpmd`
`65`	`65`
`66`	`66`	`- run:`
`67`		`- name: Run PHP copy past detector`
	`67`	`+ name: Run PHP copy paste detector`
`68`	`68`	`command: \|`
`69`	`69`	`make phpcpd`
`70`	`70`

`‎.github/workflows/ci.yml‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ jobs:`
`50`	`50`	`run: make phpinsights`
`51`	`51`	`- name: Run php mess detector`
`52`	`52`	`run: make phpmd`
`53`		`- - name: Run php copy past detector`
	`53`	`+ - name: Run php copy paste detector`
`54`	`54`	`run: make phpcpd`
`55`	`55`	`- name: Stop the docker images`
`56`	`56`	`run: make stop-test`
`@@ -72,7 +72,7 @@ jobs:`
`72`	`72`	`# - name: 'Install dependencies'`
`73`	`73`	`# run: COMPOSER_MEMORY_LIMIT=-1 composer install`
`74`	`74`	`# - name: 'Download coverage data for Qodana'`
`75`		`-# uses: actions/download-artifact@v3`
	`75`	`+# uses: actions/download-artifact@v4`
`76`	`76`	`# with:`
`77`	`77`	`# name: php-coverage-data`
`78`	`78`	`# path: .qodana/code-coverage`

`‎.idea/htdocs.iml‎`

Lines changed: 16 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: 118 additions & 118 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 number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \`
`45`	`45`	`wget \`
`46`	`46`	`librabbitmq-dev \`
`47`	`47`	`debsecan \`
	`48`	`+ xalan \`
`48`	`49`	`&& pecl install amqp \`
`49`	`50`	`&& docker-php-ext-configure pdo_mysql --with-pdo-mysql=mysqlnd \`
`50`	`51`	`&& docker-php-ext-configure intl \`

`‎Makefile‎`

Lines changed: 13 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,19 @@ else`
`336`	`336`	`endif`
`337`	`337`
`338`	`338`	`phpcpd: ## Runs php copy/paste detector`
`339`		`- @make exec cmd="php ./vendor/bin/phpcpd --fuzzy --verbose src tests"`
	`339`	`+ @make exec-bash cmd="mkdir -p reports/phpcpd && php ./vendor/bin/phpcpd --fuzzy --verbose --log-pmd=reports/phpcpd/phpcpd-report-v1.xml src tests"`
	`340`	`+`
	`341`	`+phpcpd-html-report: ## Generates phpcpd html report`
	`342`	`+ifeq ($(INSIDE_DOCKER_CONTAINER), 1)`
	`343`	`+ @if [ ! -f reports/phpcpd/phpcpd-report-v1.xml ] ; then \`
	`344`	`+ printf "033円[32;49mreports/phpcpd/phpcpd-report-v1.xml not found, please run phpcpd.033円[39m\n" ; \`
	`345`	`+ else \`
	`346`	`+ printf "033円[32;49mCreating reports/phpcpd/phpcpd-report-v1.html report...033円[39m\n" ; \`
	`347`	`+ 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 ; \`
	`348`	`+ fi;`
	`349`	`+else`
	`350`	`+ @make exec-bash cmd="make phpcpd-html-report"`
	`351`	`+endif`
`340`	`352`
`341`	`353`	`phpmd: ## Runs php mess detector`
`342`	`354`	`@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 number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`"doctrine/annotations": "^2.0.2",`
`36`	`36`	`"doctrine/doctrine-bundle": "^2.14.0",`
`37`	`37`	`"doctrine/doctrine-migrations-bundle": "^3.4.1",`
`38`		`- "doctrine/orm": "^2.20.2",`
	`38`	`+ "doctrine/orm": "^2.20.3",`
`39`	`39`	`"phpdocumentor/reflection-docblock": "^5.6.2",`
`40`	`40`	`"dukecity/command-scheduler-bundle": "^6.0.4",`
`41`	`41`	`"symfony/amqp-messenger": "7.2.*",`
`@@ -73,8 +73,8 @@`
`73`	`73`	`"symfony/validator": "7.2.*",`
`74`	`74`	`"symfony/web-link": "7.2.*",`
`75`	`75`	`"symfony/yaml": "7.2.*",`
`76`		`- "twig/extra-bundle": "^2.12\|^3.20",`
`77`		`- "twig/twig": "^2.12\|^3.20"`
	`76`	`+ "twig/extra-bundle": "^2.12\|^3.21",`
	`77`	`+ "twig/twig": "^2.12\|^3.21.1"`
`78`	`78`	`},`
`79`	`79`	`"conflict": {`
`80`	`80`	`"symfony/debug": "<3.3",`
`@@ -88,7 +88,7 @@`
`88`	`88`	`"roave/security-advisories": "dev-latest",`
`89`	`89`	`"symfony/browser-kit": "7.2.*",`
`90`	`90`	`"symfony/debug-bundle": "7.2.*",`
`91`		`- "symfony/maker-bundle": "^1.62.1",`
	`91`	`+ "symfony/maker-bundle": "^1.63.0",`
`92`	`92`	`"symfony/requirements-checker": "^2.0.3",`
`93`	`93`	`"symfony/stopwatch": "7.2.*",`
`94`	`94`	`"symfony/var-dumper": "7.2.*",`

0 commit comments

Comments

(0)

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 40fb114

File tree

22 files changed

22 files changed

`‎.circleci/config.yml‎`

`‎.github/workflows/ci.yml‎`

`‎.idea/htdocs.iml‎`

`‎.idea/php.xml‎`

`‎Dockerfile‎`

`‎Makefile‎`

`‎composer.json‎`

0 commit comments