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

PHP 7.2 + QA Tools + Docs - follow up #25, #26 #31

Merged
merged 38 commits into from
Apr 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
e574a9c
Merge branch 'Koopzington-coveralls-yml-fix'
ezimuel Sep 15, 2016
28ef0ec
Remove fast_finish flag
Koopzington Sep 15, 2016
b8e6141
Remove CS dependencies and add zend-coding-standard to require-dev
Koopzington Nov 13, 2016
b13fee0
Delete .php_cs
Koopzington Nov 13, 2016
b5e7b4b
add/update phpcs.xml
Koopzington Nov 13, 2016
448c02c
add/update composer scripts
Koopzington Nov 13, 2016
e5d6e56
Use composer scripts in .travis.yml
Koopzington Nov 13, 2016
10a659f
Replace mentions of php-cs-fixer with phpcs
Koopzington Nov 13, 2016
29622fd
CS fixes
Koopzington Nov 15, 2016
0ae8f32
Replace mentions of phpcs and phpcbf with composer scripts
Koopzington Nov 15, 2016
23948b5
Avoid running into a timeout by using phpunit directly instead of run…
Koopzington Nov 19, 2016
a32faf9
Merge pull request #25 from Koopzington/remove-fast-finish
michalbundyra Nov 3, 2017
e012b3b
Merge pull request #26 from Koopzington/new-coding-standard
michalbundyra Nov 3, 2017
f55a3b3
Renamed documentation directory: doc -> docs
michalbundyra Nov 3, 2017
883bdd9
Moved all support files into docs directory and added SUPPORT.md
michalbundyra Nov 3, 2017
872ea04
Updated links to the documentation - docs.zendframework.com
michalbundyra Nov 3, 2017
4da0d5c
Updated .gitattributes
michalbundyra Nov 3, 2017
9bde5be
Updated .gitignore - removed all IDE/OS specific files/dirs
michalbundyra Nov 3, 2017
a613fc9
Updated Travis CI configuration
michalbundyra Nov 3, 2017
541d3c7
Updated year in LICENSE.md and mkdocs.yml
michalbundyra Nov 3, 2017
87e668c
Updated PHPUnit configuration
michalbundyra Nov 3, 2017
7b78187
Updated composer skeleton and dependencies + added composer.lock
michalbundyra Nov 3, 2017
87605b9
PHPUnit update - ^5.7 || ^6.4
michalbundyra Nov 3, 2017
68ae067
Replaced deprecated method setExpectedException
michalbundyra Nov 3, 2017
5facf50
Updated .gitattributes and .gitignore - natsort
michalbundyra Nov 22, 2017
4b67fed
Removed empty line in LICENSE.md
michalbundyra Nov 22, 2017
b700ece
Updated coveralls badge
michalbundyra Nov 22, 2017
f4fd398
Fixed sections order in composer.json
michalbundyra Nov 22, 2017
c8097f0
Removed white characters at the end of the line in docs
michalbundyra Nov 22, 2017
ac97d68
Updated copyright year range in mkdocs.yml to match LICENSE.md
michalbundyra Nov 22, 2017
a028274
Added PR and ISSUE github templates
michalbundyra Nov 22, 2017
2ba2de1
Updated to php-coveralls/php-coveralls
michalbundyra Dec 14, 2017
d759b7f
Added travis_retry on uploading coverage to coveralls in Travis CI co…
michalbundyra Apr 12, 2018
0398bc2
Updated copyright year range in LICENSE.md and mkdocs.yml
michalbundyra Apr 12, 2018
b0ac7da
Updated link to https in mkdocs.yml
michalbundyra Apr 12, 2018
b918db6
Updated branch aliases in composer.json
michalbundyra Apr 12, 2018
b032524
Allow PHPUnit 7
michalbundyra Apr 12, 2018
b3effe9
Use "chat" instead of "slack"
michalbundyra Apr 13, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
/test export-ignore
/vendor export-ignore
.coveralls.yml export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
.php_cs export-ignore
phpunit.xml.dist export-ignore
/.coveralls.yml export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.travis.yml export-ignore
/composer.lock export-ignore
/docs/ export-ignore
/mkdocs.yml export-ignore
/phpcs.xml export-ignore
/phpunit.xml.dist export-ignore
/test/ export-ignore
24 changes: 7 additions & 17 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,7 @@
.buildpath
.DS_Store
.idea
.project
.settings/
.*.sw*
.*.un~
nbproject
doc/html/
tmp/
zf-mkdoc-theme/

clover.xml
composer.lock
coveralls-upload.json
phpunit.xml
vendor
/clover.xml
/coveralls-upload.json
/docs/html/
/phpunit.xml
/vendor/
/zf-mkdoc-theme.tgz
/zf-mkdoc-theme/
45 changes: 0 additions & 45 deletions .php_cs

This file was deleted.

88 changes: 51 additions & 37 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,61 +2,75 @@ sudo: false

language: php

branches:
except:
- /^release-\d+\.\d+\.\d+.*$/
- /^ghgfk-.*$/

cache:
directories:
- $HOME/.composer/cache
- $HOME/.local
- zf-mkdoc-theme

env:
global:
- SITE_URL: https://zendframework.github.io/zend-math
- GH_USER_NAME: "Matthew Weier O'Phinney"
- GH_USER_EMAIL: [email protected]
- GH_REF: github.com/zendframework/zend-math.git
- secure: "dr2AQGskqc4IaJb1jtPDcw9UxXwZU0SemdcErG3OJY70l2zxYrwu6i0SShUjpXPafywo6mK7rwV9UYXBzr2PgO6UerNKUkWcYFb0Rj6KIzNZhrTPAZi7kBd/y1mjAn9QVmT2l4H1Boe3Xi18NvHT4M9pwdz06AqR7IVrVb2oQKX7cEFbP+3Yy0++O74n4CMgp7EjR4PLiYUoDIJMYHwIzDjGwp6VXLSvW1u7BFFnWNTiifDXZPLyInlUwiqNMY9XGDWxubKdFsBM2ZqXuyQO0KxLXnCP/wZi+WBpDNkyv8NIu4qei0z9k0SPl5VBCiei3TIzZBTeSGuaxCY82mUc8Vv96QnMjQDcUca9g22rJeh5Wd18KZqzPPpst6tdipMjrXBVtskItZqT5XMzfuIM0+40Lx95GTcSWXAZKIC5wO/2wjYgk+NKDHJrfuKw4ZEXhVZStVnZlnRYgLUkRjVpRavZYvGo5juriVEJl/RwhqojwrfoKuaIFVnPzMQdx9w9PhKw8GfEM0dgt1Lij1vELA09fcVKKR/JeiRxMOGx+oKeDkFUKQvrcE35eJouc2LQUzPkgKkCY2JA/C3qEYXnQlhYYaLgcjA3Ecrnkq/HBcsrS2/nYeoEjiiqVF/kfaIBxawUDzGjjM1r8mKneMy5LtZ+5MxPFHtPyWkzoDUSjZc="
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="php-coveralls/php-coveralls"

matrix:
fast_finish: true
include:
- php: 5.5
- php: 5.6
env:
- DEPS=lowest
- php: 5.6
env:
- EXECUTE_CS_CHECK=true
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 5.6
env:
- EXECUTE_TEST_COVERALLS=true
- DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
- PATH="$HOME/.local/bin:$PATH"
- DEPS=latest
- php: 7
- php: hhvm
allow_failures:
- php: hhvm

notifications:
irc: "irc.freenode.org#zftalk.dev"
email: false
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 7
env:
- DEPS=latest
- php: 7.1
env:
- DEPS=lowest
- php: 7.1
env:
- DEPS=locked
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.1
env:
- DEPS=latest
- php: 7.2
env:
- DEPS=lowest
- php: 7.2
env:
- DEPS=locked
- php: 7.2
env:
- DEPS=latest

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

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

script:
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; fi
- if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then ./vendor/bin/phpunit ; fi
- if [[ $EXECUTE_CS_CHECK == 'true' ]]; then ./vendor/bin/php-cs-fixer fix -v --diff --dry-run ; fi
- 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

after_success:
- if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
- if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi

after_script:
- if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then ./vendor/bin/coveralls ; fi
- if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi

notifications:
email: false
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ All notable changes to this project will be documented in this file, in reverse
## 3.0.0 - 2016-04-28

This version contains a number of changes to required dependencies, error
handling, and internals; please read [the migration document](doc/book/migration.md)
handling, and internals; please read [the migration document](docs/book/migration.md)
for full details.

### Added
Expand Down
13 changes: 6 additions & 7 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
Copyright (c) 2005-2015, Zend Technologies USA, Inc.

Copyright (c) 2005-2018, Zend Technologies USA, Inc.
All rights reserved.

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

- Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
- Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

- Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
- Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.

- Neither the name of Zend Technologies USA, Inc. nor the names of its
contributors may be used to endorse or promote products derived from this
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# zend-math

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

`Zend\Math` provides general mathematical functions. So far the supported
functionalities are:
Expand All @@ -11,10 +11,11 @@ functionalities are:

# Migration notes from v2 to v3

[We document migration notes from v2 to v3](doc/book/migration.md), providing details
of potential BC breaks and/or API differences you may need to be aware of.
[We document migration notes from v2 to v3](https://docs.zendframework.com/zend-math/migration/),
providing details of potential BC breaks and/or API differences
you may need to be aware of.

# Miscellany

- File issues at https://github.com/zendframework/zend-math/issues
- Documentation is at https://zendframework.github.io/zend-math/
- Documentation is at https://docs.zendframework.com/zend-math/
55 changes: 37 additions & 18 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,60 @@
{
"name": "zendframework/zend-math",
"description": " ",
"description": "Create cryptographically secure pseudo-random numbers, and manage big integers",
"license": "BSD-3-Clause",
"keywords": [
"zf2",
"zf",
"zendframework",
"math"
],
"homepage": "https://github.com/zendframework/zend-math",
"autoload": {
"psr-4": {
"Zend\\Math\\": "src/"
}
"support": {
"docs": "https://docs.zendframework.com/zend-math/",
"issues": "https://github.com/zendframework/zend-math/issues",
"source": "https://github.com/zendframework/zend-math",
"rss": "https://github.com/zendframework/zend-math/releases.atom",
"chat": "https://zendframework-slack.herokuapp.com",
"forum": "https://discourse.zendframework.com/c/questions/components"
},
"require": {
"php": "^5.5 || ^7.0",
"php": "^5.6 || ^7.0",
"ext-mbstring": "*",
"paragonie/random_compat": "^2.0.2"
"paragonie/random_compat": "^2.0.11"
},
"require-dev": {
"phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
"zendframework/zend-coding-standard": "~1.0.0"
},
"suggest": {
"ext-bcmath": "If using the bcmath functionality",
"ext-gmp": "If using the gmp functionality"
},
"minimum-stability": "dev",
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "3.0-dev",
"dev-develop": "3.1-dev"
"autoload": {
"psr-4": {
"Zend\\Math\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"ZendTest\\Math\\": "test/"
}
},
"require-dev": {
"fabpot/php-cs-fixer": "1.7.*",
"phpunit/PHPUnit": "~4.0"
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "3.0.x-dev",
"dev-develop": "3.1.x-dev"
}
},
"scripts": {
"check": [
"@cs-check",
"@test"
],
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}
Loading