Skip to content

Commit a334462

Browse files
frenckfrenck
authored
Merge pull request #12 from DealerDirect/feature/multiple-updates
Feature/multiple updates
2 parents 645460f + 9c8609d commit a334462

14 files changed

+431
-158
lines changed

Diff for: ‎.alexignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CONTRIBUTING.md
2+
vendor/*
3+
node_modules/*

Diff for: ‎.github/ISSUE_TEMPLATE.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
## Problem/Motivation
2+
3+
> (Why the issue was filed)
4+
5+
## Expected behaviour
6+
7+
> (What you expected to happen)
8+
9+
## Actual behaviour
10+
11+
> (What actually happened)
12+
13+
## Steps to reproduce
14+
15+
> (How can someone else make/see it happen)
16+
17+
## Proposed changes
18+
19+
> (If you have a proposed change, workaround or fix, describe the rationale behind it)

Diff for: ‎.github/PULL_REQUEST_TEMPLATE.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## Proposed Changes
2+
3+
> (Describe the changes and rationale behind them)
4+
5+
## Related Issues
6+
7+
> ([GitHub link](https://help.github.com/articles/autolinked-references-and-urls/) to related issues or pull requests)

Diff for: ‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
node_modules/
12
vendor/
23
composer.lock
4+
npm-debug.log
5+
yarn.lock

Diff for: ‎.remarkrc

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"presets": [
3+
"remark-preset-lint-dealerdirect"
4+
],
5+
"plugins": {
6+
"validate-links": {
7+
}
8+
},
9+
"settings": {
10+
"commonmark": true,
11+
"gfm": true,
12+
"yaml": true,
13+
"rule": "-",
14+
"ruleSpaces": false,
15+
"ruleRepetition": 70,
16+
"emphasis": "*",
17+
"listItemIndent": "1",
18+
"incrementListMarker": false,
19+
"spacedTable": false
20+
}
21+
}

Diff for: ‎.spelling

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
B.V.
2+
Dealerdirect
3+
sublicense
4+
5+
- ./.github/ISSUE_TEMPLATE.md
6+
behaviour
7+
8+
- ./.github/PULL_REQUEST_TEMPLATE.md
9+
GitHub
10+
11+
- ./CONTRIBUTING.md
12+
dealerdirect.nl.
13+
http
14+
opensource
15+
sexualized
16+
17+
- ./README.md
18+
_CodeBrowser
19+
_CodeCoverage
20+
_CodeSniffer
21+
_Depend
22+
_eyes
23+
ApiGen
24+
Behat
25+
codebase
26+
Codeception
27+
Deployer
28+
devops
29+
frontend
30+
Githooks
31+
Goutte
32+
GrumPHP
33+
https
34+
Linters
35+
metapackage
36+
Nijhof
37+
ParaTest
38+
Phing
39+
PHPCompatibility
40+
phpcov
41+
phpDocumentor
42+
phpDox
43+
PhpMetrics
44+
PHPUnit
45+
Sami
46+
Selenium2
47+
SensioLabs
48+
versioning
49+
WebDriver
50+
workingatdealerdirect.eu

Diff for: ‎.travis.yml

+46-6
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,66 @@
1+
---
12
language: php
3+
dist: trusty
4+
sudo: required
25

36
php:
7+
- 7.1
48
- 7.0
59
- 5.6
610

11+
env:
12+
global:
13+
- PATH="${HOME}/bin:${PATH}"
14+
- SHELLCHECK_URL="https://s3.amazonaws.com/travis-blue-public/binaries/ubuntu/14.04/x86_64/shellcheck-0.4.5.tar.bz2"
15+
16+
cache:
17+
directories:
18+
- "${HOME}/bin"
19+
- "${HOME}/.composer/cache/files"
20+
- "${HOME}/.npm"
21+
- "${HOME}/.yarn-cache"
22+
23+
before_install:
24+
- gpg --keyserver hkp://keys.gnupg.net --recv-keys C4133165DF5EB4BAEABDADCACF1E7823C5339B59
25+
- npm set loglevel error
26+
- npm set progress false
27+
28+
install:
29+
- pip install yamllint
30+
- if ! shellcheck --version ; then
31+
curl -sSL "${SHELLCHECK_URL}" | tar --exclude 'SHA256SUMS' --strip-components=1 -C "${HOME}/bin" -xjf -;
32+
fi
33+
- shellcheck --version
34+
- npm install -g yarn
35+
- npm install -g jsonlint
36+
737
script:
8-
- composer self-update || true
38+
- find . -type f -name "*.yml" -print0 | xargs -0 -n1 yamllint
39+
- find . -type f -name "*.json" -print0 | xargs -0 -n1 jsonlint -q
40+
- gpg --verify ./bin/install.sh.sig
41+
- shellcheck ./bin/install.sh
942
- composer validate
10-
- composer install
43+
- composer install --no-progress --no-suggest
44+
- yarn install --no-progress
45+
- yarn run test
1146
- ./vendor/bin/behat --version
1247
- ./vendor/bin/codecept --version
48+
- ./vendor/bin/composer -V
49+
- ./vendor/bin/dep -V
1350
- ./vendor/bin/grumphp --version
1451
- ./vendor/bin/jsonlint -h
15-
- ./vendor/bin/paratest --version
16-
- ./vendor/bin/php-cs-fixer --version
1752
- ./vendor/bin/parallel-lint -h
18-
- ./vendor/bin/phpcs --version
53+
- ./vendor/bin/paratest --version
1954
- ./vendor/bin/pdepend --version
55+
- ./vendor/bin/phing -v
56+
- ./vendor/bin/php-cs-fixer --version
57+
- ./vendor/bin/phpcbf --version
2058
- ./vendor/bin/phpcpd --version
59+
- ./vendor/bin/phpcs --version
2160
- ./vendor/bin/phploc --version
22-
- ./vendor/bin/phpmetrics --version
2361
- ./vendor/bin/phpmd --version
62+
- ./vendor/bin/phpmetrics --version
2463
- ./vendor/bin/phpunit --version
2564
- ./vendor/bin/security-checker --version
65+
- ./vendor/bin/tombstone --version
2666
- ./vendor/bin/security-checker security:check composer.lock

Diff for: ‎.yamllint

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
rules:
3+
braces:
4+
level: error
5+
min-spaces-inside: 0
6+
max-spaces-inside: 1
7+
brackets:
8+
level: error
9+
min-spaces-inside: 0
10+
max-spaces-inside: 0
11+
colons:
12+
level: error
13+
max-spaces-before: 0
14+
max-spaces-after: 1
15+
commas:
16+
level: error
17+
max-spaces-before: 0
18+
min-spaces-after: 1
19+
max-spaces-after: 1
20+
comments:
21+
level: error
22+
require-starting-space: true
23+
min-spaces-from-content: 2
24+
comments-indentation:
25+
level: error
26+
document-end:
27+
level: error
28+
present: false
29+
document-start:
30+
level: error
31+
present: true
32+
empty-lines:
33+
level: error
34+
max: 1
35+
max-start: 0
36+
max-end: 1
37+
hyphens:
38+
level: error
39+
max-spaces-after: 1
40+
indentation:
41+
level: error
42+
spaces: 2
43+
indent-sequences: true
44+
check-multi-line-strings: false
45+
key-duplicates:
46+
level: error
47+
line-length:
48+
level: warning
49+
max: 120
50+
allow-non-breakable-words: true
51+
allow-non-breakable-inline-mappings: true
52+
new-line-at-end-of-file:
53+
level: error
54+
new-lines:
55+
level: error
56+
type: unix
57+
trailing-spaces:
58+
level: error
59+
truthy:
60+
level: error

Diff for: ‎CONTRIBUTING.md

+34-33
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
# Contributing
22

3-
When contributing to this repository, please first discuss the change you wish to make via issue,
4-
email, or any other method with the owners of this repository before making a change.
3+
When contributing to this repository, please first discuss the change you wish
4+
to make via issue, email, or any other method with the owners of this repository
5+
before making a change.
56

6-
Please note we have a code of conduct, please follow it in all your interactions with the project.
7+
Please note we have a code of conduct, please follow it in all your interactions
8+
with the project.
79

8-
## Found an issue? Want a Feature?
9-
10-
You've found a bug in the source code, a mistake in the documentation or maybe you'd like a new feature? You can help us by submitting an issue to our [GitHub Repository]. Before you create an issue, make sure you search the archive, maybe your question was already answered.
10+
## Issues and feature requests
1111

12+
You've found a bug in the source code, a mistake in the documentation or maybe
13+
you'd like a new feature? You can help us by submitting an issue to our
14+
[GitHub Repository][github]. Before you create an issue, make sure you search
15+
the archive, maybe your question was already answered.
1216

1317
Even better: You could submit a pull request with a fix / new feature!
1418

15-
[GitHub Repository]: https://github.com/dealerdirect/php-qa-tools/issues
16-
17-
## Pull Request Process
19+
## Pull request process
1820

19-
1. Search our repository for open or closed [Pull Requests] that relates to your submission.
20-
You don't want to duplicate effort.
21-
4. You may merge the Pull Request in once you have the sign-off of two other developers, or if you
22-
do not have permission to do that, you may request the second reviewer to merge it for you.
21+
1. Search our repository for open or closed [pull requests][prs] that relates
22+
to your submission. You don't want to duplicate effort.
2323

24-
[Pull Requests]: https://github.com/dealerdirect/php-qa-tools/pulls
24+
2. You may merge the pull request in once you have the sign-off of two other
25+
developers, or if you do not have permission to do that, you may request
26+
the second reviewer to merge it for you.
2527

26-
## Code of Conduct
28+
## Code of conduct
2729

28-
### Our Pledge
30+
### Our pledge
2931

3032
In the interest of fostering an open and welcoming environment, we as
3133
contributors and maintainers pledge to making participation in our project and
@@ -34,29 +36,26 @@ size, disability, ethnicity, gender identity and expression, level of experience
3436
nationality, personal appearance, race, religion, or sexual identity and
3537
orientation.
3638

37-
### Our Standards
39+
### Our standards
3840

3941
Examples of behavior that contributes to creating a positive environment
4042
include:
4143

42-
* Using welcoming and inclusive language
43-
* Being respectful of differing viewpoints and experiences
44-
* Gracefully accepting constructive criticism
45-
* Focusing on what is best for the community
46-
* Showing empathy towards other community members
44+
- Using welcoming and inclusive language
45+
- Being respectful of differing viewpoints and experiences
46+
- Gracefully accepting constructive criticism
47+
- Focusing on what is best for the community
48+
- Showing empathy towards other community members
4749

4850
Examples of unacceptable behavior by participants include:
4951

50-
* The use of sexualized language or imagery and unwelcome sexual attention or
51-
advances
52-
* Trolling, insulting/derogatory comments, and personal or political attacks
53-
* Public or private harassment
54-
* Publishing others' private information, such as a physical or electronic
55-
address, without explicit permission
56-
* Other conduct which could reasonably be considered inappropriate in a
57-
professional setting
52+
- The use of sexualized language or imagery and unwelcome sexual attention or advances
53+
- Trolling, insulting/derogatory comments, and personal or political attacks
54+
- Public or private harassment
55+
- Publishing others' private information, such as a physical or electronic address, without explicit permission
56+
- Other conduct which could reasonably be considered inappropriate in a professional setting
5857

59-
### Our Responsibilities
58+
### Our responsibilities
6059

6160
Project maintainers are responsible for clarifying the standards of acceptable
6261
behavior and are expected to take appropriate and fair corrective action in
@@ -92,8 +91,10 @@ members of the project's leadership.
9291

9392
### Attribution
9493

95-
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
96-
available at [http://contributor-covenant.org/version/1/4][version]
94+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
95+
version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
9796

9897
[homepage]: http://contributor-covenant.org
9998
[version]: http://contributor-covenant.org/version/1/4/
99+
[github]: https://github.com/dealerdirect/php-qa-tools/issues
100+
[prs]: https://github.com/dealerdirect/php-qa-tools/pulls

Diff for: ‎LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016 Dealerdirect B.V.
3+
Copyright (c) 2016-2017 Dealerdirect B.V.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)