Skip to content
This repository was archived by the owner on Jan 21, 2020. It is now read-only.

Commit 5760449

Browse files
committed
Merge branch 'hotfix/qa-tools'
Close #245
2 parents 88776b4 + 70db3d5 commit 5760449

56 files changed

Lines changed: 882 additions & 596 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.coveralls.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
coverage_clover: clover.xml
2+
json_path: coveralls-upload.json

.gitattributes

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/doc export-ignore
2-
/test export-ignore
3-
/vendor export-ignore
4-
.coveralls.yml export-ignore
5-
.gitattributes export-ignore
6-
.gitignore export-ignore
7-
.travis.yml export-ignore
8-
phpcs.xml export-ignore
9-
phpunit.xml.dist export-ignore
1+
/.coveralls.yml export-ignore
2+
/.gitattributes export-ignore
3+
/.gitignore export-ignore
4+
/.travis.yml export-ignore
5+
/composer.lock export-ignore
6+
/docs/ export-ignore
7+
/phpcs.xml export-ignore
8+
/phpunit.xml.dist export-ignore
9+
/test/ export-ignore

.gitignore

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
nbproject
2-
.idea
3-
.buildpath
4-
.project
5-
.settings/
6-
.DS_Store
7-
vendor/
1+
/clover.xml
2+
/coveralls-upload.json
3+
/phpunit.xml
4+
/vendor/

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ install:
6565

6666
script:
6767
- composer test
68-
- if [[ $CS_CHECK == 'true' ]]; then composer cs ; fi
68+
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

LICENSE.txt renamed to LICENSE.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
1+
Copyright (c) 2011-2018, Zend Technologies USA, Inc.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification,
55
are permitted provided that the following conditions are met:
66

7-
* Redistributions of source code must retain the above copyright notice,
8-
this list of conditions and the following disclaimer.
7+
- Redistributions of source code must retain the above copyright notice, this
8+
list of conditions and the following disclaimer.
99

10-
* Redistributions in binary form must reproduce the above copyright notice,
11-
this list of conditions and the following disclaimer in the documentation
12-
and/or other materials provided with the distribution.
10+
- Redistributions in binary form must reproduce the above copyright notice, this
11+
list of conditions and the following disclaimer in the documentation and/or
12+
other materials provided with the distribution.
1313

14-
* Neither the name of Zend Technologies USA, Inc. nor the names of its
15-
contributors may be used to endorse or promote products derived from this
16-
software without specific prior written permission.
14+
- Neither the name of Zend Technologies USA, Inc. nor the names of its
15+
contributors may be used to endorse or promote products derived from this
16+
software without specific prior written permission.
1717

1818
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
1919
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Zend Developer Tools
22

3-
[![Build Status](https://travis-ci.org/zendframework/ZendDeveloperTools.svg)](https://travis-ci.org/zendframework/ZendDeveloperTools)
3+
[![Build Status](https://secure.travis-ci.org/zendframework/ZendDeveloperTools.svg?branch=master)](https://secure.travis-ci.org/zendframework/ZendDeveloperTools)
4+
[![Coverage Status](https://coveralls.io/repos/github/zendframework/ZendDeveloperTools/badge.svg?branch=master)](https://coveralls.io/github/zendframework/ZendDeveloperTools?branch=master)
45

56
Module providing debug tools for use with [zend-mvc](https://docs.zendframework.com/zend-mvc) applications.
67

@@ -17,6 +18,7 @@ Module providing debug tools for use with [zend-mvc](https://docs.zendframework.
1718
2. Add the `ZendDeveloperTools` module to the module section of your `config/application.config.php`.
1819
Starting with version 1.1.0, if you are using [zend-component-installer](https://docs.zendframework.com/zend-component-installer),
1920
this will be done for you automatically.
21+
2022
3. Copy `./vendor/zendframework/zend-developer-tools/config/zenddevelopertools.local.php.dist` to
2123
`./config/autoload/zenddevelopertools.local.php`. Change any settings in it
2224
according to your needs.

composer.json

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,20 @@
11
{
22
"name": "zendframework/zend-developer-tools",
33
"description": "Module for developer and debug tools for use with zend-mvc applications.",
4-
"type": "library",
54
"license": "BSD-3-Clause",
65
"keywords": [
6+
"zendframework",
77
"debug",
88
"developer",
9-
"zf2",
9+
"zf",
1010
"module"
1111
],
12-
"homepage": "https://github.com/zendframework/ZendDeveloperTools",
13-
"authors": [
14-
{
15-
"name": "Evan Coury",
16-
"email": "me@evancoury.com",
17-
"homepage": "http://blog.evan.pro/"
18-
},
19-
{
20-
"name": "Eric Boh",
21-
"email": "cossish@gmail.com"
22-
}
23-
],
24-
"extra": {
25-
"branch-alias": {
26-
"dev-master": "1.1-dev",
27-
"dev-develop": "1.2-dev"
28-
},
29-
"zf": {
30-
"module": "ZendDeveloperTools"
31-
}
12+
"support": {
13+
"issues": "https://github.com/zendframework/ZendDeveloperTools/issues",
14+
"source": "https://github.com/zendframework/ZendDeveloperTools",
15+
"rss": "https://github.com/zendframework/ZendDeveloperTools/releases.atom",
16+
"chat": "https://zendframework-slack.herokuapp.com",
17+
"forum": "https://discourse.zendframework.com/c/questions/components"
3218
},
3319
"require": {
3420
"php": "^5.6 || ^7.0",
@@ -42,7 +28,7 @@
4228
},
4329
"require-dev": {
4430
"phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1",
45-
"squizlabs/php_codesniffer": "~2.3.1"
31+
"zendframework/zend-coding-standard": "~1.0.0"
4632
},
4733
"suggest": {
4834
"bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.",
@@ -63,15 +49,37 @@
6349
"ZendDeveloperToolsTest\\": "test/"
6450
}
6551
},
52+
"config": {
53+
"sort-packages": true
54+
},
55+
"extra": {
56+
"branch-alias": {
57+
"dev-master": "1.1.x-dev",
58+
"dev-develop": "1.2.x-dev"
59+
},
60+
"zf": {
61+
"module": "ZendDeveloperTools"
62+
}
63+
},
6664
"scripts": {
6765
"check": [
68-
"@cs",
66+
"@cs-check",
6967
"@test"
7068
],
71-
"coveralls": "coveralls",
72-
"cs": "phpcs",
69+
"cs-check": "phpcs",
7370
"cs-fix": "phpcbf",
74-
"test": "phpunit",
75-
"test-coverage": "phpunit --coverage-clover clover.xml"
76-
}
71+
"test": "phpunit --colors=always",
72+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
73+
},
74+
"authors": [
75+
{
76+
"name": "Evan Coury",
77+
"email": "me@evancoury.com",
78+
"homepage": "http://blog.evan.pro/"
79+
},
80+
{
81+
"name": "Eric Boh",
82+
"email": "cossish@gmail.com"
83+
}
84+
]
7785
}

0 commit comments

Comments
 (0)