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

Commit

Permalink
Merge branch 'hotfix/qa-tools'
Browse files Browse the repository at this point in the history
Close #245
  • Loading branch information
weierophinney committed Apr 17, 2018
2 parents 88776b4 + 70db3d5 commit 5760449
Show file tree
Hide file tree
Showing 56 changed files with 882 additions and 596 deletions.
2 changes: 2 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
coverage_clover: clover.xml
json_path: coveralls-upload.json
18 changes: 9 additions & 9 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/doc export-ignore
/test export-ignore
/vendor export-ignore
.coveralls.yml export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
phpcs.xml export-ignore
phpunit.xml.dist export-ignore
/.coveralls.yml export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/composer.lock export-ignore
/docs/ export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/test/ export-ignore
11 changes: 4 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
nbproject
.idea
.buildpath
.project
.settings/
.DS_Store
vendor/
/clover.xml
/coveralls-upload.json
/phpunit.xml
/vendor/
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ install:

script:
- composer test
- if [[ $CS_CHECK == 'true' ]]; then composer cs ; fi
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
18 changes: 9 additions & 9 deletions LICENSE.txt → LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
Copyright (c) 2011-2018, Zend Technologies USA, Inc.
All rights reserved.

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

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

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

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

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# Zend Developer Tools

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

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

Expand All @@ -17,6 +18,7 @@ Module providing debug tools for use with [zend-mvc](https://docs.zendframework.
2. Add the `ZendDeveloperTools` module to the module section of your `config/application.config.php`.
Starting with version 1.1.0, if you are using [zend-component-installer](https://docs.zendframework.com/zend-component-installer),
this will be done for you automatically.

3. Copy `./vendor/zendframework/zend-developer-tools/config/zenddevelopertools.local.php.dist` to
`./config/autoload/zenddevelopertools.local.php`. Change any settings in it
according to your needs.
Expand Down
66 changes: 37 additions & 29 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,34 +1,20 @@
{
"name": "zendframework/zend-developer-tools",
"description": "Module for developer and debug tools for use with zend-mvc applications.",
"type": "library",
"license": "BSD-3-Clause",
"keywords": [
"zendframework",
"debug",
"developer",
"zf2",
"zf",
"module"
],
"homepage": "https://github.com/zendframework/ZendDeveloperTools",
"authors": [
{
"name": "Evan Coury",
"email": "[email protected]",
"homepage": "http://blog.evan.pro/"
},
{
"name": "Eric Boh",
"email": "[email protected]"
}
],
"extra": {
"branch-alias": {
"dev-master": "1.1-dev",
"dev-develop": "1.2-dev"
},
"zf": {
"module": "ZendDeveloperTools"
}
"support": {
"issues": "https://github.com/zendframework/ZendDeveloperTools/issues",
"source": "https://github.com/zendframework/ZendDeveloperTools",
"rss": "https://github.com/zendframework/ZendDeveloperTools/releases.atom",
"chat": "https://zendframework-slack.herokuapp.com",
"forum": "https://discourse.zendframework.com/c/questions/components"
},
"require": {
"php": "^5.6 || ^7.0",
Expand All @@ -42,7 +28,7 @@
},
"require-dev": {
"phpunit/phpunit": "^5.7.25 || ^6.4.4 || ^7.1",
"squizlabs/php_codesniffer": "~2.3.1"
"zendframework/zend-coding-standard": "~1.0.0"
},
"suggest": {
"bjyoungblood/bjy-profiler": "Version: dev-master, allows the usage of the (Zend) Db collector.",
Expand All @@ -63,15 +49,37 @@
"ZendDeveloperToolsTest\\": "test/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev",
"dev-develop": "1.2.x-dev"
},
"zf": {
"module": "ZendDeveloperTools"
}
},
"scripts": {
"check": [
"@cs",
"@cs-check",
"@test"
],
"coveralls": "coveralls",
"cs": "phpcs",
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit",
"test-coverage": "phpunit --coverage-clover clover.xml"
}
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
"authors": [
{
"name": "Evan Coury",
"email": "[email protected]",
"homepage": "http://blog.evan.pro/"
},
{
"name": "Eric Boh",
"email": "[email protected]"
}
]
}
Loading

0 comments on commit 5760449

Please sign in to comment.