Skip to content

Commit

Permalink
Merge branch 'master' into issue-62
Browse files Browse the repository at this point in the history
  • Loading branch information
kylekatarnls committed Oct 19, 2019
2 parents c9858e3 + fdee858 commit 0801f54
Show file tree
Hide file tree
Showing 129 changed files with 5,028 additions and 1,511 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
/src/site export-ignore
/vendor/squizlabs export-ignore
.gitattributes export-ignore
.github export-ignore
.gitignore export-ignore
.gitmodules export-ignore
.travis.yml export-ignore
Expand All @@ -30,3 +31,5 @@ pdepend.xml.dist export-ignore
composer.lock export-ignore
.editorconfig export-ignore
appveyor.yml export-ignore
CNAME export-ignore
/bin/ export-ignore
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tidelift: "packagist/phpmd/phpmd"
26 changes: 26 additions & 0 deletions .github/ISSUE_TEMPLATE/1_Bug.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: "Bug"
about: 'Report a problem with PHPMD'
---

- PHPMD version: #.#.#
- PHP Version: #.#.#
- Installation type: (phar file/ composer)
- Operating System / Distribution & Version: (Windows 10 / CentOS 7.6 / ...)

### Current Behavior
Explain the result that you get.

### Expected Behavior
Explain the result that you expected.

### Steps To Reproduce:
Explain **all** the steps you did to create this bug so we can reproduce it.

## Checks before submitting
* [ ] Be sure that there isn't already an issue about this. See: [Issues list](https://github.com/phpmd/phpmd/issues)
* [ ] Be sure that there isn't already a pull request about this. See: [Pull requests](https://github.com/phpmd/phpmd/pulls)
* [ ] I have added every step to reproduce the bug.
* [ ] If possible I added relevant code examples.
* [ ] This issue is about 1 bug and nothing more.
* [ ] The issue has a descriptive title. For example: "JSON rendering failed on Windows for filenames with space".
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/2_Feature_Proposal.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: "Feature Proposal"
about: 'Propose a new feature'

---

## Description
Describe the proposal, explain what it does and why.
Try to describe the benefits but also the consequences of the proposal.

## Checks before submitting
* [ ] Be sure that there isn't already an issue about this. See: [Issues list](https://github.com/phpmd/phpmd/issues)
* [ ] Be sure that there isn't already a pull request about this. See: [Pull requests](https://github.com/phpmd/phpmd/pulls)
* [ ] Tell if you have the option to provide the code for this proposal.
* [ ] This issue is about 1 feature proposal and nothing more.
* [ ] The issue has a descriptive title. For example: "Add JSON render option".
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/3_Question.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: "Question"
about: 'This repository is for bugs and feature proposals only. If you have any question please visit or community on Gitter to ask the questions: https://gitter.im/phpmd/community'
---

This repository is only for bugs and feature proposals.

If you have any question or need support please visit our Gitter channel: https://gitter.im/phpmd/community

Thank you!
16 changes: 16 additions & 0 deletions .github/ISSUE_TEMPLATE/4_Documentation_and_Website_Issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
---
name: "Documentation & Website Issue"
about: 'Do you see something incorrect or do you miss some information in the documentation or the website. Tell us.'
---

## Description
Describe what you miss or is incorrect on the [website](https://phpmd.org/) or in the documentation. Be as explicit as possible.
If possible add a URL to the incorrect web page/documentation.


## Checks before submitting
* [ ] Be sure that there isn't already an issue about this. See: [Issues list](https://github.com/phpmd/phpmd/issues)
* [ ] Be sure that there isn't already a pull request about this. See: [Pull requests](https://github.com/phpmd/phpmd/pulls)
* [ ] Tell if you have the possibility to create a Pull Request to solve this issue.
* [ ] If possible add a URL to the incorrect website page or documentation file.
* [ ] This issue is about 1 documentation or website issue and nothing more.
14 changes: 14 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Type: (bugfix / feature / refactoring / documentation update)
Issue: #.. the corresponding issue for this PR (if exist)
Breaking change: yes/no (if yes explain why)

<!--
Explain what the PR does and also why. If you have parts you are not sure about, please explain.
Please check this points before submitting your PR.
- Add test to cover the changes you made on the code.
- If you have a change on the documentation, please link to the page that you change.
- If you add a new feature please update the documentation in the same PR.
- If you really need to add a breaking change, explain why it is needed. Understand that this result in a lower change to get the PR accepted.
- Any PR need 2 approvals before it get merged, sometimes this can take some time. Please be patient.
-->
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@
.buildpath
.settings
composer.phar
composer.lock
vendor
dist
31 changes: 16 additions & 15 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
build:
environment:
php:
version: 7.1.0
tests:
override:
-
command: 'phpunit --coverage-clover=some-file'
coverage:
file: 'some-file'
format: 'clover'
environment:
php:
version: 7.3.7
tests:
override:
-
command: 'vendor/bin/phpunit --coverage-clover=coverage.xml'
coverage:
file: 'coverage.xml'
format: 'clover'

checks:
php:
code_rating: true
duplication: true
php:
code_rating: true
duplication: true

filter:
excluded_paths:
- src/test/resources/files/
excluded_paths:
- src/test/resources/files/
74 changes: 69 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,43 @@ language: php
matrix:
include:
- php: 5.3
dist: precise
- php: 5.3
dist: precise
env: DEPENDENCIES=low
- php: 5.4
dist: trusty
- php: 5.4
dist: trusty
env: DEPENDENCIES=low
- php: 5.5
dist: trusty
- php: 5.5
dist: trusty
env: DEPENDENCIES=low
- php: 5.6
- php: 5.6
env: DEPENDENCIES=low
- php: 7.0
- php: 7.0
env: DEPENDENCIES=low
- php: 7.1
- php: 7.1
env: DEPENDENCIES=low
- php: 7.2
# Could be enabled when we'll upgrade PHPUnit
# - php: 7.2
# env: DEPENDENCIES=low
- php: 7.3
env: COVERAGE=true
# Could be enabled when we'll upgrade PHPUnit
# - php: 7.3
# env: DEPENDENCIES=low
- php: 5.4
dist: trusty
env: BUILD_PHAR=true
- php: 7.3
env: WEBSITE=true
fast_finish: true

sudo: false
Expand All @@ -19,13 +49,47 @@ env:
TEST_CONFIG="phpunit.xml.dist"

before_script:
- phpenv config-rm xdebug.ini || echo "XDebug is not enabled"
- composer self-update
- if [ $DEPENDENCIES = low ] ; then composer update --prefer-dist --prefer-lowest --prefer-stable ; fi
- if [ ! $DEPENDENCIES ] ; then composer install ; fi
- if [[ $DEPENDENCIES = low ]]; then composer update --prefer-dist --prefer-lowest --prefer-stable; fi
- if [[ ! $DEPENDENCIES ]]; then composer install; fi

script:
- if [ $TRAVIS_PHP_VERSION != 7.1 ]; then vendor/phpunit/phpunit/phpunit --configuration $TEST_CONFIG ; fi
- if [ $TRAVIS_PHP_VERSION = 7.1 ]; then vendor/phpunit/phpunit/phpunit --configuration $TEST_CONFIG --colors --coverage-text ; fi
- if [[ $WEBSITE = 'true' ]]; then php bin/build-website.php; fi
- |
if [[ $WEBSITE != 'true' && $BUILD_PHAR != 'true' ]]; then
if [ "$COVERAGE" != "true" ]; then vendor/bin/phpunit --configuration $TEST_CONFIG --colors; fi
if [ "$COVERAGE" = "true" ]; then phpdbg -qrr vendor/bin/phpunit --configuration $TEST_CONFIG --colors --coverage-text; fi
fi
- if [[ $BUILD_PHAR = 'true' ]]; then git submodule update --init && ant package -D-phar:filename=./phpmd.phar && ./phpmd.phar --version; fi

notifications:
irc: "irc.freenode.org#phpmd"
webhooks:
urls:
- https://webhooks.gitter.im/e/5a993c0b870b2fa9141e # PHPMD Gitter Core Channel
- https://webhooks.gitter.im/e/1c62ab29700f53c70ec5 # PHPMD Gitter Community Channel
on_success: change
on_failure: always
on_start: never

deploy:
- provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
local_dir: dist/website
on:
branch: master
condition: $WEBSITE
- provider: releases
api_key: $GITHUB_TOKEN
file: phpmd.phar
skip_cleanup: true
on:
tags: true
repo: phpmd/phpmd
condition: "$BUILD_PHAR"

addons:
snaps:
- name: ant
classic: true

0 comments on commit 0801f54

Please sign in to comment.