8000 Merge branch 'feature/85' into develop · zendframework/zend-stdlib@a8f2e8b · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jan 31, 2020. It is now read-only.

Commit a8f2e8b

Browse files
weierophinneyweierophinney
committed
Merge branch 'feature/85' into develop
Close #85
2 parents d38d39f + 802516f commit a8f2e8b

24 files changed

+351
-398
lines changed

‎.gitattributes

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
/test export-ignore
2-
/vendor export-ignore
3-
.coveralls.yml export-ignore
4-
.gitattributes export-ignore
5-
.gitignore export-ignore
6-
.travis.yml export-ignore
7-
.composer.lock export-ignore
8-
phpbench.json 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+
/benchmark/ export-ignore
6+
/composer.lock export-ignore
7+
/docs/ export-ignore
8+
/mkdocs.yml export-ignore
9+
/phpbench.json export-ignore
10+
/phpcs.xml export-ignore
11+
/phpunit.xml.dist export-ignore
12+
/test/ export-ignore

‎.gitignore

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
.buildpath
2-
.DS_Store
3-
.idea
4-
.project
5-
.settings/
6-
.*.sw*
7-
.*.un~
8-
nbproject
9-
doc/html/
10-
tmp/
11-
zf-mkdoc-theme/
12-
13-
clover.xml
14-
coveralls-upload.json
15-
phpunit.xml
16-
vendor
1+
/clover.xml
2+
/coveralls-upload.json
3+
/docs/html/
4+
/phpunit.xml
5+
/vendor/
6+
/zf-mkdoc-theme.tgz
7+
/zf-mkdoc-theme/

‎.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ cache:
99
env:
1010
global:
1111
- COMPOSER_ARGS="--no-interaction"
12-
- COVERAGE_DEPS="satooshi/php-coveralls"
12+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
1313

1414
matrix:
1515
include:
@@ -57,7 +57,6 @@ matrix:
5757

5858
before_install:
5959
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
60-
- travis_retry composer self-update
6160

6261
install:
6362
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
@@ -73,7 +72,7 @@ script:
7372
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
7473

7574
after_script:
76-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
75+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
7776

7877
notifications:
7978
email: false

‎LICENSE.md

Lines changed: 6 additions & 7 deletions
9E88
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
Copyright (c) 2005-2015, Zend Technologies USA, Inc.
2-
1+
Copyright (c) 2005-2018, Zend Technologies USA, Inc.
32
All rights reserved.
43

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

8-
- Redistributions of source code must retain the above copyright notice,
9-
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.
109

11-
- Redistributions in binary form must reproduce the above copyright notice,
12-
this list of conditions and the following disclaimer in the documentation
13-
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.
1413

1514
- Neither the name of Zend Technologies USA, Inc. nor the names of its
1615
contributors may be used to endorse or promote products derived from this

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# zend-stdlib
22

33
[![Build Status](https://secure.travis-ci.org/zendframework/zend-stdlib.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-stdlib)
4-
[![Coverage Status](https://coveralls.io/repos/zendframework/zend-stdlib/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-stdlib?branch=master)
4+
[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-stdlib/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-stdlib?branch=master)
55

66
`Zend\Stdlib` is a set of components that implements general purpose utility
77
class for different scopes like:
@@ -20,7 +20,7 @@ class for different scopes like:
2020

2121
We provide scripts for benchmarking zend-stdlib using the
2222
[PHPBench](https://github.com/phpbench/phpbench) framework; these can be
23-
found in the `benchmarks/` directory.
23+
found in the `benchmark/` directory.
2424

2525
To execute the benchmarks you can run the following command:
2626

‎benchmarks/ExtractPriorityQueueBench.php renamed to ‎benchmark/ExtractPriorityQueueBench.php

File renamed without changes.

‎benchmarks/InsertPriorityQueueBench.php renamed to ‎benchmark/InsertPriorityQueueBench.php

File renamed without changes.

‎benchmarks/RemovePriorityQueueBench.php renamed to ‎benchmark/RemovePriorityQueueBench.php

File renamed without changes.

‎composer.json

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
11
{
22
"name": "zendframework/zend-stdlib",
3-
"description": " ",
3+
"description": "SPL extensions, array utilities, error handlers, and more",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"stdlib"
89
],
9-
"homepage": "https://github.com/zendframework/zend-stdlib",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\Stdlib\\": "src/"
13-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-stdlib/",
12+
"issues": "https://github.com/zendframework/zend-stdlib/issues",
13+
"source": "https://github.com/zendframework/zend-stdlib",
14+
"rss": "https://github.com/zendframework/zend-stdlib/releases.atom",
15+
"slack": "https://zendframework-slack.herokuapp.com",
16+
"forum": "https://discourse.zendframework.com/c/questions/components"
1417
},
1518
"require": {
1619
"php": "^5.6 || ^7.0"
1720
},
1821
"require-dev": {
1922
"phpbench/phpbench": "^0.13",
20-
"phpunit/PHPUnit": "^5.7.21 || ^6.3",
23+
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
2124
"zendframework/zend-coding-standard": "~1.0.0"
2225
},
23-
"extra": {
24-
"branch-alias": {
25-
"dev-master": "3.1-dev",
26-
"dev-develop": "3.2-dev"
26+
"autoload": {
27+
"psr-4": {
28+
"Zend\\Stdlib\\": "src/"
2729
}
2830
},
2931
"autoload-dev": {
@@ -32,6 +34,15 @@
3234
"ZendBench\\Stdlib\\": "benchmark/"
3335
}
3436
},
37+
"config": {
38+
"sort-packages": true
39+
},
40+
"extra": {
41+
"branch-alias": {
42+
"dev-master": "3.1.x-dev",
43+
"dev-develop": "3.2.x-dev"
44+
}
45+
},
3546
"scripts": {
3647
"check": [
3748
"@cs-check",
@@ -40,7 +51,6 @@
4051
"cs-check": "phpcs",
4152
"cs-fix": "phpcbf",
4253
"test": "phpunit --colors=always",
43-
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
44-
"upload-coverage": "coveralls -v"
54+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
4555
}
4656
}

0 commit comments

Comments
 (0)
0