Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Jan 29, 2020. It is now read-only.

Commit0d648c9

Browse files
committed
Merging develop to master in preparation for 2.8.0 release
2 parents286f2ac +9874b4c commit0d648c9

26 files changed

+953
-515
lines changed

‎.gitattributes‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
/testexport-ignore
2-
/vendorexport-ignore
3-
.coveralls.ymlexport-ignore
4-
.gitattributesexport-ignore
5-
.gitignoreexport-ignore
6-
.travis.ymlexport-ignore
7-
phpcs.xmlexport-ignore
8-
phpunit.xml.distexport-ignore
1+
/.coveralls.ymlexport-ignore
2+
/.gitattributesexport-ignore
3+
/.gitignoreexport-ignore
4+
/.travis.ymlexport-ignore
5+
/composer.lockexport-ignore
6+
/docs/export-ignore
7+
/mkdocs.ymlexport-ignore
8+
/phpcs.xmlexport-ignore
9+
/phpunit.xml.distexport-ignore
10+
/test/export-ignore

‎.gitignore‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +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-
clover.xml
13-
coveralls-upload.json
14-
phpunit.xml
15-
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: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,14 @@ 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-
-TESTS_ZEND_CAPTCHA_GC=true
19-
-TESTS_ZEND_CAPTCHA_RECAPTCHA_SUPPORT=true
20-
-COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
21-
-SITE_URL="https://zendframework.github.io/zend-captcha"
22-
-GH_USER_NAME="Matthew Weier O'Phinney"
23-
-GH_USER_EMAIL="matthew@weierophinney.net"
24-
-GH_REF="github.com/zendframework/zend-captcha.git"
25-
-secure:"xTnld/C64EfRstO7gVoZEj2MIeKEWG/d18WMeW/oPkfgJCQlm9UuAv0lpZRkvqKeMCWBRuGG0PY/nAIgF/+AkA9TXB5HBQ+jcftWdOaCp1e8qMLysGc9hOiYvekAtU1OsqPkpCGIrmBowNsKbAPJwSh3Vcw+1+Gb3MPkLjcS3WIWYa1IKd8PEyUkapzOMn/ltFrP5Vy46zvSLrZxVhl+qwF5f4+gpCp8oBJqqT5frD/pHE1o2YiId4+s6mKE9Jq2qVszWZQT/o3ii7iJ7Ea009n7b2/+WfVgBmVISoNV6bOuLRNzm2l9hublTmUB+DMlE5xiE3VDBoySkdCXgSkLq7FR/rqRpI2yz649ZgID4HkwCl77E+R55vQwNPoUmHox059j71wdaqOkTSm0vhOfF8vGxmdDj7GhEQPPbTflI9ulrh247VQlfI+Av13JmgbvPDvi7vju/QhcjeC7NSPRnvi9mQpQtEaKF6mBdh9mwgL3SD48jnsC0UI5W1TXcjczDM3Sf/P2tLtHeqii3f7ioklbn/Fi3t2VSMg6iLcj57Sk4h1NmrDhcrMIBPSgRAnLMNopzkk4uwT/u5CMqUMmI+6VFkA+qgQ1MGaZAFhribAob8WM9OJo9m0i5qmn76mE+gMX1qBFV/VdBwP2La5nhqTRfaKzM4bzTfA9pmNHje0="
11+
-COMPOSER_ARGS="--no-interaction"
12+
-COVERAGE_DEPS="php-coveralls/php-coveralls"
2613

2714
matrix:
2815
include:
@@ -32,9 +19,7 @@ matrix:
3219
-php:5.6
3320
env:
3421
-DEPS=locked
35-
-TEST_COVERAGE=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"
22+
-LEGACY_DEPS="phpunit/phpunit"
3823
-php:5.6
3924
env:
4025
-DEPS=latest
@@ -44,47 +29,48 @@ matrix:
4429
-php:7
4530
env:
4631
-DEPS=locked
47-
-CHECK_CS=true
32+
-LEGACY_DEPS="phpunit/phpunit"
4833
-php:7
4934
env:
5035
-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
5144
-php:7.1
5245
env:
5346
-DEPS=latest
54-
-php:hhvm
47+
-php:7.2
5548
env:
5649
-DEPS=lowest
57-
-php:hhvm
50+
-php:7.2
5851
env:
5952
-DEPS=locked
60-
-php:hhvm
53+
-php:7.2
6154
env:
6255
-DEPS=latest
63-
allow_failures:
64-
-php:hhvm
65-
66-
notifications:
67-
irc:"irc.freenode.org#zftalk.dev"
68-
email:false
6956

7057
before_install:
71-
-if [[ $TRAVIS_PHP_VERSION != "hhvm" && $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini ; fi
72-
-travis_retry composer self-update
58+
-if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
7359

7460
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
7563
-if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
7664
-if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
77-
-if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS satooshi/php-coveralls:^1.0 ; fi
78-
-travis_retry composer install $COMPOSER_ARGS
79-
-composer show
65+
-if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
66+
-stty cols 120 && composer show
8067

8168
script:
8269
-if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
83-
-if [[ $CHECK_CS == 'true' ]]; then composer cs-check ; fi
84-
-if [[ $DEPLOY_DOCS == "true" && "$TRAVIS_TEST_RESULT" == "0" ]]; then travis_retry curl -sSL https://raw.githubusercontent.com/zendframework/zf-mkdoc-theme/master/theme-installer.sh | bash ; fi
70+
-if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
8571

8672
after_script:
87-
-if [[ $TEST_COVERAGE == 'true' ]]; then travis_retrycomposer upload-coverage ; fi
73+
-if [[ $TEST_COVERAGE == 'true' ]]; then travis_retryphp vendor/bin/php-coveralls -v ; fi
8874

89-
after_success:
90-
-if [[ $DEPLOY_DOCS == "true" ]]; then ./zf-mkdoc-theme/deploy.sh ; fi
75+
notifications:
76+
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+
##2.8.0 - TBD
6+
7+
###Added
8+
9+
-[#39](https://github.com/zendframework/zend-captcha/pull/39) adds support for PHP 7.1 and 7.2.
10+
11+
###Changed
12+
13+
- Nothing.
14+
15+
###Deprecated
16+
17+
- Nothing.
18+
19+
###Removed
20+
21+
-[#39](https://github.com/zendframework/zend-captcha/pull/39) removes support for HHVM.
22+
23+
###Fixed
24+
25+
-[#23](https://github.com/zendframework/zend-captcha/pull/23) fixes an issue with garbage collection of expired CAPTCHA images
26+
when concurrent requests trigger collection.
527

628
##2.7.1 - TBD
729

‎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-
thislist 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-
thislist of conditions and the following disclaimer in the documentation
13-
and/orother 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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#zend-captcha
22

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

66
`Zend\Captcha` component is able to manage “Completely Automated Public Turing
77
test to tell Computers and Humans Apart” (CAPTCHA); it is used as a

‎composer.json‎

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
{
22
"name":"zendframework/zend-captcha",
3-
"description":"",
3+
"description":"Generate and validate CAPTCHAs using Figlets, images, ReCaptcha, and more",
44
"license":"BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"captcha"
89
],
9-
"homepage":"https://github.com/zendframework/zend-captcha",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\Captcha\\":"src/"
13-
}
10+
"support": {
11+
"docs":"https://docs.zendframework.com/zend-captcha/",
12+
"issues":"https://github.com/zendframework/zend-captcha/issues",
13+
"source":"https://github.com/zendframework/zend-captcha",
14+
"rss":"https://github.com/zendframework/zend-captcha/releases.atom",
15+
"chat":"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-math":"^2.6 || ^3.0",
18-
"zendframework/zend-stdlib":"^2.7 || ^3.0"
20+
"zendframework/zend-math":"^2.7 || ^3.0",
21+
"zendframework/zend-stdlib":"^2.7.7 || ^3.1"
1922
},
2023
"require-dev": {
21-
"zendframework/zend-session":"^2.6",
22-
"zendframework/zend-text":"^2.6",
23-
"zendframework/zend-validator":"^2.6",
24-
"zendframework/zendservice-recaptcha":"^3.0",
24+
"phpunit/phpunit":"^5.7.27 || ^6.5.8 || ^7.1.2",
2525
"zendframework/zend-coding-standard":"~1.0.0",
26-
"phpunit/PHPUnit":"~4.8"
26+
"zendframework/zend-session":"^2.8",
27+
"zendframework/zend-text":"^2.6",
28+
"zendframework/zend-validator":"^2.10.1",
29+
"zendframework/zendservice-recaptcha":"^3.0"
2730
},
2831
"suggest": {
2932
"zendframework/zend-i18n-resources":"Translations of captcha messages",
@@ -32,19 +35,25 @@
3235
"zendframework/zend-validator":"Zend\\Validator component",
3336
"zendframework/zendservice-recaptcha":"ZendService\\ReCaptcha component"
3437
},
35-
"minimum-stability":"dev",
36-
"prefer-stable":true,
37-
"extra": {
38-
"branch-alias": {
39-
"dev-master":"2.7-dev",
40-
"dev-develop":"2.8-dev"
38+
"autoload": {
39+
"psr-4": {
40+
"Zend\\Captcha\\":"src/"
4141
}
4242
},
4343
"autoload-dev": {
4444
"psr-4": {
4545
"ZendTest\\Captcha\\":"test/"
4646
}
4747
},
48+
"config": {
49+
"sort-packages":true
50+
},
51+
"extra": {
52+
"branch-alias": {
53+
"dev-master":"2.7.x-dev",
54+
"dev-develop":"2.8.x-dev"
55+
}
56+
},
4857
"scripts": {
4958
"check": [
5059
"@cs-check",
@@ -53,7 +62,6 @@
5362
"cs-check":"phpcs",
5463
"cs-fix":"phpcbf",
5564
"test":"phpunit --colors=always",
56-
"test-coverage":"phpunit --colors=always --coverage-clover clover.xml",
57-
"upload-coverage":"coveralls -v"
65+
"test-coverage":"phpunit --colors=always --coverage-clover clover.xml"
5866
}
5967
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp