Skip to content

Commit c1e8da9

Browse files
authored
Merge pull request #85 from chadicus/master
Switch to TraderInteractive
2 parents 986861f + 34bf1db commit c1e8da9

12 files changed

+74
-1977
lines changed

.coveralls.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
service_name: travis-ci
2-
src_dir: .
32
coverage_clover: clover.xml
43
json_path: coveralls-upload.json

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @traderinteractive/opensource

.github/CONTRIBUTING.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# Contribution Guidelines
2+
We welcome you to report [issues](/../../issues) or submit [pull requests](/../../pulls). While the below guidelines are necessary to get code merged, you can
3+
submit pull requests that do not adhere to them and we will try to take care of them in our spare time. We are a smallish group of developers,
4+
though, so if you can make sure the build is passing 100%, that would be very useful.
5+
6+
We recommend including details of your particular usecase(s) with any issues or pull requests. We love to hear how our libraries are being used
7+
and we can get things merged in quicker when we understand its expected usage.
8+
9+
## Pull Requests
10+
Code changes should be sent through [GitHub Pull Requests](/../../pulls). Before submitting the pull request, make sure that phpunit reports success
11+
by running:
12+
```sh
13+
./vendor/bin/phpunit
14+
```
15+
## Builds
16+
Our [Travis build](https://travis-ci.org/traderinteractive/dws-coding-standard) executes [PHPUnit](http://www.phpunit.de) and uses [Coveralls](https://coveralls.io/) to enforce code coverage.
17+
While the build does not strictly enforce 100% code coverage, it will not allow coverage to drop below its current percentage.

.github/ISSUE_TEMPLATE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Expected Behavior
2+
3+
## Actual Behavior
4+
5+
## Steps to reproduce the behavior
6+

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Fixes # .
2+
3+
#### What does this PR do?
4+
5+
#### Checklist
6+
- [ ] Pull request contains a clear definition of changes
7+
- [ ] Tests (either unit, integration, or acceptance) written and passing
8+
- [ ] Relevant documentation produced and/or updated

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/coverage/
22
/vendor/
33
/clover.xml
4+
composer.lock

.travis.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
language: php
22
php:
3-
- 7.0
43
- 5.6
5-
script: ./build.php
6-
after_script: ./vendor/bin/coveralls -v
4+
- 7.0
5+
- 7.1
6+
- 7.2
7+
- nightly
8+
env:
9+
- PREFER_LOWEST="--prefer-lowest --prefer-stable"
10+
- PREFER_LOWEST=""
11+
matrix:
12+
fast_finish: true
13+
allow_failures:
14+
- php: nightly
15+
before_script:
16+
- composer update $PREFER_LOWEST
17+
script:
18+
- ./vendor/bin/phpunit --coverage-clover clover.xml
19+
after_success: ./vendor/bin/coveralls -v

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright (c) 2013 Dominion Enterprises
3+
Copyright (c) 2017 Trader Interactive
44

55
Permission is hereby granted, free of charge, to any person
66
obtaining a copy of this software and associated documentation

README.md

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# DWS Coding Standard
2-
[![Build Status](https://travis-ci.org/dominionenterprises/dws-coding-standard.png)](https://travis-ci.org/dominionenterprises/dws-coding-standard)
3-
[![Code Coverage](http://img.shields.io/coveralls/dominionenterprises/dws-coding-standard.svg?style=flat)](https://coveralls.io/r/dominionenterprises/dws-coding-standard)
2+
[![Build Status](https://travis-ci.org/traderinteractive/dws-coding-standard.svg?branch=master)](https://travis-ci.org/traderinteractive/dws-coding-standard)
3+
[![Coverage Status](https://coveralls.io/repos/github/traderinteractive/dws-coding-standard/badge.svg)](https://coveralls.io/github/traderinteractive/dws-coding-standard)
4+
5+
[![Latest Stable Version](https://poser.pugx.org/traderinteractive/coding-standard/v/stable)](https://packagist.org/packages/traderinteractive/coding-standard)
6+
[![Latest Unstable Version](https://poser.pugx.org/traderinteractive/coding-standard/v/unstable)](https://packagist.org/packages/traderinteractive/coding-standard)
7+
[![License](https://poser.pugx.org/traderinteractive/coding-standard/license)](https://packagist.org/packages/traderinteractive/coding-standard)
8+
9+
[![Total Downloads](https://poser.pugx.org/traderinteractive/coding-standard/downloads)](https://packagist.org/packages/traderinteractive/coding-standard)
10+
[![Daily Downloads](https://poser.pugx.org/traderinteractive/coding-standard/d/daily)](https://packagist.org/packages/traderinteractive/coding-standard)
11+
[![Monthly Downloads](https://poser.pugx.org/traderinteractive/coding-standard/d/monthly)](https://packagist.org/packages/traderinteractive/coding-standard)
412

513
A fairly complete [PHP_CodeSniffer](http://www.squizlabs.com/php-codesniffer) coding standard. See the [standard document](standard.md) to
614
see what "sniffs" are enforced.
@@ -9,31 +17,27 @@ see what "sniffs" are enforced.
917

1018
This standard is meant to be used in a project using [Composer](http://getcomposer.org). It can be added to your project's composer.json as follows:
1119

12-
```json
13-
{
14-
"require-dev": {
15-
"dominionenterprises/dws-coding-standard": "~1.0"
16-
}
17-
}
20+
```sh
21+
composer require traderinteractive/coding-standard
1822
```
1923

2024
Then to use it, you can run the following (or add to your build process):
2125

2226
```bash
23-
./vendor/bin/phpcs --standard=$(pwd)/vendor/dominionenterprises/dws-coding-standard/DWS YOUR_FILES_AND_DIRECTORIES
27+
./vendor/bin/phpcs --standard=$(pwd)/vendor/traderinteractive/coding-standard/DWS YOUR_FILES_AND_DIRECTORIES
2428
```
2529

2630
## Contact
2731

2832
Developers may be contacted at:
2933

30-
* [Pull Requests](https://github.com/dominionenterprises/dws-coding-standard/pulls)
31-
* [Issues](https://github.com/dominionenterprises/dws-coding-standard/issues)
34+
* [Pull Requests](https://github.com/traderinteractive/dws-coding-standard/pulls)
35+
* [Issues](https://github.com/traderinteractive/dws-coding-standard/issues)
3236

3337
## Tests
3438

3539
Tests for the sniffs are included, and are run using the included build:
3640

3741
```bash
38-
./build.php
42+
./vendor/bin/phpunit
3943
```

build.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

composer.json

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "dominionenterprises/dws-coding-standard",
2+
"name": "traderinteractive/coding-standard",
33
"description": "DWS Coding standard",
44
"keywords": ["phpcs", "coding", "standard"],
55
"authors": [
@@ -20,12 +20,15 @@
2020
}
2121
],
2222
"license": "MIT",
23+
"config": {
24+
"sort-packages": true
25+
},
2326
"require": {
24-
"php": "~5.6 || ~7.0",
25-
"squizlabs/php_codesniffer": "~2.6"
27+
"php": "^5.6 || ^7.0",
28+
"squizlabs/php_codesniffer": "^2.6"
2629
},
2730
"require-dev": {
28-
"phpunit/phpunit": "~5.5",
29-
"satooshi/php-coveralls": "~1.0"
31+
"php-coveralls/php-coveralls": "^1.0",
32+
"phpunit/phpunit": "^5.5"
3033
}
3134
}

0 commit comments

Comments
 (0)