This repository has been archived by the owner on Jan 30, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merging develop to master in preparation for 2.6.0 release
- Loading branch information
Showing
38 changed files
with
2,303 additions
and
311 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
| phpcs.xml 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,7 @@ | ||
| .buildpath | ||
| .DS_Store | ||
| .idea | ||
| .project | ||
| .settings/ | ||
| .*.sw* | ||
| .*.un~ | ||
| nbproject | ||
| tmp/ | ||
| doc/html/ | ||
| 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/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,61 +2,75 @@ sudo: false | |
|
|
||
| language: php | ||
|
|
||
| branches: | ||
| except: | ||
| - /^release-.*$/ | ||
| - /^ghgfk-.*$/ | ||
|
|
||
| cache: | ||
| directories: | ||
| - $HOME/.composer/cache | ||
| - $HOME/.local | ||
| - zf-mkdoc-theme | ||
|
|
||
| env: | ||
| global: | ||
| - SITE_URL: https://zendframework.github.io/zend-memory | ||
| - GH_USER_NAME: "Matthew Weier O'Phinney" | ||
| - GH_USER_EMAIL: [email protected] | ||
| - GH_REF: github.com/zendframework/zend-memory.git | ||
| - secure: "QsaJwTAeNgLt3HlCLHsMy43lSLQsYym0lbvmMbSZd0ykJt/2ViNjCM9xwRDIGsYYFCGZRqUITeKgnF9sMh43hsMwLryvdN3jQGw/4MmS9QXPpb74kWgm1s2McCnD0XtuSAtxGkUZGCbqJXciAEpj+bc1iXkPvmtxt3mFrSILTiYK6U70HNp7K7Agx6bVhJ0sy7AK273bQzyQDmi1aNhzFd+prZtN6UO2dEpdNk5cRL9m8zp7lz9Wk4DWUDQRjp1B01hk72vqOkLaGXDyH+vhoZ2lNUrgERe81BAl2mmgI1KEZl3itMuWHGlEr0YAntyHeJgK+ThfghKzTgDeUXQ2slXp7V9KM/VXQLRkxydZp1h7oTl9Fc0I0CLUUvrDoH3gxB/+W7xBdYy3pkyD02C0QL13HBnOLr8SdZXxH5Crf6dwHl4qcT1/FUuggdDAc98IG3Xp5p4dt6lIJHaJvlBe9KkSt7CEPDTZWByHf3j51EDc7XmkdoVl4zfqm4FiURdFAnC9EUFEksolaI7tBpd2CKfy4EIEw2eycTBjp+WDAzLTFRwAib3GQlEEZjZFu6MWmQy5EF44JCLgOxiBRKwHzm22qQjt1SVftH3fZNHVvU2BQ6UEuzy+PxcKIjnasobGijtj14ns49PDxVxbfJb7SgKKeKGNOTUFyH+6VmgFJg0=" | ||
| - 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 composer test-coverage ; fi | ||
| - if [[ $EXECUTE_TEST_COVERALLS != 'true' ]]; then composer test ; fi | ||
| - if [[ $EXECUTE_CS_CHECK == 'true' ]]; then composer cs-check ; 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 composer upload-coverage ; fi | ||
| - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi | ||
|
|
||
| notifications: | ||
| email: false | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,50 +1,58 @@ | ||
| { | ||
| "name": "zendframework/zend-memory", | ||
| "description": " ", | ||
| "description": "Manage data in an environment with limited memory", | ||
| "license": "BSD-3-Clause", | ||
| "keywords": [ | ||
| "zf2", | ||
| "zf", | ||
| "zendframework", | ||
| "memory" | ||
| ], | ||
| "homepage": "https://github.com/zendframework/zend-memory", | ||
| "autoload": { | ||
| "psr-4": { | ||
| "Zend\\Memory\\": "src/" | ||
| } | ||
| "support": { | ||
| "docs": "https://docs.zendframework.com/zend-memory/", | ||
| "issues": "https://github.com/zendframework/zend-memory/issues", | ||
| "source": "https://github.com/zendframework/zend-memory", | ||
| "rss": "https://github.com/zendframework/zend-memory/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" | ||
| }, | ||
| "require-dev": { | ||
| "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.4", | ||
| "zendframework/zend-cache": "^2.7", | ||
| "squizlabs/php_codesniffer": "^2.3.1", | ||
| "phpunit/PHPUnit": "^4.8" | ||
| "zendframework/zend-coding-standard": "~1.0.0" | ||
| }, | ||
| "suggest": { | ||
| "zendframework/zend-cache": "To support swapping memory objects into and out of non-memory cache storage" | ||
| }, | ||
| "minimum-stability": "dev", | ||
| "prefer-stable": true, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "2.5-dev", | ||
| "dev-develop": "2.6-dev" | ||
| "autoload": { | ||
| "psr-4": { | ||
| "Zend\\Memory\\": "src/" | ||
| } | ||
| }, | ||
| "autoload-dev": { | ||
| "psr-4": { | ||
| "ZendTest\\Memory\\": "test/" | ||
| } | ||
| }, | ||
| "config": { | ||
| "sort-packages": true | ||
| }, | ||
| "extra": { | ||
| "branch-alias": { | ||
| "dev-master": "2.6.x-dev", | ||
| "dev-develop": "2.7.x-dev" | ||
| } | ||
| }, | ||
| "scripts": { | ||
| "check": [ | ||
| "@cs-check", | ||
| "@test" | ||
| ], | ||
| "upload-coverage": "coveralls -v", | ||
| "cs-check": "phpcs", | ||
| "cs-fix": "phpcbf", | ||
| "test": "phpunit", | ||
| "test-coverage": "phpunit --coverage-clover clover.xml" | ||
| "test": "phpunit --colors=always", | ||
| "test-coverage": "phpunit --colors=always --coverage-clover clover.xml" | ||
| } | ||
| } |
Oops, something went wrong.