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

Commit 2904fcd

Browse files
marc-mabemarc-mabe
committed
Merge branch 'hotfix/34', Close #34 
2 parents 7ac42b9 + 4bcc8fb commit 2904fcd

31 files changed

+544
-414
lines changed

‎.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-
phpcs.xml 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 & 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-
vendor/
12-
zf-mkdoc-theme/
13-
14-
clover.xml
15-
coveralls-upload.json
16-
phpunit.xml
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: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,14 @@ 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-
- COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
19-
- SITE_URL: https://zendframework.github.io/zend-serializer
20-
- GH_USER_NAME: "Matthew Weier O'Phinney"
21-
- GH_USER_EMAIL: matthew@weierophinney.net
22-
- GH_REF: github.com/zendframework/zend-serializer.git
23-
- secure: "Eus59mQXnKuHFWh7olBeAoc3e2AHp9z2IvJuZx6zcLO1HBu7+iTXhZL74jwbFW3h6g+2jgIyLIr81aGNLwpxQfZKhWRMM2O8kQIMnz+svRh2RC30zs2bcuDyoHr086lQEcOXMGcnMl52X00DIr4jMj7sJ1gVe+g9aZpoU4Qq/4J2d+bKKnN802e+NBzsgIhY+NUmffZpb5s/RWejhR2HCbyfQrsNEEmXO/qHOwJNxlD4bG1ckXDtidFBepfEJT+/sbJkrkNTibOoxjyZyfADt8YOujktEyYBAgoCf5cv/Erw0lQO5lwnXI8O6Cp86x9zJtxo2Vm6RkIa5fUR6qb/Difta58OXHzXJsCrPTfTiV/SKWr31Rfsd3HlJhwd3aogsF5VBBGKrNKZ+avXbuq++QThXwkE+XUmxKHsbFpct7q+AP1CkOUefEKu/AayHnJulUpiL4JzG/BvjSC8rVAUlsXf51gVL/rTVjqbR5YCmoxGBSORHl4WFgOmq9D2T4TKEhGgsQBF9IB3N6VVc0TE+S5XVSwkHdd1d76VpasYeNO3UNEstfc+R0kWYGpmXVmvubBLX3i/Zv/k0LwfEaSUl06MK+Xnc0twx8da8cd7WDChP1YAfJn531msQjgjWtz+c3E3EiFExILvOnPotEj+S0tEU/GPVXkiQKiJwojWozI="
11+
- COMPOSER_ARGS="--no-interaction"
12+
- COVERAGE_DEPS="satooshi/php-coveralls"
2413

2514
matrix:
2615
include:
@@ -30,56 +19,58 @@ matrix:
3019
- php: 5.6
3120
env:
3221
- DEPS=locked
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"
22+
- LEGACY_DEPS="phpunit/phpunit"
3523
- php: 5.6
3624
env:
3725
- DEPS=latest
38-
- TEST_COVERAGE=true
39-
- php: 7
26+
- php: 7.0
27+
env:
28+
- DEPS=lowest
29+
- php: 7.0
30+
env:
31+
- DEPS=locked
32+
- LEGACY_DEPS="phpunit/phpunit"
33+
- php: 7.0
34+
env:
35+
- DEPS=latest
36+
- php: 7.1
4037
env:
4138
- DEPS=lowest
42-
- php: 7
39+
- php: 7.1
4340
env:
4441
- DEPS=locked
4542
- CS_CHECK=true
46-
- php: 7
43+
- TEST_COVERAGE=true
44+
- php: 7.1
4745
env:
4846
- DEPS=latest
49-
- php: hhvm
47+
- php: 7.2
5048
env:
5149
- DEPS=lowest
52-
- php: hhvm
50+
- php: 7.2
5351
env:
5452
- DEPS=locked
55-
- php: hhvm
53+
- php: 7.2
5654
env:
5755
- DEPS=latest
58-
allow_failures:
59-
- php: hhvm
60-
61-
notifications:
62-
irc: "irc.freenode.org#zftalk.dev"
63-
email: false
6456

6557
before_install:
66-
- travis_retry composer self-update
6758
- if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
6859

6960
install:
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
7063
- if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
7164
- if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
72-
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
73-
- travis_retry composer install $COMPOSER_ARGS
74-
- composer show --installed
65+
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
66+
- stty cols 120 && composer show
7567

7668
script:
7769
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
7870
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
79-
- 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
80-
81-
after_success:
82-
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
8371

8472
after_script:
8573
- if [[ $TEST_COVERAGE == 'true' ]]; then composer upload-coverage ; fi
74+
75+
notifications:
76+
email: false

‎CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ All notable changes to this project will be documented in this file, in reverse
1818

1919
### Fixed
2020

21-
- Nothing.
21+
- [#34](https://github.com/zendframework/zend-serializer/pull/34)
22+
* redundant doctrine dependency
23+
* documentaion updates
24+
* travis CI update
2225

2326
## 2.8.1 - 2017-11-20
2427

‎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,10 +1,10 @@
11
# zend-serializer
22

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

66
zend-serializer provides an adapter-based interface for generating and
77
recovering from storable representations of PHP types.
88

99
- File issues at https://github.com/zendframework/zend-serializer/issues
10-
- Documentation is at https://zendframework.github.io/zend-serializer/
10+
- Documentation is at https://docs.zendframework.com/zend-serializer/

‎composer.json

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,46 @@
33
"description": "provides an adapter based interface to simply generate storable representation of PHP types by different facilities, and recover",
44
"license": "BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"serializer"
89
],
9-
"homepage": "https://github.com/zendframework/zend-serializer",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\Serializer\\": "src/"
13-
}
10+
"support": {
11+
"docs": "https://docs.zendframework.com/zend-serializer/",
12+
"issues": "https://github.com/zendframework/zend-serializer/issues",
13+
"source": "https://github.com/zendframework/zend-serializer",
14+
"rss": "https://github.com/zendframework/zend-serializer/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",
17-
"zendframework/zend-stdlib": "^2.7 || ^3.0",
18-
"zendframework/zend-json": "^2.5 || ^3.0"
20+
"zendframework/zend-json": "^2.5 || ^3.0",
21+
"zendframework/zend-stdlib": "^2.7 || ^3.0"
1922
},
2023
"require-dev": {
21-
"zendframework/zend-math": "^2.6",
22-
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
23-
"phpunit/phpunit": "^5.5",
24+
"phpunit/phpunit": "^5.7.25 || ^6.4.4",
2425
"zendframework/zend-coding-standard": "~1.0.0",
25-
"doctrine/instantiator": "1.0.*"
26+
"zendframework/zend-math": "^2.6 || ^3.0",
27+
"zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
2628
},
2729
"suggest": {
2830
"zendframework/zend-math": "(^2.6 || ^3.0) To support Python Pickle serialization",
2931
"zendframework/zend-servicemanager": "(^2.7.5 || ^3.0.3) To support plugin manager support"
3032
},
31-
"minimum-stability": "dev",
32-
"prefer-stable": true,
33+
"autoload": {
34+
"psr-4": {
35+
"Zend\\Serializer\\": "src/"
36+
}
37+
},
38+
"autoload-dev": {
39+
"psr-4": {
40+
"ZendTest\\Serializer\\": "test/"
41+
}
42+
},
43+
"config": {
44+
"sort-packages": true
45+
},
3346
"extra": {
3447
"branch-alias": {
3548
"dev-master": "2.8-dev",
@@ -40,11 +53,6 @@
4053
"config-provider": "Zend\\Serializer\\ConfigProvider"
4154
}
4255
},
43-
"autoload-dev": {
44-
"psr-4": {
45-
"ZendTest\\Serializer\\": "test/"
46-
}
47-
},
4856
"scripts": {
4957
"check": [
5058
"@cs-check",

0 commit comments

Comments
 (0)