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

Commit 716a16e

Browse files
weierophinneyweierophinney
committed
Merging develop to master in preparation for 2.7.0 release.
2 parents 245d75d + bd79f0e commit 716a16e

33 files changed

+1951
-311
lines changed

‎.coveralls.yml‎

Lines changed: 0 additions & 1 deletion
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‎

Lines changed: 10 additions & 8 deletions
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‎

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/

‎.php_cs‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 50 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,75 @@ sudo: false
22

33
language: php
44

5-
branches:
6-
except:
7-
- /^release-\d+\.\d+\.\d+.*$/
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-dom
19-
- GH_USER_NAME: "Matthew Weier O'Phinney"
20-
- GH_USER_EMAIL: matthew@weierophinney.net
21-
- GH_REF: github.com/zendframework/zend-dom.git
22-
- secure: "s5/0nwMgJT6tDIAdPNbQhre95SCbs3LZf6o6rj4aX39LWyBCWFwI2VuRoh+2NQdhmAiwtE5YNmXeuL27MAQHCy6vfQkkE4cNmQa/vFwBr+ewUKjjCRrdAPoymq6D6G4Txk3Mu45juWb/O6fXZjWWUPMSwfC9CZX+J4rZzvQS3tnOyKk79gHf3P36dZwvzUe7XDcM98SFQIVCl8CXrNX5aQFcfDozaC+6k+hw4J5cyHKMBKVD0cb4cCKwmiLn9htJU8xOeL5DM9L4+zXroM3fmNpDPS3iXjhqgkAHU2c9zmJsf6pl0GLERYXpo8nd3Y/I9D5BCf7Qs5EgypEqJi41WhZ7OKZL7bBgIMP9hNQo5KTfc1Myu6JRzh4E8MwCSV5glMeEbEoX3SGtDcYfORxl2I8lSD5dRo/5E28SieKAVoZrkWHAtXJtRrx7vVOZ7hYvYUo53N7iTdY/7vzBewrbjTdzVUaHe+/S9OIFiLrAoYmlOGdX4b+q6Wly1m4P9i8CVHqDoVgVRA7F/qx3g0EK97HAI6wgiiMPPwWqZFRsGbXmaUHk4Fc/wkwuCjHWpw+2V3H8MTU0nQoU7ew5AFKKvm0d8erINoApGJziLYprcX79G1VzlHPWeCI3qi8j3r/5HQy5amEMCgUy9gyuFkFG/IAx/k9K36TmIjEtvudzt2o="
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
16+
- php: 5.6
17+
env:
18+
- DEPS=lowest
19+
- php: 5.6
2820
env:
29-
- EXECUTE_CS_CHECK=true
21+
- DEPS=locked
22+
- LEGACY_DEPS="phpunit/phpunit"
3023
- php: 5.6
3124
env:
32-
- EXECUTE_TEST_COVERALLS=true
33-
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
34-
- PATH="$HOME/.local/bin:$PATH"
25+
- DEPS=latest
3526
- php: 7
36-
- php: hhvm
37-
allow_failures:
27+
env:
28+
- DEPS=lowest
3829
- php: 7
39-
- php: hhvm
40-
41-
notifications:
42-
irc: "irc.freenode.org#zftalk.dev"
43-
email: false
30+
env:
31+
- DEPS=locked
32+
- LEGACY_DEPS="phpunit/phpunit"
33+
- php: 7
34+
env:
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
4456

4557
before_install:
46-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
47-
- composer self-update
48-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer require --dev --no-update satooshi/php-coveralls ; fi
58+
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
4959

5060
install:
51-
- 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
5267

5368
script:
54-
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
55-
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
56-
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
57-
- 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
58-
59-
after_success:
60-
- 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 run-script test-coverage --timeout=400 -- --verbose ; else composer run-script test --timeout=300 -- --verbose ; fi
70+
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
6171

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

‎CHANGELOG.md‎

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

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

5+
## 2.7.0 - TBD
6+
7+
### Added
8+
9+
- [#20](https://github.com/zendframework/zend-dom/pull/4) adds support for
10+
attribute selectors that contain spaces, such as `input[value="Marty McFly"]`.
11+
Previously, spaces within the selector value would result in a query per
12+
space-separated word; they now, correctly, result in a single query for the
13+
exact value.
14+
15+
- [#19](https://github.com/zendframework/zend-dom/pull/4) adds support for PHP
16+
versions 7.1 and 7.2.
17+
18+
### Deprecated
19+
20+
- Nothing.
21+
22+
### Removed
23+
24+
- [#13](https://github.com/zendframework/zend-dom/pull/4) and
25+
[#19](https://github.com/zendframework/zend-dom/pull/4) remove support for PHP
26+
versions prior to 5.6.
27+
28+
- [#13](https://github.com/zendframework/zend-dom/pull/4) and
29+
[#19](https://github.com/zendframework/zend-dom/pull/4) remove support for HHVM.
30+
31+
### Fixed
32+
33+
- Nothing.
34+
535
## 2.6.1 - TBD
636

737
### 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-2017, 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,12 +1,12 @@
11
# zend-dom
22

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

66
The `Zend\Dom` component provides tools for working with DOM documents and
77
structures. Currently, we offer `Zend\Dom\Query`, which provides a unified
88
interface for querying DOM documents utilizing both XPath and CSS selectors.
99

1010

1111
- File issues at https://github.com/zendframework/zend-dom/issues
12-
- Documentation is at http://framework.zend.com/manual/current/en/index.html#zend-dom
12+
- Documentation is at https://docs.zendframework.com/zend-dom

‎composer.json‎

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,52 @@
33
"description": "provides tools for working with DOM documents and structures",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"dom"
89
],
9-
"homepage": "https://github.com/zendframework/zend-dom",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\Dom\\": "src/"
13-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-dom/",
12+
"issues": "https://github.com/zendframework/zend-dom/issues",
13+
"source": "https://github.com/zendframework/zend-dom",
14+
"rss": "https://github.com/zendframework/zend-dom/releases.atom",
15+
"slack": "https://zendframework-slack.herokuapp.com",
16+
"forum": "https://discourse.zendframework.com/c/questions/components"
1417
},
1518
"require": {
16-
"php": ">=5.5"
19+
"php": "^5.6 || ^7.0"
1720
},
18-
"minimum-stability": "dev",
19-
"prefer-stable": true,
20-
"extra": {
21-
"branch-alias": {
22-
"dev-master": "2.5-dev",
23-
"dev-develop": "2.6-dev"
21+
"require-dev": {
22+
"phpunit/phpunit": "^5.7.23 || ^6.4.3",
23+
"zendframework/zend-coding-standard": "~1.0.0"
24+
},
25+
"autoload": {
26+
"psr-4": {
27+
"Zend\\Dom\\": "src/"
2428
}
2529
},
2630
"autoload-dev": {
2731
"psr-4": {
2832
"ZendTest\\Dom\\": "test/"
2933
}
3034
},
31-
"require-dev": {
32-
"fabpot/php-cs-fixer": "1.7.*",
33-
"phpunit/PHPUnit": "~4.0"
35+
"config": {
36+
"sort-packages": true
37+
},
38+
"extra": {
39+
"branch-alias": {
40+
"dev-master": "2.6-dev",
41+
"dev-develop": "2.7-dev"
42+
}
43+
},
44+
"scripts": {
45+
"check": [
46+
"@cs-check",
47+
"@test"
48+
],
49+
"cs-check": "phpcs",
50+
"cs-fix": "phpcbf",
51+
"test": "phpunit --colors=always",
52+
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
3453
}
35-
}
54+
}

0 commit comments

Comments
 (0)