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 30, 2020. It is now read-only.

Commit1ea1b67

Browse files
committed
Merge branch 'feature/18' into develop
Close#18Close#14Close#15Fixes#17
2 parents53925cc +239bbd1 commit1ea1b67

38 files changed

+2299
-308
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 & 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-
tmp/
10-
doc/html/
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/

‎.travis.yml‎

Lines changed: 51 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,61 +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-memory
19-
-GH_USER_NAME:"Matthew Weier O'Phinney"
20-
-GH_USER_EMAIL:matthew@weierophinney.net
21-
-GH_REF:github.com/zendframework/zend-memory.git
22-
-secure:"QsaJwTAeNgLt3HlCLHsMy43lSLQsYym0lbvmMbSZd0ykJt/2ViNjCM9xwRDIGsYYFCGZRqUITeKgnF9sMh43hsMwLryvdN3jQGw/4MmS9QXPpb74kWgm1s2McCnD0XtuSAtxGkUZGCbqJXciAEpj+bc1iXkPvmtxt3mFrSILTiYK6U70HNp7K7Agx6bVhJ0sy7AK273bQzyQDmi1aNhzFd+prZtN6UO2dEpdNk5cRL9m8zp7lz9Wk4DWUDQRjp1B01hk72vqOkLaGXDyH+vhoZ2lNUrgERe81BAl2mmgI1KEZl3itMuWHGlEr0YAntyHeJgK+ThfghKzTgDeUXQ2slXp7V9KM/VXQLRkxydZp1h7oTl9Fc0I0CLUUvrDoH3gxB/+W7xBdYy3pkyD02C0QL13HBnOLr8SdZXxH5Crf6dwHl4qcT1/FUuggdDAc98IG3Xp5p4dt6lIJHaJvlBe9KkSt7CEPDTZWByHf3j51EDc7XmkdoVl4zfqm4FiURdFAnC9EUFEksolaI7tBpd2CKfy4EIEw2eycTBjp+WDAzLTFRwAib3GQlEEZjZFu6MWmQy5EF44JCLgOxiBRKwHzm22qQjt1SVftH3fZNHVvU2BQ6UEuzy+PxcKIjnasobGijtj14ns49PDxVxbfJb7SgKKeKGNOTUFyH+6VmgFJg0="
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:
38-
-php:hhvm
39-
40-
notifications:
41-
irc:"irc.freenode.org#zftalk.dev"
42-
email:false
27+
env:
28+
-DEPS=lowest
29+
-php:7
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
4356

4457
before_install:
45-
-if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
46-
-composer self-update
47-
-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
4859

4960
install:
50-
-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
5167

5268
script:
53-
-if [[ $EXECUTE_TEST_COVERALLS == 'true' ]]; then composer test-coverage ; fi
54-
-if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then composer test ; fi
55-
-if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs-check ; fi
56-
-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
57-
58-
after_success:
59-
-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
6071

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

‎CHANGELOG.md‎

Lines changed: 8 additions & 2 deletions
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.5.3 -TBD
5+
##2.6.0 -2018-04-30
66

77
###Added
88

9+
-[#18](https://github.com/zendframework/zend-memory/pull/18) 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+
-[#18](https://github.com/zendframework/zend-memory/pull/18) removes support for PHP 5.5.
22+
23+
-[#18](https://github.com/zendframework/zend-memory/pull/18) removes support for HHVM.
1824

1925
###Fixed
2026

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#zend-memory
22

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

66
zend-memory manages data in an environment with limited memory.
77

@@ -14,4 +14,4 @@ storage outside of memory. In this way, the total memory used by managed objects
1414
does not exceed the limit you need to enforce.
1515

1616
- File issues athttps://github.com/zendframework/zend-memory/issues
17-
- Documentation is athttps://zendframework.github.io/zend-memory/
17+
- Documentation is athttps://docs.zendframework.com/zend-memory/

‎composer.json‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,58 @@
11
{
22
"name":"zendframework/zend-memory",
3-
"description":"",
3+
"description":"Manage data in an environment with limited memory",
44
"license":"BSD-3-Clause",
55
"keywords": [
6-
"zf2",
6+
"zf",
7+
"zendframework",
78
"memory"
89
],
9-
"homepage":"https://github.com/zendframework/zend-memory",
10-
"autoload": {
11-
"psr-4": {
12-
"Zend\\Memory\\":"src/"
13-
}
10+
"support": {
11+
"docs":"https://docs.zendframework.com/zend-memory/",
12+
"issues":"https://github.com/zendframework/zend-memory/issues",
13+
"source":"https://github.com/zendframework/zend-memory",
14+
"rss":"https://github.com/zendframework/zend-memory/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
},
1821
"require-dev": {
22+
"phpunit/phpunit":"^5.7.27 || ^6.5.8 || ^7.1.4",
1923
"zendframework/zend-cache":"^2.7",
20-
"squizlabs/php_codesniffer":"^2.3.1",
21-
"phpunit/PHPUnit":"^4.8"
24+
"zendframework/zend-coding-standard":"~1.0.0"
2225
},
2326
"suggest": {
2427
"zendframework/zend-cache":"To support swapping memory objects into and out of non-memory cache storage"
2528
},
26-
"minimum-stability":"dev",
27-
"prefer-stable":true,
28-
"extra": {
29-
"branch-alias": {
30-
"dev-master":"2.5-dev",
31-
"dev-develop":"2.6-dev"
29+
"autoload": {
30+
"psr-4": {
31+
"Zend\\Memory\\":"src/"
3232
}
3333
},
3434
"autoload-dev": {
3535
"psr-4": {
3636
"ZendTest\\Memory\\":"test/"
3737
}
3838
},
39+
"config": {
40+
"sort-packages":true
41+
},
42+
"extra": {
43+
"branch-alias": {
44+
"dev-master":"2.6.x-dev",
45+
"dev-develop":"2.7.x-dev"
46+
}
47+
},
3948
"scripts": {
4049
"check": [
4150
"@cs-check",
4251
"@test"
4352
],
44-
"upload-coverage":"coveralls -v",
4553
"cs-check":"phpcs",
4654
"cs-fix":"phpcbf",
47-
"test":"phpunit",
48-
"test-coverage":"phpunit --coverage-clover clover.xml"
55+
"test":"phpunit --colors=always",
56+
"test-coverage":"phpunit --colors=always --coverage-clover clover.xml"
4957
}
5058
}

0 commit comments

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