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

Docs rebase #186

Closed
wants to merge 13 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 7 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,16 +1,7 @@
.buildpath
.DS_Store
.idea
.project
.settings/
.*.sw*
.*.un~
nbproject
doc/html/
tmp/
zf-mkdoc-theme/

clover.xml
coveralls-upload.json
phpunit.xml
vendor
/clover.xml
/coveralls-upload.json
/docs/html/
/phpunit.xml
/vendor/
/zf-mkdoc-theme.tgz
/zf-mkdoc-theme/
14 changes: 6 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ env:
global:
- COMPOSER_ARGS="--no-interaction"
- COVERAGE_DEPS="satooshi/php-coveralls"
- LEGACY_DEPS="phpunit/phpunit"
- TESTS_ZEND_FORM_ANNOTATION_SUPPORT=true
- TESTS_ZEND_FORM_RECAPTCHA_SUPPORT=true

Expand All @@ -28,17 +27,17 @@ matrix:
- php: 5.6
env:
- DEPS=locked
- CS_CHECK=true
- LEGACY_DEPS="phpunit/phpunit"
- php: 5.6
env:
- DEPS=latest
- TEST_COVERAGE=true
- php: 7
env:
- DEPS=lowest
- php: 7
env:
- DEPS=locked
- LEGACY_DEPS="phpunit/phpunit"
- php: 7
env:
- DEPS=latest
Expand All @@ -48,6 +47,8 @@ matrix:
- php: 7.1
env:
- DEPS=locked
- CS_CHECK=true
- TEST_COVERAGE=true
- php: 7.1
env:
- DEPS=latest
Expand All @@ -60,18 +61,15 @@ matrix:
- php: 7.2
env:
- DEPS=latest
allow_failures:
- php: 7.2

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

install:
- travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
- if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
- 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 $COMPOSER_ARGS --prefer-lowest --prefer-stable ; 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

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-2017, 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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# zend-form

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

zend-form is intended primarily as a bridge between your domain models and
the View Layer. It composes a thin layer of objects representing form elements,
Expand Down
50 changes: 28 additions & 22 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
{
"name": "zendframework/zend-form",
"description": " ",
"description": "Validate and display simple and complex forms, casting forms to business objects and vice versa",
"license": "BSD-3-Clause",
"keywords": [
"zf2",
"zf",
"zendframework",
"form"
],
"homepage": "https://github.com/zendframework/zend-form",
"autoload": {
"psr-4": {
"Zend\\Form\\": "src/"
},
"files": [
"autoload/formElementManagerPolyfill.php"
]
"support": {
"docs": "https://docs.zendframework.com/zend-form/",
"issues": "https://github.com/zendframework/zend-form/issues",
"source": "https://github.com/zendframework/zend-form",
"rss": "https://github.com/zendframework/zend-form/releases.atom",
"slack": "https://zendframework-slack.herokuapp.com",
"forum": "https://discourse.zendframework.com/c/questions/components"
},
"require": {
"php": "^7.0 || ^5.6",
"php": "^5.6 || ^7.0",
"zendframework/zend-inputfilter": "^2.6",
"zendframework/zend-hydrator": "^1.1 || ^2.1",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
Expand All @@ -36,7 +36,7 @@
"zendframework/zend-validator": "^2.6",
"zendframework/zend-view": "^2.6.2",
"zendframework/zendservice-recaptcha": "^3.0.0",
"phpunit/phpunit": "^6.0.8 || ^5.7.15",
"phpunit/phpunit": "^5.7.23 || ^6.5.3",
"zendframework/zend-coding-standard": "~1.0.0"
},
"suggest": {
Expand All @@ -48,8 +48,22 @@
"zendframework/zend-view": "^2.6.2, required for using the zend-form view helpers",
"zendframework/zendservice-recaptcha": "in order to use the ReCaptcha form element"
},
"minimum-stability": "dev",
"prefer-stable": true,
"autoload": {
"psr-4": {
"Zend\\Form\\": "src/"
},
"files": [
"autoload/formElementManagerPolyfill.php"
]
},
"autoload-dev": {
"psr-4": {
"ZendTest\\Form\\": "test/"
}
},
"config": {
"sort-packages": true
},
"extra": {
"branch-alias": {
"dev-master": "2.10-dev",
Expand All @@ -60,14 +74,6 @@
"config-provider": "Zend\\Form\\ConfigProvider"
}
},
"autoload-dev": {
"psr-4": {
"ZendTest\\Form\\": "test/"
}
},
"config": {
"process-timeout": 0
},
"scripts": {
"check": [
"@cs-check",
Expand Down
Loading