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

Commit 2212dfa

Browse files
weierophinneyweierophinney
committed
Merging develop to master in preparation for 2.7.0 release.
2 parents 0f9e62f + 7140f8a commit 2212dfa

Some content is hidden

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

53 files changed

+2252
-494
lines changed

‎.coveralls.yml

-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
coverage_clover: clover.xml
22
json_path: coveralls-upload.json
3-
src_dir: src

‎.gitattributes

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
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-
.php_cs export-ignore
8-
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+
/mkdocs.yml export-ignore
8+
/phpcs.xml export-ignore
9+
/phpunit.xml.dist export-ignore
10+
/test/ export-ignore

‎.gitignore

+7-17
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/

‎.php_cs

-45
This file was deleted.

‎.travis.yml

+46-46
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,75 @@ 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-tag
19-
- GH_USER_NAME: "Matthew Weier O'Phinney"
20-
- GH_USER_EMAIL: matthew@weierophinney.net
21-
- GH_REF: github.com/zendframework/zend-tag.git
22-
- secure: "S3bpXlpY3uBhHXbfvInuHEfcD62cQsKgA0KWzOMhrEsyUvlUYceGUAEpX4ll9ZR9MR0rDKNPYFOlAOFX32P9gomK9laRdbWfy6CV0Qb/uPjPuq/8dx6fvTiNrGSt00Qs+fQikOs12v+P3IGwX8wuJLd30zjhuSRA8leQzF1gsbfUhSkTy6P+FkuqvCdw1uFflBje/88bWvv9s+vfB094LSN0iSmF3QU1RquGCStcwXC7nUuwKceTwjJ6HmXbvMT2cq2Gn4EQG+1ytKZICxXQ8NM+tWFhNPPRO0EMIu6EFi5825zeT/9AhbxhGJnnwfDU6hvbmcqdJnLO5LTBAzXg5XDUw/LSvSQp/4toSfpmuyVtBlnUFUsMjjS31K5kwegbtjHjuLOr7rKTGZbqAvYzAHFOnFDqSjwQhEgD43+ah8b58qzmtXN/iCH/rDS1XQ+BR1XrUJpQy308/Vqb0uVnSFAj/HH/BlIKFscDMxQhbZy9j6rJgvltIC3OCCDsor34mZC0lb0mK+OW9bL+FFySSkvLO5FI0idHn5K6wevT82x9fAA7sAoAJvmxKeAYqXZY360DLVfGsvXhxKUIeU1q59Rrxzix5i8MCiokb2tjFQfd0G2FxcaHehnnBu0GxAGSEu0ClJIXQzxp3Q9jNHHG2Ntm90E9nt55Fh2Z138W0qQ="
11+
- COMPOSER_ARGS="--no-interaction"
12+
- COVERAGE_DEPS="php-coveralls/php-coveralls"
2313

2414
matrix:
25-
fast_finish: true
2615
include:
27-
- php: 5.5
28-
env:
29-
- EXECUTE_CS_CHECK=true
30-
- php: 5.5
16+
- php: 5.6
3117
env:
32-
- SERVICE_MANAGER_VERSION='^2.7.5'
18+
- DEPS=lowest
3319
- php: 5.6
3420
env:
35-
- EXECUTE_TEST_COVERALLS=true
36-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
37-
- PATH="$HOME/.local/bin:$PATH"
21+
- DEPS=locked
22+
- LEGACY_DEPS="phpunit/phpunit"
3823
- php: 5.6
3924
env:
40-
- SERVICE_MANAGER_VERSION='^2.7.5'
25+
- DEPS=latest
4126
- php: 7
27+
env:
28+
- DEPS=lowest
4229
- php: 7
4330
env:
44-
- SERVICE_MANAGER_VERSION='^2.7.5'
45-
- php: hhvm
46-
- php: hhvm
31+
- DEPS=locked
32+
- LEGACY_DEPS="phpunit/phpunit"
33+
- php: 7
4734
env:
48-
- SERVICE_MANAGER_VERSION='^2.7.5'
49-
allow_failures:
50-
- php: hhvm
51-
52-
notifications:
53-
irc: "irc.freenode.org#zftalk.dev"
54-
email: false
35+
- DEPS=latest
36+
- php: 7.1
37+
env:
38+
- DEPS=lowest
39+
- php: 7.1
40+
env:
41+
- DEPS=locked
42+
- CS_CHECK=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
5556

5657
before_install:
57-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
58-
- composer self-update
59-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
60-
- if [[ $SERVICE_MANAGER_VERSION != '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:$SERVICE_MANAGER_VERSION" ; fi
61-
- if [[ $SERVICE_MANAGER_VERSION == '' ]]; then composer require --dev --no-update "zendframework/zend-servicemanager:^3.0.3" ; fi
58+
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
6259

6360
install:
64-
- 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
6567

6668
script:
67-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
68-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
69-
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
70-
- 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
71-
72-
after_success:
73-
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
69+
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
70+
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
7471

7572
after_script:
76-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi
73+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
74+
75+
notifications:
76+
email: false

‎CHANGELOG.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22

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

5-
## 2.6.2 - TBD
5+
## 2.7.0 - 2018-04-30
66

77
### Added
88

9+
- [#21](https://github.com/zendframework/zend-tag/pull/21) adds support for PHP 7.1 and 7.2.
10+
11+
### Changed
12+
913
- Nothing.
1014

1115
### Deprecated
@@ -14,7 +18,9 @@ All notable changes to this project will be documented in this file, in reverse
1418

1519
### Removed
1620

17-
- Nothing.
21+
- [#21](https://github.com/zendframework/zend-tag/pull/21) removes support for PHP 5.5.
22+
23+
- [#21](https://github.com/zendframework/zend-tag/pull/21) removes support for HHVM.
1824

1925
### Fixed
2026

‎LICENSE.md

+6-7
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# zend-tag
22

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

66
`Zend\Tag` is a component suite which provides a facility to work with taggable
77
Items. As its base, it provides two classes to work with Tags, `Zend\Tag\Item`
@@ -11,4 +11,4 @@ taggable item in conjunction with `Zend\Tag`.
1111

1212

1313
- File issues at https://github.com/zendframework/zend-tag/issues
14-
- Documentation is at https://zendframework.github.io/zend-tag/
14+
- Documentation is at https://docs.zendframework.com/zend-tag/

‎composer.json

+35-16
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,60 @@
11
{
22
"name": "zendframework/zend-tag",
3-
"description": "a component suite which provides a facility to work with taggable Items",
3+
"description": "Manipulate and weight taggable items, and create tag clouds",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"tag"
89
],
9-
"homepage": "https://github.com/zendframework/zend-tag",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\Tag\\": "src/"
13-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-tag/",
12+
"issues": "https://github.com/zendframework/zend-tag/issues",
13+
"source": "https://github.com/zendframework/zend-tag",
14+
"rss": "https://github.com/zendframework/zend-tag/releases.atom",
15+
"chat": "https://zendframework-slack.herokuapp.com",
16+
"forum": "https://discourse.zendframework.com/c/questions/components"
1417
},
1518
"require": {
16-
"php": "^5.5 || ^7.0",
19+
"php": "^5.6 || ^7.0",
1720
"zendframework/zend-escaper": "^2.5",
1821
"zendframework/zend-stdlib": "^2.7 || ^3.0"
1922
},
2023
"require-dev": {
2124
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
22-
"fabpot/php-cs-fixer": "1.7.*",
23-
"phpunit/PHPUnit": "~4.0"
25+
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4",
26+
"zendframework/zend-coding-standard": "~1.0.0"
2427
},
2528
"suggest": {
2629
"zendframework/zend-servicemanager": "Zend\\ServiceManager component"
2730
},
28-
"minimum-stability": "dev",
29-
"prefer-stable": true,
30-
"extra": {
31-
"branch-alias": {
32-
"dev-master": "2.6-dev",
33-
"dev-develop": "2.7-dev"
31+
"autoload": {
32+
"psr-4": {
33+
"Zend\\Tag\\": "src/"
3434
}
3535
},
3636
"autoload-dev": {
3737
"psr-4": {
3838
"ZendTest\\Tag\\": "test/"
3939
}
40+
},
41+
"config": {
42+
"sort-packages": true
43+
},
44+
"extra": {
45+
"branch-alias": {
46+
"dev-master": "2.7.x-dev",
47+
"dev-develop": "2.8.x-dev"
48+
}
49+
},
50+
"scripts": {
51+
"check": [
52+
"@cs-check",
53+
"@test"
54+
],
55+
"cs-check": "phpcs",
56+
"cs-fix": "phpcbf",
57+
"test": "phpunit --colors=always",
58+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
4059
}
4160
}

0 commit comments

Comments
 (0)