8000 Merging develop to master in preparation for 3.2.0 release · zendframework/zend-stdlib@713c1a0 · 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 713c1a0

Browse files
weierophinneyweierophinney
committed
Merging develop to master in preparation for 3.2.0 release
2 parents 10ef031 + 2d63b94 commit 713c1a0

Some content is hidden

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

45 files changed

+3020
-470
lines changed

‎.gitattributes

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +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-
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 & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +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-
composer.lock
15-
coveralls-upload.json
16-
phpunit.xml
17-
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: 49 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,59 +2,76 @@ sudo: false
22

33
language: php
44

5-
branches:
6-
except:
7-
- /^release-.*$/
8-
- /^ghgfk-.*$/
9-
105
cache:
116
directories:
127
- $HOME/.composer/cache
13-
- $HOME/.local
14-
- zf-mkdoc-theme
158

169
env:
1710
global:
18-
- SITE_URL: https://zendframework.github.io/zend-stdlib
19-
- GH_USER_NAME: "Matthew Weier O'Phinney"
20-
- GH_USER_EMAIL: matthew@weierophinney.net
21-
- GH_REF: github.com/zendframework/zend-stdlib.git
22-
- secure: "l+YU9Igd9IUA60PE+iC4AZt2hHY9hpsSB7S2jck9fjPm0+15UCGk2G1qg5hCi+FlPslXhk6wOLLDPc40BiCrwH+m5CP9cIdkGTuNc9rVF9S5IiRLkOVxeTcdE+JRm7hZ2NBgxEiTuBLs5RlN39o41zPDFllgnJv69UmmUIMHuG3NwJJiRE9NA2EMIhZwx3UT/Zqq94MzAbYXi2xspoQ53Z/rfvVSJK6tdARp31q4NWvlYsc2YVcEWv+j3VY5luMSCMVQVNBIuXdd0hYpGt2o3H6S9azzcKRQB7saoAT/tiAEj5121tv3j3cKNQQMzI4xv7RrtQEiAhumeU3AsVDyqBmqqUQNwpnWH0RZdRry4jUKJgx0TK0yZH8ewdz6DhktBqS+c2a/FzfO3yc+LeuIy3i73NezNwCgwviOBYbWPAo4LqKtJ7gdTbVVdJaUeCtKTZ1b1k4MtaxjZjz0IK5+rxJsZ1DQF5fhJIzkjXqEEON2mHQu/qE+I7ow4Jvfs0T+KYJW6Yf5qFzBkrTUNjV60rmawaEjgxgMvtwN+MvcQ/X2OWkdjdzqzQIDdjssdRu9IBPU/G2uqzS8POL9o1j8H3NE430Tsbg+jiENlqmU+ra5wuRrmTBToli1kpgl9LyhgvjGokxAB+mwwKv7FiIQtBmSgEvsD112eSYl3HVWpdE="
11+
- COMPOSER_ARGS="--no-interaction"
12+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
2313

2414
matrix:
2515
include:
2616
- php: 5.6
2717
env:
28-
- TEST_COVERAGE=true
29-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
30-
- PATH="$HOME/.local/bin:$PATH"
18+
- DEPS=lowest
19+
- php: 5.6
20+
env:
21+
- DEPS=locked
22+
- php: 5.6
23+
env:
24+
- DEPS=latest
3125
- php: 7
3226
env:
27+
- DEPS=lowest
28+
- php: 7
29+
env:
30+
- DEPS=locked
31+
- LEGACY_DEPS="phpbench/phpbench phpunit/phpunit"
32+
- php: 7
33+
env:
34+
- DEPS=latest
35+
- php: 7.1
36+
env:
37+
- DEPS=lowest
38+
- php: 7.1
39+
env:
40+
- DEPS=locked
3341
- CS_CHECK=true
34-
- php: hhvm
35-
allow_failures:
36-
- php: hhvm
37-
38-
notifications:
39-
irc: "irc.freenode.org#zftalk.dev"
40-
email: false
42+
- BENCHMARKS=true
43+
- TEST_COVERAGE=true
44+
- php: 7.1
45+
env:
46+
- DEPS=latest
47+
- php: 7.2
48+
env:
49+
- DEPS=lowest
50+
- php: 7.2
51+
env:
52+
- DEPS=locked
53+
- php: 7.2
54+
env:
55+
- DEPS=latest
4156

4257
before_install:
4358
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
44-
- composer self-update
45-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
4659

4760
install:
48-
- travis_retry composer install --no-interaction --ignore-platform-reqs
61+
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
62+
- if [[ $LEGACY_DEPS != '' ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
63+
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
64+
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
65+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
66+
- stty cols 120 && composer show
4967

5068
script:
51-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi
52-
- if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi
69+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
70+
- if [[ $BENCHMARKS == 'true' ]]; then vendor/bin/phpbench run --revs=2 --iterations=2 --report=aggregate ; fi
5371
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
54-
- if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then wget -O theme-installer.sh "https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh" ; chmod 755 theme-installer.sh ; ./theme-installer.sh ; fi
55-
56-
after_success:
57-
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
5872

5973
after_script:
60-
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
74+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
75+
76+
notifications:
77+
email: false

‎CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,28 @@
22

33
All notable changes to this project will be documented in this file, in reverse chronological order by release.
44

5+
## 3.2.0 - TBD
6+
7+
### Added
8+
9+
- [#87](https://github.com/zendframework/zend-stdlib/pull/87) adds support for PHP 7.2.
10+
11+
### Changed
12+
13+
- Nothing.
14+
15+
### Deprecated
16+
17+
- Nothing.
18+
19+
### Removed
20+
21+
- [#87](https://github.com/zendframework/zend-stdlib/pull/87) removes support for HHVM.
22+
23+
### Fixed
24+
25+
- Nothing.
26+
527
## 3.1.1 - 2018-04-12
628

729
### Added

‎LICENSE.md

Lines changed: 6 additions & 7 deletions
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: 13 additions & 1 deletion
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:
@@ -15,3 +15,15 @@ class for different scopes like:
1515

1616
- File issues at https://github.com/zendframework/zend-stdlib/issues
1717
- Documentation is at https://docs.zendframework.com/zend-stdlib/
18+
19+
## Benchmarks
20+
21+
We provide scripts for benchmarking zend-stdlib using the
22+
[PHPBench](https://github.com/phpbench/phpbench) framework; these can be
23+
found in the `benchmark/` directory.
24+
25+
To execute the benchmarks you can run the following command:
26+
27+
```bash
28+
$ vendor/bin/phpbench run --report=aggregate
29+
```

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

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,21 @@
99

1010
namespace ZendBench\Stdlib;
1111

12-
use Athletic\AthleticEvent;
12+
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
13+
use PhpBench\Benchmark\Metadata\Annotations\Revs;
14+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
1315
use Zend\Stdlib\FastPriorityQueue;
1416
use Zend\Stdlib\PriorityQueue;
1517
use Zend\Stdlib\SplPriorityQueue;
1618

17-
class ExtractPriorityQueue extends AthleticEvent
19+
/**
20+
* @Revs(1000)
21+
* @Iterations(10)
22+
* @Warmup(2)
23+
*/
24+
class ExtractPriorityQueueBench
1825
{
19-
public function classSetUp()
26+
public function __construct()
2027
{
2128
$this->splPriorityQueue = new SplPriorityQueue();
2229
$this->fastPriorityQueue = new FastPriorityQueue();
@@ -30,26 +37,17 @@ public function classSetUp()
3037
}
3138
}
3239

33-
/**
34-
* @iterations 5000
35-
*/
36-
public function extractSplPriorityQueue()
40+
public function benchExtractSplPriorityQueue()
3741
{
3842
$this->splPriorityQueue->extract();
3943
}
4044

41-
/**
42-
* @iterations 5000
43-
*/
44-
public function extractPriorityQueue()
45+
public function benchExtractPriorityQueue()
4546
{
4647
$this->priorityQueue->extract();
4748
}
4849

49-
/**
50-
* @iterations 5000
51-
*/
52-
public function extractFastPriorityQueue()
50+
public function benchExtractFastPriorityQueue()
5351
{
5452
$this->fastPriorityQueue->extract();
5553
}

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

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,38 @@
99

1010
namespace ZendBench\Stdlib;
1111

12-
use Athletic\AthleticEvent;
12+
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
13+
use PhpBench\Benchmark\Metadata\Annotations\Revs;
14+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
1315
use Zend\Stdlib\FastPriorityQueue;
1416
use Zend\Stdlib\PriorityQueue;
1517
use Zend\Stdlib\SplPriorityQueue;
1618

17-
class InsertPriorityQueue extends AthleticEvent
19+
/**
20+
* @Revs(1000)
21+
* @Iterations(10)
22+
* @Warmup(2)
23+
*/
24+
class InsertPriorityQueueBench
1825
{
19-
public function classSetUp()
26+
public function __construct()
2027
{
2128
$this->splPriorityQueue = new SplPriorityQueue();
2229
$this->fastPriorityQueue = new FastPriorityQueue();
2330
$this->priorityQueue = new PriorityQueue();
2431
}
2532

26-
/**
27-
* @iterations 5000
28-
*/
29-
public function insertSplPriorityQueue()
33+
public function benchInsertSplPriorityQueue()
3034
{
3135
$this->splPriorityQueue->insert('foo', rand(1, 100));
3236
}
3337

34-
/**
35-
* @iterations 5000
36-
*/
37-
public function insertPriorityQueue()
38+
public function benchInsertPriorityQueue()
3839
{
3940
$this->priorityQueue->insert('foo', rand(1, 100));
4041
}
4142

42-
/**
43-
* @iterations 5000
44-
*/
45-
public function insertFastPriorityQueue()
43+
public function benchInsertFastPriorityQueue()
4644
{
4745
$this->fastPriorityQueue->insert('foo', rand(1, 100));
4846
}

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,20 @@
99

1010
namespace ZendBench\Stdlib;
1111

12-
use Athletic\AthleticEvent;
12+
use PhpBench\Benchmark\Metadata\Annotations\Iterations;
13+
use PhpBench\Benchmark\Metadata\Annotations\Revs;
14+
use PhpBench\Benchmark\Metadata\Annotations\Warmup;
1315
use Zend\Stdlib\FastPriorityQueue;
1416
use Zend\Stdlib\PriorityQueue;
1517

16-
class RemovePriorityQueue extends AthleticEvent
18+
/**
19+
* @Revs(1000)
20+
* @Iterations(10)
21+
* @Warmup(2)
22+
*/
23+
class RemovePriorityQueueBench
1724
{
18-
public function classSetUp()
25+
public function __construct()
1926
{
2027
$this->fastPriorityQueue = new FastPriorityQueue();
2128
$this->priorityQueue = new PriorityQueue();
@@ -27,18 +34,12 @@ public function classSetUp()
2734
}
2835
}
2936

30-
/**
31-
* @iterations 1000
32-
*/
33-
public function removePriorityQueue()
37+
public function benchRemovePriorityQueue()
3438
{
3539
$this->priorityQueue->remove('foo');
3640
}
3741

38-
/**
39-
* @iterations 1000
40-
*/
41-
public function removeFastPriorityQueue()
42+
public function benchRemoveFastPriorityQueue()
4243
{
4344
$this->fastPriorityQueue->remove('foo');
4445
}

0 commit comments

Comments
 (0)
0