From e84fe520c4a0db3d755f4f43d09e9f571976407b Mon Sep 17 00:00:00 2001 From: Ralf Eggert Date: Fri, 8 Jul 2016 17:47:30 +0200 Subject: [PATCH 01/40] Added translation to FormElementErrors view helper --- src/View/Helper/FormElementErrors.php | 4 ++++ test/View/Helper/FormElementErrorsTest.php | 26 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/View/Helper/FormElementErrors.php b/src/View/Helper/FormElementErrors.php index fa6f0a8d..82bfd347 100644 --- a/src/View/Helper/FormElementErrors.php +++ b/src/View/Helper/FormElementErrors.php @@ -79,6 +79,10 @@ public function render(ElementInterface $element, array $attributes = []) $escapeHtml = $this->getEscapeHtmlHelper(); $messagesToPrint = []; array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml) { + if (null !== ($translator = $this->getTranslator())) { + $item = $translator->translate($item, $this->getTranslatorTextDomain()); + } + $messagesToPrint[] = $escapeHtml($item); }); diff --git a/test/View/Helper/FormElementErrorsTest.php b/test/View/Helper/FormElementErrorsTest.php index 89fcdaa5..cbf5dcb8 100644 --- a/test/View/Helper/FormElementErrorsTest.php +++ b/test/View/Helper/FormElementErrorsTest.php @@ -46,6 +46,32 @@ public function testRendersErrorMessagesUsingUnorderedListByDefault() $this->assertRegexp('##s', $markup); } + public function testRendersErrorMessagesUsingUnorderedListTranslated() + { + $mockTranslator = $this->getMock('Zend\I18n\Translator\Translator'); + $mockTranslator->expects($this->at(0)) + ->method('translate') + ->will($this->returnValue('Translated first error message')); + $mockTranslator->expects($this->at(1)) + ->method('translate') + ->will($this->returnValue('Translated second error message')); + $mockTranslator->expects($this->at(2)) + ->method('translate') + ->will($this->returnValue('Translated third error message')); + + $this->helper->setTranslator($mockTranslator); + $this->assertTrue($this->helper->hasTranslator()); + + $this->helper->setTranslatorTextDomain('default'); + + $messages = $this->getMessageList(); + $element = new Element('foo'); + $element->setMessages($messages); + + $markup = $this->helper->render($element); + $this->assertRegexp('##s', $markup); + } + public function testCanSpecifyAttributesForOpeningTag() { $messages = $this->getMessageList(); From 8403feb182dd567b5149511c0565e2a8e62ca613 Mon Sep 17 00:00:00 2001 From: Rob Allen Date: Thu, 23 Feb 2017 15:38:26 +0000 Subject: [PATCH 02/40] Update Changelog Add release date for 2.10.0 --- CHANGELOG.md | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c71881a..61a5a9c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 2.10.0 - TBD +## 2.10.0 - 2017-02-23 ### Added @@ -24,24 +24,6 @@ All notable changes to this project will be documented in this file, in reverse - [#139](https://github.com/zendframework/zend-form/pull/139) adds support for ReCaptcha version 2 though zend-captcha 2.7.1. -## 2.9.3 - TBD - -### Added - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - ## 2.9.2 - 2016-09-22 ### Added From 468f0b252c84ad023739157f91a5bd0faf2ddab5 Mon Sep 17 00:00:00 2001 From: Rob Allen Date: Thu, 23 Feb 2017 15:39:17 +0000 Subject: [PATCH 03/40] Update branch-aliases --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d86cad49..2ecc6d66 100644 --- a/composer.json +++ b/composer.json @@ -52,8 +52,8 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.9-dev", - "dev-develop": "2.10-dev" + "dev-master": "2.10-dev", + "dev-develop": "2.11-dev" }, "zf": { "component": "Zend\\Form", From 8e68a9940e0eb7d0b8b4b430b5bda3c4c5579e04 Mon Sep 17 00:00:00 2001 From: Rob Allen Date: Thu, 23 Feb 2017 16:06:04 +0000 Subject: [PATCH 04/40] Bumped version --- CHANGELOG.md | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 61a5a9c7..9abc8bd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,42 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 2.11.0 - TBD + +### Added + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + +## 2.10.1 - TBD + +### Added + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + ## 2.10.0 - 2017-02-23 ### Added From 771f18e4191574d32c63a49df920a0d765f646b3 Mon Sep 17 00:00:00 2001 From: KoKsPfLaNzE Date: Thu, 2 Mar 2017 20:33:43 +0100 Subject: [PATCH 05/40] added PHP7.1 in travis --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 23dc6349..afd2faae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,15 @@ matrix: - php: 7 env: - DEPS=latest + - php: 7.1 + env: + - DEPS=lowest + - php: 7.1 + env: + - DEPS=locked + - php: 7.1 + env: + - DEPS=latest - php: hhvm env: - DEPS=lowest From 0cc0dd31b3883d824b327eb7df716dcd11fa3d2a Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Thu, 22 Jun 2017 14:47:06 +0200 Subject: [PATCH 06/40] Adapt .travis.yml to recent ZF standards --- .travis.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35a3db2c..f2cf3a90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,13 +4,12 @@ language: php branches: except: - - /^release-\d+\.\d+\.\d+.*$/ + - /^release-.*$/ - /^ghgfk-.*$/ cache: directories: - - $HOME/.composer/cache - - vendor + - $HOME/.composer/ - $HOME/.local - zf-mkdoc-theme @@ -80,13 +79,12 @@ 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 [[ $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 [[ $DEPS == 'lowest' ]]; then travis_retry composer update $COMPOSER_ARGS --prefer-lowest --prefer-stable ; fi - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi - composer show script: - - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; fi - - if [[ $TEST_COVERAGE != 'true' ]]; then composer test ; fi + - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi - if [[ $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 From 7038329029b2946c171ea735bd64afd1ea596de6 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Thu, 22 Jun 2017 14:47:40 +0200 Subject: [PATCH 07/40] Travis: drop HVVM & Add PHP 7.2 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f2cf3a90..1a03e922 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,17 +59,17 @@ matrix: - php: 7.1 env: - DEPS=latest - - php: hhvm + - php: nightly env: - DEPS=lowest - - php: hhvm + - php: nightly env: - DEPS=locked - - php: hhvm + - php: nightly env: - DEPS=latest allow_failures: - - php: hhvm + - php: nightly before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi From fbda16c3e87725ac64418e8578d167320855f20b Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Thu, 22 Jun 2017 14:57:02 +0200 Subject: [PATCH 08/40] Prepare to PHP 7.2 --- src/Form.php | 2 +- test/View/Helper/FormSelectTest.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Form.php b/src/Form.php index c9c1a43f..937d9265 100644 --- a/src/Form.php +++ b/src/Form.php @@ -328,7 +328,7 @@ public function setHydrator(HydratorInterface $hydrator) * @param array $values * @return mixed */ - public function bindValues(array $values = []) + public function bindValues(array $values = [], array $validationGroup = null) { if (! is_object($this->object)) { if ($this->baseFieldset === null || $this->baseFieldset->allowValueBinding() == false) { diff --git a/test/View/Helper/FormSelectTest.php b/test/View/Helper/FormSelectTest.php index 5988ef78..3db96928 100644 --- a/test/View/Helper/FormSelectTest.php +++ b/test/View/Helper/FormSelectTest.php @@ -216,7 +216,8 @@ public function testScalarOptionValues($options) $element = new SelectElement('foo'); $element->setValueOptions($options); $markup = $this->helper->render($element); - list($value, $label) = each($options); + $value = key($options); + $label = current($options); $this->assertRegexp(sprintf('#option .*?value="%s"#', (string) $value), $markup); } From 3b792fd533f1ddd5f6603e8c1eefda9ab5d5b782 Mon Sep 17 00:00:00 2001 From: Guido Date: Tue, 11 Jul 2017 23:37:54 +0200 Subject: [PATCH 09/40] Updated the DateTime format to use the format field instead of the static value --- src/Element/DateTime.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Element/DateTime.php b/src/Element/DateTime.php index 88d9135e..e3ac1e9d 100644 --- a/src/Element/DateTime.php +++ b/src/Element/DateTime.php @@ -135,7 +135,7 @@ protected function getValidators() throw new InvalidArgumentException(sprintf( '%1$s expects "min" to conform to %2$s; received "%3$s"', __METHOD__, - static::DATETIME_FORMAT, + $this->format, $this->attributes['min'] )); } @@ -153,7 +153,7 @@ protected function getValidators() throw new InvalidArgumentException(sprintf( '%1$s expects "max" to conform to %2$s; received "%3$s"', __METHOD__, - static::DATETIME_FORMAT, + $this->format, $this->attributes['max'] )); } @@ -226,7 +226,7 @@ public function getInputSpecification() private function valueIsValidDateTimeFormat($value) { return PhpDateTime::createFromFormat( - static::DATETIME_FORMAT, + $this->format, $value ) instanceof DateTimeInterface; } From b7f9cd8c5cbc60256e3f48e9ce5d9e25243b8688 Mon Sep 17 00:00:00 2001 From: Guido Date: Tue, 11 Jul 2017 23:39:57 +0200 Subject: [PATCH 10/40] Fixed broken tests. Updated the formats within the tests. --- test/Element/DateTest.php | 4 ++-- test/Element/MonthTest.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/Element/DateTest.php b/test/Element/DateTest.php index 0c5d49e0..0ef6795b 100644 --- a/test/Element/DateTest.php +++ b/test/Element/DateTest.php @@ -125,8 +125,8 @@ public function testCorrectFormatPassedToDateValidator() { $element = new DateElement('foo'); $element->setAttributes([ - 'min' => '2012-01-01', - 'max' => '2012-12-31', + 'min' => '01-01-2012', + 'max' => '31-12-2012', ]); $element->setFormat('d-m-Y'); diff --git a/test/Element/MonthTest.php b/test/Element/MonthTest.php index 6f8d17ca..d91a014b 100644 --- a/test/Element/MonthTest.php +++ b/test/Element/MonthTest.php @@ -17,6 +17,7 @@ class MonthTest extends TestCase public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttributes() { $element = new MonthElement('foo'); + $element->setFormat('Y-m'); $element->setAttributes([ 'inclusive' => true, 'min' => '2000-01', From 9eaecdcf387aa1ec12911f90e091366279c89287 Mon Sep 17 00:00:00 2001 From: Guido Buiting Date: Wed, 12 Jul 2017 09:23:19 +0200 Subject: [PATCH 11/40] Added the format field to the Element\Month. Updated the test to no longer set the format for the Element\Month. --- src/Element/Month.php | 7 +++++++ test/Element/MonthTest.php | 1 - 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Element/Month.php b/src/Element/Month.php index a5e24d2b..104f56d4 100644 --- a/src/Element/Month.php +++ b/src/Element/Month.php @@ -18,6 +18,13 @@ class Month extends DateTime const DATETIME_FORMAT = 'Y-m'; + /** + * A valid format string accepted by date() + * + * @var string + */ + protected $format = self::DATETIME_FORMAT; + /** * Seed attributes * diff --git a/test/Element/MonthTest.php b/test/Element/MonthTest.php index d91a014b..6f8d17ca 100644 --- a/test/Element/MonthTest.php +++ b/test/Element/MonthTest.php @@ -17,7 +17,6 @@ class MonthTest extends TestCase public function testProvidesInputSpecificationThatIncludesValidatorsBasedOnAttributes() { $element = new MonthElement('foo'); - $element->setFormat('Y-m'); $element->setAttributes([ 'inclusive' => true, 'min' => '2000-01', From 38c0550a5155d29937b26de4fedd2f52630c3676 Mon Sep 17 00:00:00 2001 From: Filippo Tessarotto Date: Thu, 24 Aug 2017 11:37:28 +0200 Subject: [PATCH 12/40] Travis matrix: nightly -> 7.2 --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a03e922..364e331f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,17 +59,17 @@ matrix: - php: 7.1 env: - DEPS=latest - - php: nightly + - php: 7.2 env: - DEPS=lowest - - php: nightly + - php: 7.2 env: - DEPS=locked - - php: nightly + - php: 7.2 env: - DEPS=latest allow_failures: - - php: nightly + - php: 7.2 before_install: - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi From 083fd3402948999e76dcc9d287073717583df487 Mon Sep 17 00:00:00 2001 From: Grzegorz Szymaszek Date: Mon, 11 Sep 2017 15:46:46 +0200 Subject: [PATCH 13/40] Compare against DateTimeInterface in DateTime::getValue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When checking whether Element\DateTime’s value is an actual PHP DateTime, it’s more useful to check if it’s an instance of DateTimeInterface, since such approach allows to use either DateTime or DateTimeImmutable object as element value. --- src/Element/DateTime.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Element/DateTime.php b/src/Element/DateTime.php index 88d9135e..234665ed 100644 --- a/src/Element/DateTime.php +++ b/src/Element/DateTime.php @@ -66,9 +66,9 @@ public function setOptions($options) /** * Retrieve the element value * - * If the value is a DateTime object, and $returnFormattedValue is true - * (the default), we return the string - * representation using the currently registered format. + * If the value is instance of DateTimeInterface, and $returnFormattedValue + * is true (the default), we return the string representation using the + * currently registered format. * * If $returnFormattedValue is false, the original value will be * returned, regardless of type. @@ -79,7 +79,7 @@ public function setOptions($options) public function getValue($returnFormattedValue = true) { $value = parent::getValue(); - if (! $value instanceof PhpDateTime || ! $returnFormattedValue) { + if (! $value instanceof DateTimeInterface || ! $returnFormattedValue) { return $value; } $format = $this->getFormat(); From 7b59ccc1ee8193ece6747b46c14e7dee7ced6f4b Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:10:35 -0600 Subject: [PATCH 14/40] Ensure new test passes under PHPUnit 5.7/6.0 - Use `createMock()` instead of `getMock()`. - Allow re-use of translator, text domain, when iterating over messages items. --- src/View/Helper/FormElementErrors.php | 12 ++++++------ test/View/Helper/FormElementErrorsTest.php | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/View/Helper/FormElementErrors.php b/src/View/Helper/FormElementErrors.php index 2ba68bca..bc0b7f0d 100644 --- a/src/View/Helper/FormElementErrors.php +++ b/src/View/Helper/FormElementErrors.php @@ -78,13 +78,13 @@ public function render(ElementInterface $element, array $attributes = []) // Flatten message array $escapeHtml = $this->getEscapeHtmlHelper(); $messagesToPrint = []; - array_walk_recursive($messages, function ($item) use (&$messagesToPrint, $escapeHtml) { - if (null !== ($translator = $this->getTranslator())) { - $item = $translator->translate($item, $this->getTranslatorTextDomain()); - } - + $translator = $this->getTranslator(); + $textDomain = $this->getTranslatorTextDomain(); + $messageCallback = function ($item) use (&$messagesToPrint, $escapeHtml, $translator, $textDomain) { + $item = $translator ? $translator->translate($item, $textDomain) : $item; $messagesToPrint[] = $escapeHtml($item); - }); + }; + array_walk_recursive($messages, $messageCallback); if (empty($messagesToPrint)) { return ''; diff --git a/test/View/Helper/FormElementErrorsTest.php b/test/View/Helper/FormElementErrorsTest.php index f14b755c..3e7dae2a 100644 --- a/test/View/Helper/FormElementErrorsTest.php +++ b/test/View/Helper/FormElementErrorsTest.php @@ -50,7 +50,7 @@ public function testRendersErrorMessagesUsingUnorderedListByDefault() public function testRendersErrorMessagesUsingUnorderedListTranslated() { - $mockTranslator = $this->getMock('Zend\I18n\Translator\Translator'); + $mockTranslator = $this->createMock('Zend\I18n\Translator\Translator'); $mockTranslator->expects($this->at(0)) ->method('translate') ->will($this->returnValue('Translated first error message')); From bce9708131bcf0cbc6a6d8f218760b7322295c10 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:11:42 -0600 Subject: [PATCH 15/40] Adds CHANGELOG for #104 --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f770029..f0d592ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ All notable changes to this project will be documented in this file, in reverse ### Added -- Nothing. +- [#104](https://github.com/zendframework/zend-form/pull/104) adds the ability + for the `FormElementErrors` view helper to translate validation error messages + using the composed translator and text domain instances. ### Deprecated From a3dc303f7285420c5a29e6af6fc80f369356119a Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:14:58 -0600 Subject: [PATCH 16/40] Fix CS warning Need to ignore a line that contains a very long regex. --- test/View/Helper/FormElementErrorsTest.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/View/Helper/FormElementErrorsTest.php b/test/View/Helper/FormElementErrorsTest.php index 3e7dae2a..66a44909 100644 --- a/test/View/Helper/FormElementErrorsTest.php +++ b/test/View/Helper/FormElementErrorsTest.php @@ -71,7 +71,9 @@ public function testRendersErrorMessagesUsingUnorderedListTranslated() $element->setMessages($messages); $markup = $this->helper->render($element); + // @codingStandardsIgnoreStart $this->assertRegexp('#
    \s*
  • Translated first error message
  • \s*
  • Translated second error message
  • \s*
  • Translated third error message
  • \s*
#s', $markup); + // @codingStandardsIgnoreEnd } public function testCanSpecifyAttributesForOpeningTag() From c7867fe415a7636c9c48adeb3e7861f286ee2b50 Mon Sep 17 00:00:00 2001 From: Patrick Winkelmayer Date: Wed, 3 May 2017 15:02:38 +0200 Subject: [PATCH 17/40] fixed form hydration for forms with wrapped elements, broken since 82b0cdcad2be8313f78bc53eb4d775fc243281cf --- src/Fieldset.php | 3 +-- test/FormTest.php | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/Fieldset.php b/src/Fieldset.php index 10c494f1..250a6430 100644 --- a/src/Fieldset.php +++ b/src/Fieldset.php @@ -569,8 +569,7 @@ public function bindValues(array $values = [], array $validationGroup = null) $hydrator = $this->getHydrator(); $hydratableData = []; - foreach ($this->iterator as $element) { - $name = $element->getName(); + foreach ($this->iterator as $name => $element) { if ($validationGroup && (! array_key_exists($name, $validationGroup) && ! in_array($name, $validationGroup)) diff --git a/test/FormTest.php b/test/FormTest.php index fc8f4459..c39973c1 100644 --- a/test/FormTest.php +++ b/test/FormTest.php @@ -785,6 +785,39 @@ public function testCallingBindValuesWhenBindOnValidateIsDisabledPopulatesBoundO ], $model->foobar); } + public function testBindValuesWithWrappingPopulatesBoundObject() + { + $model = new stdClass; + $validSet = [ + 'foo' => 'abcde', + 'bar' => ' ALWAYS valid ', + 'foobar' => [ + 'foo' => 'abcde', + 'bar' => ' always VALID', + ], + ]; + $this->populateForm(); + $this->form->setHydrator(new Hydrator\ObjectProperty()); + $this->form->setName('formName'); + $this->form->setWrapElements(true); + $this->form->prepare(); + $this->form->bind($model); + $this->form->setData($validSet); + + $this->assertObjectNotHasAttribute('foo', $model); + $this->assertObjectNotHasAttribute('bar', $model); + $this->assertObjectNotHasAttribute('foobar', $model); + + $this->form->isValid(); + + $this->assertEquals($validSet['foo'], $model->foo); + $this->assertEquals('always valid', $model->bar); + $this->assertEquals([ + 'foo' => 'abcde', + 'bar' => 'always valid', + ], $model->foobar); + } + public function testHasFactoryComposedByDefault() { $factory = $this->form->getFormFactory(); From 853ae721cb28104b871f3c58641a78a4c104fc30 Mon Sep 17 00:00:00 2001 From: Patrick Winkelmayer Date: Wed, 3 May 2017 15:15:26 +0200 Subject: [PATCH 18/40] code style fixes --- src/Fieldset.php | 1 - test/FormTest.php | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Fieldset.php b/src/Fieldset.php index 250a6430..27842857 100644 --- a/src/Fieldset.php +++ b/src/Fieldset.php @@ -570,7 +570,6 @@ public function bindValues(array $values = [], array $validationGroup = null) $hydratableData = []; foreach ($this->iterator as $name => $element) { - if ($validationGroup && (! array_key_exists($name, $validationGroup) && ! in_array($name, $validationGroup)) ) { diff --git a/test/FormTest.php b/test/FormTest.php index c39973c1..538a23a3 100644 --- a/test/FormTest.php +++ b/test/FormTest.php @@ -798,9 +798,9 @@ public function testBindValuesWithWrappingPopulatesBoundObject() ]; $this->populateForm(); $this->form->setHydrator(new Hydrator\ObjectProperty()); - $this->form->setName('formName'); + $this->form->setName('formName'); $this->form->setWrapElements(true); - $this->form->prepare(); + $this->form->prepare(); $this->form->bind($model); $this->form->setData($validSet); From 22839d631583ba9382e56647f69ca3196ec32be4 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:17:24 -0600 Subject: [PATCH 19/40] Adds CHANGELOG entry for #162 --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0d592ee..927fa299 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ All notable changes to this project will be documented in this file, in reverse for the `FormElementErrors` view helper to translate validation error messages using the composed translator and text domain instances. +### Changed + +- Nothing. + ### Deprecated - Nothing. @@ -20,7 +24,10 @@ All notable changes to this project will be documented in this file, in reverse ### Fixed -- Nothing. +- [#162](https://github.com/zendframework/zend-form/pull/162) fixes an issue + with hydration when a form has called `setWrapElements(true)`, ensuring that + binding values in a fieldset will correctly identify the elements in the + provided data. ## 2.10.3 - TBD From 78fed36fc9bfbc69cb354d2c79224757c5ff12d7 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:21:51 -0600 Subject: [PATCH 20/40] Adds CHANGELOG entry for #172 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 927fa299..dfdbce3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,12 @@ All notable changes to this project will be documented in this file, in reverse binding values in a fieldset will correctly identify the elements in the provided data. +- [#172](https://github.com/zendframework/zend-form/pull/172) fixes the + `DateTime` element such that it no longer attempts to use its + `DATETIME_FORMAT` constant, but, rather, the value of the `$format` property, + when representing the element; this change allows developers to override the + format, which was the original intention. + ## 2.10.3 - TBD ### Added From 7b053e3035b74c967740722697b541ac5750078b Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:32:02 -0600 Subject: [PATCH 21/40] Adds CHANGELOG for #178 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dfdbce3a..f6307326 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,11 @@ All notable changes to this project will be documented in this file, in reverse when representing the element; this change allows developers to override the format, which was the original intention. +- [#178](https://github.com/zendframework/zend-form/pull/178) loosens the checks + in `Zend\Form\Element\DateTime::getValue()` to check against PHP's `DateTimeInterface` (vs + `DateTime`) when retrieving the value; this fixes edge cases where it was + instead returning the format for `DateTimeImmutable` values. + ## 2.10.3 - TBD ### Added From 18b5a90f9f98d335690babdbd9f310f1e2f52f0a Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:21:44 +0000 Subject: [PATCH 22/40] Rename documentation directory: doc -> docs --- .gitattributes | 1 + .gitignore | 1 + docs/CODE_OF_CONDUCT.md | 43 ++++ docs/CONTRIBUTING.md | 234 ++++++++++++++++++ {doc => docs}/book/advanced.md | 0 {doc => docs}/book/collections.md | 0 {doc => docs}/book/element/button.md | 0 {doc => docs}/book/element/captcha.md | 0 {doc => docs}/book/element/checkbox.md | 0 {doc => docs}/book/element/collection.md | 0 {doc => docs}/book/element/color.md | 0 {doc => docs}/book/element/csrf.md | 0 {doc => docs}/book/element/date-time-local.md | 0 {doc => docs}/book/element/date-time.md | 0 {doc => docs}/book/element/date.md | 0 {doc => docs}/book/element/element.md | 0 {doc => docs}/book/element/email.md | 0 {doc => docs}/book/element/file.md | 0 {doc => docs}/book/element/hidden.md | 0 {doc => docs}/book/element/image.md | 0 {doc => docs}/book/element/intro.md | 0 {doc => docs}/book/element/month-select.md | 0 {doc => docs}/book/element/month.md | 0 {doc => docs}/book/element/multi-checkbox.md | 0 {doc => docs}/book/element/number.md | 0 {doc => docs}/book/element/password.md | 0 {doc => docs}/book/element/radio.md | 0 {doc => docs}/book/element/range.md | 0 {doc => docs}/book/element/search.md | 0 {doc => docs}/book/element/select.md | 0 {doc => docs}/book/element/submit.md | 0 {doc => docs}/book/element/tel.md | 0 {doc => docs}/book/element/text.md | 0 {doc => docs}/book/element/textarea.md | 0 {doc => docs}/book/element/time.md | 0 {doc => docs}/book/element/url.md | 0 {doc => docs}/book/element/week.md | 0 {doc => docs}/book/file-upload.md | 0 {doc => docs}/book/helper/abstract-helper.md | 0 {doc => docs}/book/helper/form-button.md | 0 {doc => docs}/book/helper/form-captcha.md | 0 {doc => docs}/book/helper/form-checkbox.md | 0 {doc => docs}/book/helper/form-collection.md | 0 {doc => docs}/book/helper/form-color.md | 0 .../book/helper/form-date-time-local.md | 0 {doc => docs}/book/helper/form-date-time.md | 0 {doc => docs}/book/helper/form-date.md | 0 .../book/helper/form-element-errors.md | 0 {doc => docs}/book/helper/form-element.md | 0 {doc => docs}/book/helper/form-email.md | 0 .../book/helper/form-file-apc-progress.md | 0 .../book/helper/form-file-session-progress.md | 0 .../book/helper/form-file-upload-progress.md | 0 {doc => docs}/book/helper/form-file.md | 0 {doc => docs}/book/helper/form-hidden.md | 0 {doc => docs}/book/helper/form-image.md | 0 {doc => docs}/book/helper/form-input.md | 0 {doc => docs}/book/helper/form-label.md | 0 .../book/helper/form-month-select.md | 0 {doc => docs}/book/helper/form-month.md | 0 .../book/helper/form-multicheckbox.md | 0 {doc => docs}/book/helper/form-number.md | 0 {doc => docs}/book/helper/form-password.md | 0 {doc => docs}/book/helper/form-radio.md | 0 {doc => docs}/book/helper/form-range.md | 0 {doc => docs}/book/helper/form-reset.md | 0 {doc => docs}/book/helper/form-row.md | 0 {doc => docs}/book/helper/form-search.md | 0 {doc => docs}/book/helper/form-select.md | 0 {doc => docs}/book/helper/form-submit.md | 0 {doc => docs}/book/helper/form-tel.md | 0 {doc => docs}/book/helper/form-text.md | 0 {doc => docs}/book/helper/form-textarea.md | 0 {doc => docs}/book/helper/form-time.md | 0 {doc => docs}/book/helper/form-url.md | 0 {doc => docs}/book/helper/form-week.md | 0 {doc => docs}/book/helper/form.md | 0 {doc => docs}/book/helper/intro.md | 0 .../book/helper/upload-progress-helpers.md | 0 .../collections.dynamic-elements.result.png | Bin .../collections.dynamic-elements.template.png | Bin .../images/collections.validation-groups.png | Bin .../book/images/collections.view.png | Bin .../book/images/collections.view.result.png | Bin {doc => docs}/book/index.html | 0 {doc => docs}/book/index.md | 0 {doc => docs}/book/intro.md | 0 {doc => docs}/book/quick-start.md | 0 {doc => docs}/book/view-helpers.md | 0 mkdocs.yml | 4 +- 90 files changed, 281 insertions(+), 2 deletions(-) create mode 100644 docs/CODE_OF_CONDUCT.md create mode 100644 docs/CONTRIBUTING.md rename {doc => docs}/book/advanced.md (100%) rename {doc => docs}/book/collections.md (100%) rename {doc => docs}/book/element/button.md (100%) rename {doc => docs}/book/element/captcha.md (100%) rename {doc => docs}/book/element/checkbox.md (100%) rename {doc => docs}/book/element/collection.md (100%) rename {doc => docs}/book/element/color.md (100%) rename {doc => docs}/book/element/csrf.md (100%) rename {doc => docs}/book/element/date-time-local.md (100%) rename {doc => docs}/book/element/date-time.md (100%) rename {doc => docs}/book/element/date.md (100%) rename {doc => docs}/book/element/element.md (100%) rename {doc => docs}/book/element/email.md (100%) rename {doc => docs}/book/element/file.md (100%) rename {doc => docs}/book/element/hidden.md (100%) rename {doc => docs}/book/element/image.md (100%) rename {doc => docs}/book/element/intro.md (100%) rename {doc => docs}/book/element/month-select.md (100%) rename {doc => docs}/book/element/month.md (100%) rename {doc => docs}/book/element/multi-checkbox.md (100%) rename {doc => docs}/book/element/number.md (100%) rename {doc => docs}/book/element/password.md (100%) rename {doc => docs}/book/element/radio.md (100%) rename {doc => docs}/book/element/range.md (100%) rename {doc => docs}/book/element/search.md (100%) rename {doc => docs}/book/element/select.md (100%) rename {doc => docs}/book/element/submit.md (100%) rename {doc => docs}/book/element/tel.md (100%) rename {doc => docs}/book/element/text.md (100%) rename {doc => docs}/book/element/textarea.md (100%) rename {doc => docs}/book/element/time.md (100%) rename {doc => docs}/book/element/url.md (100%) rename {doc => docs}/book/element/week.md (100%) rename {doc => docs}/book/file-upload.md (100%) rename {doc => docs}/book/helper/abstract-helper.md (100%) rename {doc => docs}/book/helper/form-button.md (100%) rename {doc => docs}/book/helper/form-captcha.md (100%) rename {doc => docs}/book/helper/form-checkbox.md (100%) rename {doc => docs}/book/helper/form-collection.md (100%) rename {doc => docs}/book/helper/form-color.md (100%) rename {doc => docs}/book/helper/form-date-time-local.md (100%) rename {doc => docs}/book/helper/form-date-time.md (100%) rename {doc => docs}/book/helper/form-date.md (100%) rename {doc => docs}/book/helper/form-element-errors.md (100%) rename {doc => docs}/book/helper/form-element.md (100%) rename {doc => docs}/book/helper/form-email.md (100%) rename {doc => docs}/book/helper/form-file-apc-progress.md (100%) rename {doc => docs}/book/helper/form-file-session-progress.md (100%) rename {doc => docs}/book/helper/form-file-upload-progress.md (100%) rename {doc => docs}/book/helper/form-file.md (100%) rename {doc => docs}/book/helper/form-hidden.md (100%) rename {doc => docs}/book/helper/form-image.md (100%) rename {doc => docs}/book/helper/form-input.md (100%) rename {doc => docs}/book/helper/form-label.md (100%) rename {doc => docs}/book/helper/form-month-select.md (100%) rename {doc => docs}/book/helper/form-month.md (100%) rename {doc => docs}/book/helper/form-multicheckbox.md (100%) rename {doc => docs}/book/helper/form-number.md (100%) rename {doc => docs}/book/helper/form-password.md (100%) rename {doc => docs}/book/helper/form-radio.md (100%) rename {doc => docs}/book/helper/form-range.md (100%) rename {doc => docs}/book/helper/form-reset.md (100%) rename {doc => docs}/book/helper/form-row.md (100%) rename {doc => docs}/book/helper/form-search.md (100%) rename {doc => docs}/book/helper/form-select.md (100%) rename {doc => docs}/book/helper/form-submit.md (100%) rename {doc => docs}/book/helper/form-tel.md (100%) rename {doc => docs}/book/helper/form-text.md (100%) rename {doc => docs}/book/helper/form-textarea.md (100%) rename {doc => docs}/book/helper/form-time.md (100%) rename {doc => docs}/book/helper/form-url.md (100%) rename {doc => docs}/book/helper/form-week.md (100%) rename {doc => docs}/book/helper/form.md (100%) rename {doc => docs}/book/helper/intro.md (100%) rename {doc => docs}/book/helper/upload-progress-helpers.md (100%) rename {doc => docs}/book/images/collections.dynamic-elements.result.png (100%) rename {doc => docs}/book/images/collections.dynamic-elements.template.png (100%) rename {doc => docs}/book/images/collections.validation-groups.png (100%) rename {doc => docs}/book/images/collections.view.png (100%) rename {doc => docs}/book/images/collections.view.result.png (100%) rename {doc => docs}/book/index.html (100%) rename {doc => docs}/book/index.md (100%) rename {doc => docs}/book/intro.md (100%) rename {doc => docs}/book/quick-start.md (100%) rename {doc => docs}/book/view-helpers.md (100%) diff --git a/.gitattributes b/.gitattributes index 7325c690..58d78722 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,3 +6,4 @@ .travis.yml export-ignore .php_cs export-ignore phpunit.xml.dist export-ignore +/docs/ export-ignore diff --git a/.gitignore b/.gitignore index 673fe323..ec154cd2 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clover.xml coveralls-upload.json phpunit.xml vendor +/docs/html/ diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..c663d2be --- /dev/null +++ b/docs/CODE_OF_CONDUCT.md @@ -0,0 +1,43 @@ +# Contributor Code of Conduct + +The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com) +as its guidelines for contributor interactions. + +## The Code Manifesto + +We want to work in an ecosystem that empowers developers to reach their +potential — one that encourages growth and effective collaboration. A space that +is safe for all. + +A space such as this benefits everyone that participates in it. It encourages +new developers to enter our field. It is through discussion and collaboration +that we grow, and through growth that we improve. + +In the effort to create such a place, we hold to these values: + +1. **Discrimination limits us.** This includes discrimination on the basis of + race, gender, sexual orientation, gender identity, age, nationality, technology + and any other arbitrary exclusion of a group of people. +2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort + levels. Remember that, and if brought to your attention, heed it. +3. **We are our biggest assets.** None of us were born masters of our trade. + Each of us has been helped along the way. Return that favor, when and where + you can. +4. **We are resources for the future.** As an extension of #3, share what you + know. Make yourself a resource to help those that come after you. +5. **Respect defines us.** Treat others as you wish to be treated. Make your + discussions, criticisms and debates from a position of respectfulness. Ask + yourself, is it true? Is it necessary? Is it constructive? Anything less is + unacceptable. +6. **Reactions require grace.** Angry responses are valid, but abusive language + and vindictive actions are toxic. When something happens that offends you, + handle it assertively, but be respectful. Escalate reasonably, and try to + allow the offender an opportunity to explain themselves, and possibly correct + the issue. +7. **Opinions are just that: opinions.** Each and every one of us, due to our + background and upbringing, have varying opinions. The fact of the matter, is + that is perfectly acceptable. Remember this: if you respect your own + opinions, you should respect the opinions of others. +8. **To err is human.** You might not intend it, but mistakes do happen and + contribute to build experience. Tolerate honest mistakes, and don't hesitate + to apologize if you make one yourself. diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md new file mode 100644 index 00000000..532fbd54 --- /dev/null +++ b/docs/CONTRIBUTING.md @@ -0,0 +1,234 @@ +# CONTRIBUTING + +## RESOURCES + +If you wish to contribute to Zend Framework, please be sure to +read/subscribe to the following resources: + + - [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards) + - [Contributor's Guide](http://framework.zend.com/participate/contributor-guide) + - ZF Contributor's mailing list: + Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html + Subscribe: zf-contributors-subscribe@lists.zend.com + - ZF Contributor's IRC channel: + #zftalk.dev on Freenode.net + +If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-form/issues/new). + +## Reporting Potential Security Issues + +If you have encountered a potential security vulnerability, please **DO NOT** report it on the public +issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead. +We will work with you to verify the vulnerability and patch it as soon as possible. + +When reporting issues, please provide the following information: + +- Component(s) affected +- A description indicating how to reproduce the issue +- A summary of the security vulnerability and impact + +We request that you contact us via the email address above and give the project +contributors a chance to resolve the vulnerability and issue a new release prior +to any public exposure; this helps protect users and provides them with a chance +to upgrade and/or update in order to protect their applications. + +For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc). + +## RUNNING TESTS + +> ### Note: testing versions prior to 2.4 +> +> This component originates with Zend Framework 2. During the lifetime of ZF2, +> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no +> changes were necessary. However, due to the migration, tests may not run on +> versions < 2.4. As such, you may need to change the PHPUnit dependency if +> attempting a fix on such a version. + +To run tests: + +- Clone the repository: + + ```console + $ git clone git@github.com:zendframework/zend-form.git + $ cd + ``` + +- Install dependencies via composer: + + ```console + $ curl -sS https://getcomposer.org/installer | php -- + $ ./composer.phar install + ``` + + If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/ + +- Run the tests via `phpunit` and the provided PHPUnit config, like in this example: + + ```console + $ ./vendor/bin/phpunit + ``` + +You can turn on conditional tests with the phpunit.xml file. +To do so: + + - Copy `phpunit.xml.dist` file to `phpunit.xml` + - Edit `phpunit.xml` to enable any specific functionality you + want to test, as well as to provide test values to utilize. + +## Running Coding Standards Checks + +This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding +standards checks, and provides configuration for our selected checks. +`phpcs` is installed by default via Composer. + +To run checks only: + +```console +$ composer cs-check +``` + +`phpcs` also includes a tool for fixing most CS violations, `phpcbf`: + + +```console +$ composer cs-fix +``` + +If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure +they pass, and make sure you add and commit the changes after verification. + +## Recommended Workflow for Contributions + +Your first step is to establish a public repository from which we can +pull your work into the master repository. We recommend using +[GitHub](https://github.com), as that is where the component is already hosted. + +1. Setup a [GitHub account](http://github.com/), if you haven't yet +2. Fork the repository (http://github.com/zendframework/zend-form) +3. Clone the canonical repository locally and enter it. + + ```console + $ git clone git@github.com:zendframework/zend-form.git + $ cd zend-form + ``` + +4. Add a remote to your fork; substitute your GitHub username in the command + below. + + ```console + $ git remote add {username} git@github.com:{username}/zend-form.git + $ git fetch {username} + ``` + +### Keeping Up-to-Date + +Periodically, you should update your fork or personal repository to +match the canonical ZF repository. Assuming you have setup your local repository +per the instructions above, you can do the following: + + +```console +$ git checkout master +$ git fetch origin +$ git rebase origin/master +# OPTIONALLY, to keep your remote up-to-date - +$ git push {username} master:master +``` + +If you're tracking other branches -- for example, the "develop" branch, where +new feature development occurs -- you'll want to do the same operations for that +branch; simply substitute "develop" for "master". + +### Working on a patch + +We recommend you do each new feature or bugfix in a new branch. This simplifies +the task of code review as well as the task of merging your changes into the +canonical repository. + +A typical workflow will then consist of the following: + +1. Create a new local branch based off either your master or develop branch. +2. Switch to your new local branch. (This step can be combined with the + previous step with the use of `git checkout -b`.) +3. Do some work, commit, repeat as necessary. +4. Push the local branch to your remote repository. +5. Send a pull request. + +The mechanics of this process are actually quite trivial. Below, we will +create a branch for fixing an issue in the tracker. + +```console +$ git checkout -b hotfix/9295 +Switched to a new branch 'hotfix/9295' +``` + +... do some work ... + + +```console +$ git commit +``` + +... write your log message ... + + +```console +$ git push {username} hotfix/9295:hotfix/9295 +Counting objects: 38, done. +Delta compression using up to 2 threads. +Compression objects: 100% (18/18), done. +Writing objects: 100% (20/20), 8.19KiB, done. +Total 20 (delta 12), reused 0 (delta 0) +To ssh://git@github.com/{username}/zend-form.git + b5583aa..4f51698 HEAD -> master +``` + +To send a pull request, you have two options. + +If using GitHub, you can do the pull request from there. Navigate to +your repository, select the branch you just created, and then select the +"Pull Request" button in the upper right. Select the user/organization +"zendframework" as the recipient. + +If using your own repository - or even if using GitHub - you can use `git +format-patch` to create a patchset for us to apply; in fact, this is +**recommended** for security-related patches. If you use `format-patch`, please +send the patches as attachments to: + +- zf-devteam@zend.com for patches without security implications +- zf-security@zend.com for security patches + +#### What branch to issue the pull request against? + +Which branch should you issue a pull request against? + +- For fixes against the stable release, issue the pull request against the + "master" branch. +- For new features, or fixes that introduce new elements to the public API (such + as new public methods or properties), issue the pull request against the + "develop" branch. + +### Branch Cleanup + +As you might imagine, if you are a frequent contributor, you'll start to +get a ton of branches both locally and on your remote. + +Once you know that your changes have been accepted to the master +repository, we suggest doing some cleanup of these branches. + +- Local branch cleanup + + ```console + $ git branch -d + ``` + +- Remote branch removal + + ```console + $ git push {username} : + ``` + + +## Conduct + +Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project. diff --git a/doc/book/advanced.md b/docs/book/advanced.md similarity index 100% rename from doc/book/advanced.md rename to docs/book/advanced.md diff --git a/doc/book/collections.md b/docs/book/collections.md similarity index 100% rename from doc/book/collections.md rename to docs/book/collections.md diff --git a/doc/book/element/button.md b/docs/book/element/button.md similarity index 100% rename from doc/book/element/button.md rename to docs/book/element/button.md diff --git a/doc/book/element/captcha.md b/docs/book/element/captcha.md similarity index 100% rename from doc/book/element/captcha.md rename to docs/book/element/captcha.md diff --git a/doc/book/element/checkbox.md b/docs/book/element/checkbox.md similarity index 100% rename from doc/book/element/checkbox.md rename to docs/book/element/checkbox.md diff --git a/doc/book/element/collection.md b/docs/book/element/collection.md similarity index 100% rename from doc/book/element/collection.md rename to docs/book/element/collection.md diff --git a/doc/book/element/color.md b/docs/book/element/color.md similarity index 100% rename from doc/book/element/color.md rename to docs/book/element/color.md diff --git a/doc/book/element/csrf.md b/docs/book/element/csrf.md similarity index 100% rename from doc/book/element/csrf.md rename to docs/book/element/csrf.md diff --git a/doc/book/element/date-time-local.md b/docs/book/element/date-time-local.md similarity index 100% rename from doc/book/element/date-time-local.md rename to docs/book/element/date-time-local.md diff --git a/doc/book/element/date-time.md b/docs/book/element/date-time.md similarity index 100% rename from doc/book/element/date-time.md rename to docs/book/element/date-time.md diff --git a/doc/book/element/date.md b/docs/book/element/date.md similarity index 100% rename from doc/book/element/date.md rename to docs/book/element/date.md diff --git a/doc/book/element/element.md b/docs/book/element/element.md similarity index 100% rename from doc/book/element/element.md rename to docs/book/element/element.md diff --git a/doc/book/element/email.md b/docs/book/element/email.md similarity index 100% rename from doc/book/element/email.md rename to docs/book/element/email.md diff --git a/doc/book/element/file.md b/docs/book/element/file.md similarity index 100% rename from doc/book/element/file.md rename to docs/book/element/file.md diff --git a/doc/book/element/hidden.md b/docs/book/element/hidden.md similarity index 100% rename from doc/book/element/hidden.md rename to docs/book/element/hidden.md diff --git a/doc/book/element/image.md b/docs/book/element/image.md similarity index 100% rename from doc/book/element/image.md rename to docs/book/element/image.md diff --git a/doc/book/element/intro.md b/docs/book/element/intro.md similarity index 100% rename from doc/book/element/intro.md rename to docs/book/element/intro.md diff --git a/doc/book/element/month-select.md b/docs/book/element/month-select.md similarity index 100% rename from doc/book/element/month-select.md rename to docs/book/element/month-select.md diff --git a/doc/book/element/month.md b/docs/book/element/month.md similarity index 100% rename from doc/book/element/month.md rename to docs/book/element/month.md diff --git a/doc/book/element/multi-checkbox.md b/docs/book/element/multi-checkbox.md similarity index 100% rename from doc/book/element/multi-checkbox.md rename to docs/book/element/multi-checkbox.md diff --git a/doc/book/element/number.md b/docs/book/element/number.md similarity index 100% rename from doc/book/element/number.md rename to docs/book/element/number.md diff --git a/doc/book/element/password.md b/docs/book/element/password.md similarity index 100% rename from doc/book/element/password.md rename to docs/book/element/password.md diff --git a/doc/book/element/radio.md b/docs/book/element/radio.md similarity index 100% rename from doc/book/element/radio.md rename to docs/book/element/radio.md diff --git a/doc/book/element/range.md b/docs/book/element/range.md similarity index 100% rename from doc/book/element/range.md rename to docs/book/element/range.md diff --git a/doc/book/element/search.md b/docs/book/element/search.md similarity index 100% rename from doc/book/element/search.md rename to docs/book/element/search.md diff --git a/doc/book/element/select.md b/docs/book/element/select.md similarity index 100% rename from doc/book/element/select.md rename to docs/book/element/select.md diff --git a/doc/book/element/submit.md b/docs/book/element/submit.md similarity index 100% rename from doc/book/element/submit.md rename to docs/book/element/submit.md diff --git a/doc/book/element/tel.md b/docs/book/element/tel.md similarity index 100% rename from doc/book/element/tel.md rename to docs/book/element/tel.md diff --git a/doc/book/element/text.md b/docs/book/element/text.md similarity index 100% rename from doc/book/element/text.md rename to docs/book/element/text.md diff --git a/doc/book/element/textarea.md b/docs/book/element/textarea.md similarity index 100% rename from doc/book/element/textarea.md rename to docs/book/element/textarea.md diff --git a/doc/book/element/time.md b/docs/book/element/time.md similarity index 100% rename from doc/book/element/time.md rename to docs/book/element/time.md diff --git a/doc/book/element/url.md b/docs/book/element/url.md similarity index 100% rename from doc/book/element/url.md rename to docs/book/element/url.md diff --git a/doc/book/element/week.md b/docs/book/element/week.md similarity index 100% rename from doc/book/element/week.md rename to docs/book/element/week.md diff --git a/doc/book/file-upload.md b/docs/book/file-upload.md similarity index 100% rename from doc/book/file-upload.md rename to docs/book/file-upload.md diff --git a/doc/book/helper/abstract-helper.md b/docs/book/helper/abstract-helper.md similarity index 100% rename from doc/book/helper/abstract-helper.md rename to docs/book/helper/abstract-helper.md diff --git a/doc/book/helper/form-button.md b/docs/book/helper/form-button.md similarity index 100% rename from doc/book/helper/form-button.md rename to docs/book/helper/form-button.md diff --git a/doc/book/helper/form-captcha.md b/docs/book/helper/form-captcha.md similarity index 100% rename from doc/book/helper/form-captcha.md rename to docs/book/helper/form-captcha.md diff --git a/doc/book/helper/form-checkbox.md b/docs/book/helper/form-checkbox.md similarity index 100% rename from doc/book/helper/form-checkbox.md rename to docs/book/helper/form-checkbox.md diff --git a/doc/book/helper/form-collection.md b/docs/book/helper/form-collection.md similarity index 100% rename from doc/book/helper/form-collection.md rename to docs/book/helper/form-collection.md diff --git a/doc/book/helper/form-color.md b/docs/book/helper/form-color.md similarity index 100% rename from doc/book/helper/form-color.md rename to docs/book/helper/form-color.md diff --git a/doc/book/helper/form-date-time-local.md b/docs/book/helper/form-date-time-local.md similarity index 100% rename from doc/book/helper/form-date-time-local.md rename to docs/book/helper/form-date-time-local.md diff --git a/doc/book/helper/form-date-time.md b/docs/book/helper/form-date-time.md similarity index 100% rename from doc/book/helper/form-date-time.md rename to docs/book/helper/form-date-time.md diff --git a/doc/book/helper/form-date.md b/docs/book/helper/form-date.md similarity index 100% rename from doc/book/helper/form-date.md rename to docs/book/helper/form-date.md diff --git a/doc/book/helper/form-element-errors.md b/docs/book/helper/form-element-errors.md similarity index 100% rename from doc/book/helper/form-element-errors.md rename to docs/book/helper/form-element-errors.md diff --git a/doc/book/helper/form-element.md b/docs/book/helper/form-element.md similarity index 100% rename from doc/book/helper/form-element.md rename to docs/book/helper/form-element.md diff --git a/doc/book/helper/form-email.md b/docs/book/helper/form-email.md similarity index 100% rename from doc/book/helper/form-email.md rename to docs/book/helper/form-email.md diff --git a/doc/book/helper/form-file-apc-progress.md b/docs/book/helper/form-file-apc-progress.md similarity index 100% rename from doc/book/helper/form-file-apc-progress.md rename to docs/book/helper/form-file-apc-progress.md diff --git a/doc/book/helper/form-file-session-progress.md b/docs/book/helper/form-file-session-progress.md similarity index 100% rename from doc/book/helper/form-file-session-progress.md rename to docs/book/helper/form-file-session-progress.md diff --git a/doc/book/helper/form-file-upload-progress.md b/docs/book/helper/form-file-upload-progress.md similarity index 100% rename from doc/book/helper/form-file-upload-progress.md rename to docs/book/helper/form-file-upload-progress.md diff --git a/doc/book/helper/form-file.md b/docs/book/helper/form-file.md similarity index 100% rename from doc/book/helper/form-file.md rename to docs/book/helper/form-file.md diff --git a/doc/book/helper/form-hidden.md b/docs/book/helper/form-hidden.md similarity index 100% rename from doc/book/helper/form-hidden.md rename to docs/book/helper/form-hidden.md diff --git a/doc/book/helper/form-image.md b/docs/book/helper/form-image.md similarity index 100% rename from doc/book/helper/form-image.md rename to docs/book/helper/form-image.md diff --git a/doc/book/helper/form-input.md b/docs/book/helper/form-input.md similarity index 100% rename from doc/book/helper/form-input.md rename to docs/book/helper/form-input.md diff --git a/doc/book/helper/form-label.md b/docs/book/helper/form-label.md similarity index 100% rename from doc/book/helper/form-label.md rename to docs/book/helper/form-label.md diff --git a/doc/book/helper/form-month-select.md b/docs/book/helper/form-month-select.md similarity index 100% rename from doc/book/helper/form-month-select.md rename to docs/book/helper/form-month-select.md diff --git a/doc/book/helper/form-month.md b/docs/book/helper/form-month.md similarity index 100% rename from doc/book/helper/form-month.md rename to docs/book/helper/form-month.md diff --git a/doc/book/helper/form-multicheckbox.md b/docs/book/helper/form-multicheckbox.md similarity index 100% rename from doc/book/helper/form-multicheckbox.md rename to docs/book/helper/form-multicheckbox.md diff --git a/doc/book/helper/form-number.md b/docs/book/helper/form-number.md similarity index 100% rename from doc/book/helper/form-number.md rename to docs/book/helper/form-number.md diff --git a/doc/book/helper/form-password.md b/docs/book/helper/form-password.md similarity index 100% rename from doc/book/helper/form-password.md rename to docs/book/helper/form-password.md diff --git a/doc/book/helper/form-radio.md b/docs/book/helper/form-radio.md similarity index 100% rename from doc/book/helper/form-radio.md rename to docs/book/helper/form-radio.md diff --git a/doc/book/helper/form-range.md b/docs/book/helper/form-range.md similarity index 100% rename from doc/book/helper/form-range.md rename to docs/book/helper/form-range.md diff --git a/doc/book/helper/form-reset.md b/docs/book/helper/form-reset.md similarity index 100% rename from doc/book/helper/form-reset.md rename to docs/book/helper/form-reset.md diff --git a/doc/book/helper/form-row.md b/docs/book/helper/form-row.md similarity index 100% rename from doc/book/helper/form-row.md rename to docs/book/helper/form-row.md diff --git a/doc/book/helper/form-search.md b/docs/book/helper/form-search.md similarity index 100% rename from doc/book/helper/form-search.md rename to docs/book/helper/form-search.md diff --git a/doc/book/helper/form-select.md b/docs/book/helper/form-select.md similarity index 100% rename from doc/book/helper/form-select.md rename to docs/book/helper/form-select.md diff --git a/doc/book/helper/form-submit.md b/docs/book/helper/form-submit.md similarity index 100% rename from doc/book/helper/form-submit.md rename to docs/book/helper/form-submit.md diff --git a/doc/book/helper/form-tel.md b/docs/book/helper/form-tel.md similarity index 100% rename from doc/book/helper/form-tel.md rename to docs/book/helper/form-tel.md diff --git a/doc/book/helper/form-text.md b/docs/book/helper/form-text.md similarity index 100% rename from doc/book/helper/form-text.md rename to docs/book/helper/form-text.md diff --git a/doc/book/helper/form-textarea.md b/docs/book/helper/form-textarea.md similarity index 100% rename from doc/book/helper/form-textarea.md rename to docs/book/helper/form-textarea.md diff --git a/doc/book/helper/form-time.md b/docs/book/helper/form-time.md similarity index 100% rename from doc/book/helper/form-time.md rename to docs/book/helper/form-time.md diff --git a/doc/book/helper/form-url.md b/docs/book/helper/form-url.md similarity index 100% rename from doc/book/helper/form-url.md rename to docs/book/helper/form-url.md diff --git a/doc/book/helper/form-week.md b/docs/book/helper/form-week.md similarity index 100% rename from doc/book/helper/form-week.md rename to docs/book/helper/form-week.md diff --git a/doc/book/helper/form.md b/docs/book/helper/form.md similarity index 100% rename from doc/book/helper/form.md rename to docs/book/helper/form.md diff --git a/doc/book/helper/intro.md b/docs/book/helper/intro.md similarity index 100% rename from doc/book/helper/intro.md rename to docs/book/helper/intro.md diff --git a/doc/book/helper/upload-progress-helpers.md b/docs/book/helper/upload-progress-helpers.md similarity index 100% rename from doc/book/helper/upload-progress-helpers.md rename to docs/book/helper/upload-progress-helpers.md diff --git a/doc/book/images/collections.dynamic-elements.result.png b/docs/book/images/collections.dynamic-elements.result.png similarity index 100% rename from doc/book/images/collections.dynamic-elements.result.png rename to docs/book/images/collections.dynamic-elements.result.png diff --git a/doc/book/images/collections.dynamic-elements.template.png b/docs/book/images/collections.dynamic-elements.template.png similarity index 100% rename from doc/book/images/collections.dynamic-elements.template.png rename to docs/book/images/collections.dynamic-elements.template.png diff --git a/doc/book/images/collections.validation-groups.png b/docs/book/images/collections.validation-groups.png similarity index 100% rename from doc/book/images/collections.validation-groups.png rename to docs/book/images/collections.validation-groups.png diff --git a/doc/book/images/collections.view.png b/docs/book/images/collections.view.png similarity index 100% rename from doc/book/images/collections.view.png rename to docs/book/images/collections.view.png diff --git a/doc/book/images/collections.view.result.png b/docs/book/images/collections.view.result.png similarity index 100% rename from doc/book/images/collections.view.result.png rename to docs/book/images/collections.view.result.png diff --git a/doc/book/index.html b/docs/book/index.html similarity index 100% rename from doc/book/index.html rename to docs/book/index.html diff --git a/doc/book/index.md b/docs/book/index.md similarity index 100% rename from doc/book/index.md rename to docs/book/index.md diff --git a/doc/book/intro.md b/docs/book/intro.md similarity index 100% rename from doc/book/intro.md rename to docs/book/intro.md diff --git a/doc/book/quick-start.md b/docs/book/quick-start.md similarity index 100% rename from doc/book/quick-start.md rename to docs/book/quick-start.md diff --git a/doc/book/view-helpers.md b/docs/book/view-helpers.md similarity index 100% rename from doc/book/view-helpers.md rename to docs/book/view-helpers.md diff --git a/mkdocs.yml b/mkdocs.yml index 34954d8a..399b1d7c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -1,5 +1,5 @@ -docs_dir: doc/book -site_dir: doc/html +docs_dir: docs/book +site_dir: docs/html pages: - index.md - Intro: intro.md From 8bbc00fd0b8f6c67958e5c40dc6e652fdb3da566 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:21:55 +0000 Subject: [PATCH 23/40] Updated .gitattributes --- .gitattributes | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitattributes b/.gitattributes index 58d78722..16d8d293 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,9 +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 From f832d15e285adf1c85ce5f802eb2ec30ff0b9afc Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:22:12 +0000 Subject: [PATCH 24/40] Updated .gitignore - removed all IDE/OS specific files/dirs --- .gitignore | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index ec154cd2..245087af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +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/ From 1fd4d0fbf8bfa6084985341683fc0411b78cde5a Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:22:33 +0000 Subject: [PATCH 25/40] Moved supporting files into docs directory, updated and added SUPPORT.md --- CONDUCT.md | 43 -------- CONTRIBUTING.md | 234 ---------------------------------------- docs/CODE_OF_CONDUCT.md | 2 +- docs/CONTRIBUTING.md | 91 ++++------------ docs/SUPPORT.md | 25 +++++ 5 files changed, 49 insertions(+), 346 deletions(-) delete mode 100644 CONDUCT.md delete mode 100644 CONTRIBUTING.md create mode 100644 docs/SUPPORT.md diff --git a/CONDUCT.md b/CONDUCT.md deleted file mode 100644 index c663d2be..00000000 --- a/CONDUCT.md +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor Code of Conduct - -The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com) -as its guidelines for contributor interactions. - -## The Code Manifesto - -We want to work in an ecosystem that empowers developers to reach their -potential — one that encourages growth and effective collaboration. A space that -is safe for all. - -A space such as this benefits everyone that participates in it. It encourages -new developers to enter our field. It is through discussion and collaboration -that we grow, and through growth that we improve. - -In the effort to create such a place, we hold to these values: - -1. **Discrimination limits us.** This includes discrimination on the basis of - race, gender, sexual orientation, gender identity, age, nationality, technology - and any other arbitrary exclusion of a group of people. -2. **Boundaries honor us.** Your comfort levels are not everyone’s comfort - levels. Remember that, and if brought to your attention, heed it. -3. **We are our biggest assets.** None of us were born masters of our trade. - Each of us has been helped along the way. Return that favor, when and where - you can. -4. **We are resources for the future.** As an extension of #3, share what you - know. Make yourself a resource to help those that come after you. -5. **Respect defines us.** Treat others as you wish to be treated. Make your - discussions, criticisms and debates from a position of respectfulness. Ask - yourself, is it true? Is it necessary? Is it constructive? Anything less is - unacceptable. -6. **Reactions require grace.** Angry responses are valid, but abusive language - and vindictive actions are toxic. When something happens that offends you, - handle it assertively, but be respectful. Escalate reasonably, and try to - allow the offender an opportunity to explain themselves, and possibly correct - the issue. -7. **Opinions are just that: opinions.** Each and every one of us, due to our - background and upbringing, have varying opinions. The fact of the matter, is - that is perfectly acceptable. Remember this: if you respect your own - opinions, you should respect the opinions of others. -8. **To err is human.** You might not intend it, but mistakes do happen and - contribute to build experience. Tolerate honest mistakes, and don't hesitate - to apologize if you make one yourself. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 532fbd54..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,234 +0,0 @@ -# CONTRIBUTING - -## RESOURCES - -If you wish to contribute to Zend Framework, please be sure to -read/subscribe to the following resources: - - - [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards) - - [Contributor's Guide](http://framework.zend.com/participate/contributor-guide) - - ZF Contributor's mailing list: - Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html - Subscribe: zf-contributors-subscribe@lists.zend.com - - ZF Contributor's IRC channel: - #zftalk.dev on Freenode.net - -If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-form/issues/new). - -## Reporting Potential Security Issues - -If you have encountered a potential security vulnerability, please **DO NOT** report it on the public -issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead. -We will work with you to verify the vulnerability and patch it as soon as possible. - -When reporting issues, please provide the following information: - -- Component(s) affected -- A description indicating how to reproduce the issue -- A summary of the security vulnerability and impact - -We request that you contact us via the email address above and give the project -contributors a chance to resolve the vulnerability and issue a new release prior -to any public exposure; this helps protect users and provides them with a chance -to upgrade and/or update in order to protect their applications. - -For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc). - -## RUNNING TESTS - -> ### Note: testing versions prior to 2.4 -> -> This component originates with Zend Framework 2. During the lifetime of ZF2, -> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no -> changes were necessary. However, due to the migration, tests may not run on -> versions < 2.4. As such, you may need to change the PHPUnit dependency if -> attempting a fix on such a version. - -To run tests: - -- Clone the repository: - - ```console - $ git clone git@github.com:zendframework/zend-form.git - $ cd - ``` - -- Install dependencies via composer: - - ```console - $ curl -sS https://getcomposer.org/installer | php -- - $ ./composer.phar install - ``` - - If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/ - -- Run the tests via `phpunit` and the provided PHPUnit config, like in this example: - - ```console - $ ./vendor/bin/phpunit - ``` - -You can turn on conditional tests with the phpunit.xml file. -To do so: - - - Copy `phpunit.xml.dist` file to `phpunit.xml` - - Edit `phpunit.xml` to enable any specific functionality you - want to test, as well as to provide test values to utilize. - -## Running Coding Standards Checks - -This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding -standards checks, and provides configuration for our selected checks. -`phpcs` is installed by default via Composer. - -To run checks only: - -```console -$ composer cs-check -``` - -`phpcs` also includes a tool for fixing most CS violations, `phpcbf`: - - -```console -$ composer cs-fix -``` - -If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure -they pass, and make sure you add and commit the changes after verification. - -## Recommended Workflow for Contributions - -Your first step is to establish a public repository from which we can -pull your work into the master repository. We recommend using -[GitHub](https://github.com), as that is where the component is already hosted. - -1. Setup a [GitHub account](http://github.com/), if you haven't yet -2. Fork the repository (http://github.com/zendframework/zend-form) -3. Clone the canonical repository locally and enter it. - - ```console - $ git clone git@github.com:zendframework/zend-form.git - $ cd zend-form - ``` - -4. Add a remote to your fork; substitute your GitHub username in the command - below. - - ```console - $ git remote add {username} git@github.com:{username}/zend-form.git - $ git fetch {username} - ``` - -### Keeping Up-to-Date - -Periodically, you should update your fork or personal repository to -match the canonical ZF repository. Assuming you have setup your local repository -per the instructions above, you can do the following: - - -```console -$ git checkout master -$ git fetch origin -$ git rebase origin/master -# OPTIONALLY, to keep your remote up-to-date - -$ git push {username} master:master -``` - -If you're tracking other branches -- for example, the "develop" branch, where -new feature development occurs -- you'll want to do the same operations for that -branch; simply substitute "develop" for "master". - -### Working on a patch - -We recommend you do each new feature or bugfix in a new branch. This simplifies -the task of code review as well as the task of merging your changes into the -canonical repository. - -A typical workflow will then consist of the following: - -1. Create a new local branch based off either your master or develop branch. -2. Switch to your new local branch. (This step can be combined with the - previous step with the use of `git checkout -b`.) -3. Do some work, commit, repeat as necessary. -4. Push the local branch to your remote repository. -5. Send a pull request. - -The mechanics of this process are actually quite trivial. Below, we will -create a branch for fixing an issue in the tracker. - -```console -$ git checkout -b hotfix/9295 -Switched to a new branch 'hotfix/9295' -``` - -... do some work ... - - -```console -$ git commit -``` - -... write your log message ... - - -```console -$ git push {username} hotfix/9295:hotfix/9295 -Counting objects: 38, done. -Delta compression using up to 2 threads. -Compression objects: 100% (18/18), done. -Writing objects: 100% (20/20), 8.19KiB, done. -Total 20 (delta 12), reused 0 (delta 0) -To ssh://git@github.com/{username}/zend-form.git - b5583aa..4f51698 HEAD -> master -``` - -To send a pull request, you have two options. - -If using GitHub, you can do the pull request from there. Navigate to -your repository, select the branch you just created, and then select the -"Pull Request" button in the upper right. Select the user/organization -"zendframework" as the recipient. - -If using your own repository - or even if using GitHub - you can use `git -format-patch` to create a patchset for us to apply; in fact, this is -**recommended** for security-related patches. If you use `format-patch`, please -send the patches as attachments to: - -- zf-devteam@zend.com for patches without security implications -- zf-security@zend.com for security patches - -#### What branch to issue the pull request against? - -Which branch should you issue a pull request against? - -- For fixes against the stable release, issue the pull request against the - "master" branch. -- For new features, or fixes that introduce new elements to the public API (such - as new public methods or properties), issue the pull request against the - "develop" branch. - -### Branch Cleanup - -As you might imagine, if you are a frequent contributor, you'll start to -get a ton of branches both locally and on your remote. - -Once you know that your changes have been accepted to the master -repository, we suggest doing some cleanup of these branches. - -- Local branch cleanup - - ```console - $ git branch -d - ``` - -- Remote branch removal - - ```console - $ git push {username} : - ``` - - -## Conduct - -Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project. diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md index c663d2be..02fafcd1 100644 --- a/docs/CODE_OF_CONDUCT.md +++ b/docs/CODE_OF_CONDUCT.md @@ -1,6 +1,6 @@ # Contributor Code of Conduct -The Zend Framework project adheres to [The Code Manifesto](http://codemanifesto.com) +This project adheres to [The Code Manifesto](http://codemanifesto.com) as its guidelines for contributor interactions. ## The Code Manifesto diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 532fbd54..737d672b 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -2,73 +2,43 @@ ## RESOURCES -If you wish to contribute to Zend Framework, please be sure to +If you wish to contribute to this project, please be sure to read/subscribe to the following resources: - - [Coding Standards](https://github.com/zendframework/zf2/wiki/Coding-Standards) - - [Contributor's Guide](http://framework.zend.com/participate/contributor-guide) - - ZF Contributor's mailing list: - Archives: http://zend-framework-community.634137.n4.nabble.com/ZF-Contributor-f680267.html - Subscribe: zf-contributors-subscribe@lists.zend.com - - ZF Contributor's IRC channel: - #zftalk.dev on Freenode.net + - [Coding Standards](https://github.com/zendframework/zend-coding-standard) + - [Forums](https://discourse.zendframework.com/c/contributors) + - [Slack](https://zendframework-slack.herokuapp.com) + - [Code of Conduct](CODE_OF_CONDUCT.md) -If you are working on new features or refactoring [create a proposal](https://github.com/zendframework/zend-form/issues/new). - -## Reporting Potential Security Issues - -If you have encountered a potential security vulnerability, please **DO NOT** report it on the public -issue tracker: send it to us at [zf-security@zend.com](mailto:zf-security@zend.com) instead. -We will work with you to verify the vulnerability and patch it as soon as possible. - -When reporting issues, please provide the following information: - -- Component(s) affected -- A description indicating how to reproduce the issue -- A summary of the security vulnerability and impact - -We request that you contact us via the email address above and give the project -contributors a chance to resolve the vulnerability and issue a new release prior -to any public exposure; this helps protect users and provides them with a chance -to upgrade and/or update in order to protect their applications. - -For sensitive email communications, please use [our PGP key](http://framework.zend.com/zf-security-pgp-key.asc). +If you are working on new features or refactoring +[create a proposal](https://github.com/zendframework/zend-form/issues/new). ## RUNNING TESTS -> ### Note: testing versions prior to 2.4 -> -> This component originates with Zend Framework 2. During the lifetime of ZF2, -> testing infrastructure migrated from PHPUnit 3 to PHPUnit 4. In most cases, no -> changes were necessary. However, due to the migration, tests may not run on -> versions < 2.4. As such, you may need to change the PHPUnit dependency if -> attempting a fix on such a version. - To run tests: - Clone the repository: ```console - $ git clone git@github.com:zendframework/zend-form.git - $ cd + $ git clone git://github.com/zendframework/zend-form.git + $ cd zend-form ``` - Install dependencies via composer: ```console - $ curl -sS https://getcomposer.org/installer | php -- - $ ./composer.phar install + $ composer install ``` - If you don't have `curl` installed, you can also download `composer.phar` from https://getcomposer.org/ + If you don't have `composer` installed, please download it from https://getcomposer.org/download/ -- Run the tests via `phpunit` and the provided PHPUnit config, like in this example: +- Run the tests using the "test" command shipped in the `composer.json`: ```console - $ ./vendor/bin/phpunit + $ composer test ``` -You can turn on conditional tests with the phpunit.xml file. +You can turn on conditional tests with the `phpunit.xml` file. To do so: - Copy `phpunit.xml.dist` file to `phpunit.xml` @@ -77,24 +47,22 @@ To do so: ## Running Coding Standards Checks -This component uses [phpcs](https://github.com/squizlabs/PHP_CodeSniffer) for coding -standards checks, and provides configuration for our selected checks. -`phpcs` is installed by default via Composer. +First, ensure you've installed dependencies via composer, per the previous +section on running tests. -To run checks only: +To run CS checks only: ```console $ composer cs-check ``` -`phpcs` also includes a tool for fixing most CS violations, `phpcbf`: - +To attempt to automatically fix common CS issues: ```console $ composer cs-fix ``` -If you allow `phpcbf` to fix CS issues, please re-run the tests to ensure +If the above fixes any CS issues, please re-run the tests to ensure they pass, and make sure you add and commit the changes after verification. ## Recommended Workflow for Contributions @@ -103,12 +71,12 @@ Your first step is to establish a public repository from which we can pull your work into the master repository. We recommend using [GitHub](https://github.com), as that is where the component is already hosted. -1. Setup a [GitHub account](http://github.com/), if you haven't yet -2. Fork the repository (http://github.com/zendframework/zend-form) +1. Setup a [GitHub account](https://github.com/), if you haven't yet +2. Fork the repository (https://github.com/zendframework/zend-form) 3. Clone the canonical repository locally and enter it. ```console - $ git clone git@github.com:zendframework/zend-form.git + $ git clone git://github.com/zendframework/zend-form.git $ cd zend-form ``` @@ -188,15 +156,7 @@ To send a pull request, you have two options. If using GitHub, you can do the pull request from there. Navigate to your repository, select the branch you just created, and then select the "Pull Request" button in the upper right. Select the user/organization -"zendframework" as the recipient. - -If using your own repository - or even if using GitHub - you can use `git -format-patch` to create a patchset for us to apply; in fact, this is -**recommended** for security-related patches. If you use `format-patch`, please -send the patches as attachments to: - -- zf-devteam@zend.com for patches without security implications -- zf-security@zend.com for security patches +"zendframework" (or whatever the upstream organization is) as the recipient. #### What branch to issue the pull request against? @@ -227,8 +187,3 @@ repository, we suggest doing some cleanup of these branches. ```console $ git push {username} : ``` - - -## Conduct - -Please see our [CONDUCT.md](CONDUCT.md) to understand expected behavior when interacting with others in the project. diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md new file mode 100644 index 00000000..7aeb9519 --- /dev/null +++ b/docs/SUPPORT.md @@ -0,0 +1,25 @@ +# Getting Support + +Zend Framework offers three support channels: + +- For real-time questions, use our + [Slack](https://zendframework-slack.herokuapp.com) +- For detailed questions (e.g., those requiring examples) use our + [forums](https://discourse.zendframework.com/c/questions/components) +- To report issues, use this repository's + [issue tracker](https://github.com/zendframework/zend-form/issues/new) + +**DO NOT** use the issue tracker to ask questions; use Slack or the forums for +that. Questions posed to the issue tracker will be closed. + +When reporting an issue, please include the following details: + +- A narrative description of what you are trying to accomplish. +- The minimum code necessary to reproduce the issue. +- The expected results of exercising that code. +- The actual results received. + +We may ask for additional details: what version of the library you are using, +and what PHP version was used to reproduce the issue. + +You may also submit a failing test case as a pull request. From db028a4149802dda5cea34ca1e95edd43588931a Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:22:48 +0000 Subject: [PATCH 26/40] Added github ISSUE and PR templates --- docs/ISSUE_TEMPLATE.md | 19 +++++++++++++++++++ docs/PULL_REQUEST_TEMPLATE.md | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 docs/ISSUE_TEMPLATE.md create mode 100644 docs/PULL_REQUEST_TEMPLATE.md diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..af749eb7 --- /dev/null +++ b/docs/ISSUE_TEMPLATE.md @@ -0,0 +1,19 @@ + - [ ] I was not able to find an [open](https://github.com/zendframework/zend-form/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-form/issues?q=is%3Aclosed) issue matching what I'm seeing. + - [ ] This is not a question. (Questions should be asked on [slack](https://zendframework.slack.com/) ([Signup for Slack here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).) + +Provide a narrative description of what you are trying to accomplish. + +### Code to reproduce the issue + + + +```php +``` + +### Expected results + + + +### Actual results + + diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..f00d90c0 --- /dev/null +++ b/docs/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,25 @@ +Provide a narrative description of what you are trying to accomplish: + +- [ ] Are you fixing a bug? + - [ ] Detail how the bug is invoked currently. + - [ ] Detail the original, incorrect behavior. + - [ ] Detail the new, expected behavior. + - [ ] Base your feature on the `master` branch, and submit against that branch. + - [ ] Add a regression test that demonstrates the bug, and proves the fix. + - [ ] Add a `CHANGELOG.md` entry for the fix. + +- [ ] Are you creating a new feature? + - [ ] Why is the new feature needed? What purpose does it serve? + - [ ] How will users use the new feature? + - [ ] Base your feature on the `develop` branch, and submit against that branch. + - [ ] Add only one feature per pull request; split multiple features over multiple pull requests + - [ ] Add tests for the new feature. + - [ ] Add documentation for the new feature. + - [ ] Add a `CHANGELOG.md` entry for the new feature. + +- [ ] Is this related to quality assurance? + + +- [ ] Is this related to documentation? + + From 951d0e36c0b22a519e32d111b65ffc8472d849e1 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:22:59 +0000 Subject: [PATCH 27/40] Updated LICENSE.md template --- LICENSE.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index dbb1b49c..63df4102 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -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 From ff3af4382f0ba01aefd78057c643f85e7b9ddf91 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:23:13 +0000 Subject: [PATCH 28/40] Updated coveralls badge in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5cfca93f..40bc56a7 100644 --- a/README.md +++ b/README.md @@ -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, From e67d0bffa0f936e1cb7a8b8330ed1642539eb1dd Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:23:29 +0000 Subject: [PATCH 29/40] Updated copyright year range in mkdocs.yml to match LICENSE.md --- mkdocs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkdocs.yml b/mkdocs.yml index 399b1d7c..62f8be16 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -86,4 +86,4 @@ pages: site_name: zend-form site_description: zend-form repo_url: 'https://github.com/zendframework/zend-form' -copyright: 'Copyright (c) 2016 Zend Technologies USA Inc.' +copyright: 'Copyright (c) 2005-2017 Zend Technologies USA Inc.' From 4f5060da979ba66a4d683fd5b6c9df5938ab9c39 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:24:11 +0000 Subject: [PATCH 30/40] Updated link to the docsumentation in dosc md files --- docs/book/advanced.md | 2 +- docs/book/file-upload.md | 4 ++-- docs/book/helper/abstract-helper.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/book/advanced.md b/docs/book/advanced.md index 1b847e93..2933461d 100644 --- a/docs/book/advanced.md +++ b/docs/book/advanced.md @@ -457,7 +457,7 @@ The method is defined in `Zend\Stdlib\InitializableInterface`, which instantiation! Within zend-form, the `FormElementManager` defines an -[initializer](http://zendframework.github.io/zend-servicemanager/configuring-the-service-manager/#initializers) +[initializer](http://docs.zendframework.com/zend-servicemanager/configuring-the-service-manager/#initializers) that is pushed to the bottom of the initializer stack, making it the last initializer invoked. This initializer checks if the instance created implements `InitializableInterface`, and, if so, calls its `init()` method. diff --git a/docs/book/file-upload.md b/docs/book/file-upload.md index ed52607b..434c21d6 100644 --- a/docs/book/file-upload.md +++ b/docs/book/file-upload.md @@ -268,7 +268,7 @@ class UploadForm extends Form The `filerenameupload` options above would cause an uploaded file to be renamed and moved to: `./data/tmpuploads/avatar_4b3403665fea6.png`. -See the [RenameUpload filter](http://zendframework.github.io/zend-filter/file/#renameupload) +See the [RenameUpload filter](http://docs.zendframework.com/zend-filter/file/#renameupload) documentation for more information on its supported options. ### Call the fileprg plugin @@ -673,7 +673,7 @@ Related documentation: - [Form File Element](element/file.md) - [Form File View Helper](helper/form-file.md) - [List of File Validators](https://docs.zendframework.com/zend-validator/validators/file/intro/) -- [List of File Filters](http://zendframework.github.io/zend-filter/file/) +- [List of File Filters](http://docs.zendframework.com/zend-filter/file/) - [File Post-Redirect-Get Controller Plugin](https://docs.zendframework.com/zend-mvc-plugin-fileprg/) - [Zend\InputFilter\FileInput](https://docs.zendframework.com/zend-inputfilter/file-input/) - [Upload Progress Handlers](https://docs.zendframework.com/zend-progressbar/upload/) diff --git a/docs/book/helper/abstract-helper.md b/docs/book/helper/abstract-helper.md index 9cddbe67..2667522a 100644 --- a/docs/book/helper/abstract-helper.md +++ b/docs/book/helper/abstract-helper.md @@ -10,7 +10,7 @@ allows setting a translator and text domain. ## Public methods The following public methods are in addition to the inherited methods of -[Zend\I18n\View\Helper\AbstractTranslatorHelper](http://zendframework.github.io/zend-i18n/view-helpers/#abstract-translator-helper). +[Zend\I18n\View\Helper\AbstractTranslatorHelper](http://docs.zendframework.com/zend-i18n/view-helpers/#abstract-translator-helper). Method signature | Description -------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- From 70152faac8c5c607964e93568cd7aa4d2f181b05 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:24:57 +0000 Subject: [PATCH 31/40] Removed white characters at the end of the line in the docs --- docs/book/advanced.md | 2 +- docs/book/collections.md | 2 +- docs/book/element/checkbox.md | 10 +++++----- docs/book/element/collection.md | 4 ++-- docs/book/element/csrf.md | 2 +- docs/book/element/date-time-local.md | 2 +- docs/book/element/date-time.md | 2 +- docs/book/element/date.md | 2 +- docs/book/element/email.md | 4 ++-- docs/book/element/month.md | 4 ++-- docs/book/element/multi-checkbox.md | 2 +- docs/book/element/number.md | 2 +- docs/book/element/radio.md | 4 ++-- docs/book/element/range.md | 2 +- docs/book/element/search.md | 2 +- docs/book/element/tel.md | 2 +- docs/book/element/time.md | 2 +- docs/book/element/url.md | 2 +- docs/book/element/week.md | 2 +- docs/book/file-upload.md | 2 +- docs/book/helper/abstract-helper.md | 2 +- docs/book/index.html | 2 +- docs/book/quick-start.md | 6 +++--- 23 files changed, 33 insertions(+), 33 deletions(-) diff --git a/docs/book/advanced.md b/docs/book/advanced.md index 2933461d..4f0fd594 100644 --- a/docs/book/advanced.md +++ b/docs/book/advanced.md @@ -381,7 +381,7 @@ use Zend\Form\Fieldset; class AlbumFieldset extends Fieldset { public function __construct(AlbumTable $albumTable) - { + { // Add any elements that need to fetch data from database // using the album table ! } diff --git a/docs/book/collections.md b/docs/book/collections.md index cfe99f5f..95bc1278 100644 --- a/docs/book/collections.md +++ b/docs/book/collections.md @@ -503,7 +503,7 @@ Now, let's create a zend-mvc controller action: $product = new Product(); $form->bind($product); $request = $this->getRequest(); - + if ($request->isPost()) { $form->setData($request->getPost()); diff --git a/docs/book/element/checkbox.md b/docs/book/element/checkbox.md index 7efcedde..9065a3d1 100644 --- a/docs/book/element/checkbox.md +++ b/docs/book/element/checkbox.md @@ -23,14 +23,14 @@ $checkbox->setUncheckedValue('bad'); $form = new Form('my-form'); $form->add($checkbox); ``` - + Using array notation: ```php use Zend\Form\Element; use Zend\Form\Form; - -$form = new Form('my-form'); + +$form = new Form('my-form'); $form->add([ 'type' => Element\Checkbox::class, 'name' => 'checkbox', @@ -52,8 +52,8 @@ checkbox checked by default, make the `value` equal to the `checked_value` eg: ```php use Zend\Form\Element; use Zend\Form\Form; - -$form = new Form('my-form'); + +$form = new Form('my-form'); $form->add([ 'type' => Element\Checkbox::class, 'name' => 'checkbox', diff --git a/docs/book/element/collection.md b/docs/book/element/collection.md index 8dd2335c..7f255124 100644 --- a/docs/book/element/collection.md +++ b/docs/book/element/collection.md @@ -30,8 +30,8 @@ Using array notation: ```php use Zend\Form\Element; use Zend\Form\Form; - -$form = new Form('my-form'); + +$form = new Form('my-form'); $form->add([ 'type' => Element\Collection::class, 'options' => [ diff --git a/docs/book/element/csrf.md b/docs/book/element/csrf.md index bd18ab33..b0764277 100644 --- a/docs/book/element/csrf.md +++ b/docs/book/element/csrf.md @@ -41,7 +41,7 @@ $form->add([ ``` > ### Multiple CSRF elements must be uniquely named -> +> > If you are using more than one form on a page, and each contains its own CSRF > element, you will need to make sure that each form uniquely names its element; > if you do not, it's possible for the value of one to override the other within diff --git a/docs/book/element/date-time-local.md b/docs/book/element/date-time-local.md index 54251db7..1329d2e4 100644 --- a/docs/book/element/date-time-local.md +++ b/docs/book/element/date-time-local.md @@ -52,7 +52,7 @@ $form->add([ ``` > ### Set all attributes before calling prepare -> +> > The `min`, `max`, and `step` attributes should be set prior to calling > `Zend\Form::prepare()`. Otherwise, the default input specification for the > element may not contain the correct validation rules. diff --git a/docs/book/element/date-time.md b/docs/book/element/date-time.md index 2d11bf88..d0dad7c5 100644 --- a/docs/book/element/date-time.md +++ b/docs/book/element/date-time.md @@ -52,7 +52,7 @@ $form->add([ ``` > ### Set all attributes before calling prepare -> +> > The `min`, `max`, and `step` attributes should be set prior to calling > `Zend\Form::prepare()`. Otherwise, the default input specification for the > element may not contain the correct validation rules. diff --git a/docs/book/element/date.md b/docs/book/element/date.md index 276ecadf..54aa1974 100644 --- a/docs/book/element/date.md +++ b/docs/book/element/date.md @@ -52,7 +52,7 @@ $form->add([ ``` > ### Set all attributes before calling prepare -> +> > The `min`, `max`, and `step` attributes should be set prior to calling > `Zend\Form::prepare()`. Otherwise, the default input specification for the > element may not contain the correct validation rules. diff --git a/docs/book/element/email.md b/docs/book/element/email.md index 4f99e6ac..3bb13649 100644 --- a/docs/book/element/email.md +++ b/docs/book/element/email.md @@ -58,9 +58,9 @@ $form->add([ ], ]); ``` - + > ### Set multiple attribute before calling prepare -> +> > Note: the `multiple` attribute should be set prior to calling > `Zend\Form::prepare()`. Otherwise, the default input specification for the > element may not contain the correct validation rules. diff --git a/docs/book/element/month.md b/docs/book/element/month.md index 664bf7b1..dedaa384 100644 --- a/docs/book/element/month.md +++ b/docs/book/element/month.md @@ -25,7 +25,7 @@ $month->setAttributes([ $form = new Form('my-form'); $form->add($month); ``` - + Using array notation: ```php @@ -48,7 +48,7 @@ $form->add([ ``` > ### Set all attributes before calling prepare -> +> > The `min`, `max`, and `step` attributes should be set prior to calling > `Zend\Form::prepare()`. Otherwise, the default input specification for the > element may not contain the correct validation rules. diff --git a/docs/book/element/multi-checkbox.md b/docs/book/element/multi-checkbox.md index f4c3e24f..c467dde8 100644 --- a/docs/book/element/multi-checkbox.md +++ b/docs/book/element/multi-checkbox.md @@ -96,7 +96,7 @@ $form->add([ ], ]); ``` - + ## Public Methods The following methods are specific to the `MultiCheckbox` element; all other methods diff --git a/docs/book/element/number.md b/docs/book/element/number.md index 9f6db503..e52b9843 100644 --- a/docs/book/element/number.md +++ b/docs/book/element/number.md @@ -48,7 +48,7 @@ $form->add([ ``` > ### Set all attributes before calling prepare -> +> > The `min`, `max`, and `step` attributes should be set prior to calling > `Zend\Form::prepare()`. Otherwise, the default input specification for the > element may not contain the correct validation rules. diff --git a/docs/book/element/radio.md b/docs/book/element/radio.md index 8954c62d..fa70e462 100644 --- a/docs/book/element/radio.md +++ b/docs/book/element/radio.md @@ -49,8 +49,8 @@ $form->add([ ## Advanced Usage See [MultiCheckbox for examples](multi-checkbox.md) of how to apply attributes -and options to each radio button. - +and options to each radio button. + ## Public Methods The `Radio` element extends the `MultiCheckbox` element, and inherits diff --git a/docs/book/element/range.md b/docs/book/element/range.md index 777de38d..5ab648cd 100644 --- a/docs/book/element/range.md +++ b/docs/book/element/range.md @@ -48,7 +48,7 @@ $form->add([ ``` > ### Set all attributes before calling prepare -> +> > The `min`, `max`, and `step` attributes should be set prior to calling > `Zend\Form::prepare()`. Otherwise, the default input specification for the > element may not contain the correct validation rules. diff --git a/docs/book/element/search.md b/docs/book/element/search.md index f35cc619..b6c4088c 100644 --- a/docs/book/element/search.md +++ b/docs/book/element/search.md @@ -20,7 +20,7 @@ $search->setLabel('Search'); $form = new Form('my-form'); $form->add($search); ``` - + Using array notation: ```php diff --git a/docs/book/element/tel.md b/docs/book/element/tel.md index 99f022be..fe7ec95a 100644 --- a/docs/book/element/tel.md +++ b/docs/book/element/tel.md @@ -22,7 +22,7 @@ $phone->setLabel('Phone'); $form = new Form('my-form'); $form->add($phone); ``` - + Using array notation: ```php diff --git a/docs/book/element/time.md b/docs/book/element/time.md index 6425d39a..deea1b22 100644 --- a/docs/book/element/time.md +++ b/docs/book/element/time.md @@ -58,7 +58,7 @@ $form->add([ > element may not contain the correct validation rules. > ### Default date format -> +> > The default date format for the validator is `H:i:s`. However, a valid time > string is not required to have a "seconds" representation. In fact, some user > agent UIs such as Google Chrome and Opera submit time elements using the `H:i` diff --git a/docs/book/element/url.md b/docs/book/element/url.md index 9bf24aba..5059ef9e 100644 --- a/docs/book/element/url.md +++ b/docs/book/element/url.md @@ -20,7 +20,7 @@ $url->setLabel('Webpage URL'); $form = new Form('my-form'); $form->add($url); ``` - + Using array notation: ```php diff --git a/docs/book/element/week.md b/docs/book/element/week.md index fd24a3a5..7c98e8e7 100644 --- a/docs/book/element/week.md +++ b/docs/book/element/week.md @@ -46,7 +46,7 @@ $form->add([ ], ]); ``` - + > ### Set all attributes before calling prepare > > The `min`, `max`, and `step` attributes should be set prior to calling diff --git a/docs/book/file-upload.md b/docs/book/file-upload.md index 434c21d6..9c7d45d4 100644 --- a/docs/book/file-upload.md +++ b/docs/book/file-upload.md @@ -117,7 +117,7 @@ public function uploadFormAction() { $form = new UploadForm('upload-form'); - $request = $this->getRequest(); + $request = $this->getRequest(); if ($request->isPost()) { // Make certain to merge the $_FILES info! $post = array_merge_recursive( diff --git a/docs/book/helper/abstract-helper.md b/docs/book/helper/abstract-helper.md index 2667522a..55bd9ba3 100644 --- a/docs/book/helper/abstract-helper.md +++ b/docs/book/helper/abstract-helper.md @@ -49,7 +49,7 @@ $this->formLabel()->setTranslator($translator, 'my-text-domain'); ### What will be translated? -The specific view helpers are responsible to determine what exactly should be translated +The specific view helpers are responsible to determine what exactly should be translated (e. g. the Label in the FormLabel view helper or the "title" HTML attribute). If you want to have certain HTML attribute values translated you can mark them as "translatable": diff --git a/docs/book/index.html b/docs/book/index.html index cb72b726..cc60d069 100644 --- a/docs/book/index.html +++ b/docs/book/index.html @@ -1,7 +1,7 @@

zend-form

- +

Validate and display simple and complex forms, casting forms to business objects and vice versa.

$ composer require zendframework/zend-form
diff --git a/docs/book/quick-start.md b/docs/book/quick-start.md index 808d5bc7..dbb50a59 100644 --- a/docs/book/quick-start.md +++ b/docs/book/quick-start.md @@ -435,11 +435,11 @@ if ($form->isValid()) { ``` > ### Always populate select elements with options -> +> > Always ensure that options for a select element are populated *prior* to > validation; otherwise, the element will fail validation, and you will receive > a `NotInArray` error message. -> +> > If you are populating the options from a database or other data source, make > sure this is done prior to validation. Alternately, you may disable the > `InArray` validator programmatically prior to validation: @@ -571,7 +571,7 @@ class SenderFieldset extends Fieldset implements InputFilterProviderInterface ], 'validators' => [ [ - 'name' => Validator\StringLength::class, + 'name' => Validator\StringLength::class, 'options' => [ 'min' => 3, 'max' => 256 From 899e10b4a6de55c55ad4a6363ba6b4ab5eeff6fe Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:30:36 +0000 Subject: [PATCH 32/40] Updated composer skeleton --- composer.json | 50 +++++---- composer.lock | 298 ++++++++++++++++++++++++++------------------------ 2 files changed, 181 insertions(+), 167 deletions(-) diff --git a/composer.json b/composer.json index b033262b..9f822d5e 100644 --- a/composer.json +++ b/composer.json @@ -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" @@ -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": { @@ -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", @@ -60,14 +74,6 @@ "config-provider": "Zend\\Form\\ConfigProvider" } }, - "autoload-dev": { - "psr-4": { - "ZendTest\\Form\\": "test/" - } - }, - "config": { - "process-timeout": 0 - }, "scripts": { "check": [ "@cs-check", diff --git a/composer.lock b/composer.lock index f7c0648a..8ab0b104 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "74fd7606f4dae44fadc48fa9701cbeeb", + "content-hash": "bb5ff24714136f39babd777ac6d17a3d", "packages": [ { "name": "container-interop/container-interop", @@ -451,32 +451,32 @@ }, { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", + "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { "athletic/athletic": "~0.1.8", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "^6.2.3", + "squizlabs/php_codesniffer": "^3.0.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -501,7 +501,7 @@ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2017-07-22T11:58:36+00:00" }, { "name": "doctrine/lexer", @@ -559,37 +559,40 @@ }, { "name": "myclabs/deep-copy", - "version": "1.6.1", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102" + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102", - "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "doctrine/collections": "1.*", - "phpunit/phpunit": "~4.1" + "doctrine/collections": "^1.0", + "doctrine/common": "^2.6", + "phpunit/phpunit": "^4.1" }, "type": "library", "autoload": { "psr-4": { "DeepCopy\\": "src/DeepCopy/" - } + }, + "files": [ + "src/DeepCopy/deep_copy.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "description": "Create deep copies (clones) of your objects", - "homepage": "https://github.com/myclabs/DeepCopy", "keywords": [ "clone", "copy", @@ -597,7 +600,7 @@ "object", "object graph" ], - "time": "2017-04-12T18:52:22+00:00" + "time": "2017-10-19T19:58:43+00:00" }, { "name": "paragonie/random_compat", @@ -751,16 +754,16 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", "shasum": "" }, "require": { @@ -801,33 +804,39 @@ "reflection", "static analysis" ], - "time": "2015-12-27T11:43:31+00:00" + "time": "2017-09-11T18:02:19+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "3.1.1", + "version": "4.2.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e" + "reference": "66465776cfc249844bde6d117abff1d22e06c2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e", - "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da", + "reference": "66465776cfc249844bde6d117abff1d22e06c2da", "shasum": "" }, "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", + "php": "^7.0", + "phpdocumentor/reflection-common": "^1.0.0", + "phpdocumentor/type-resolver": "^0.4.0", "webmozart/assert": "^1.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" + "doctrine/instantiator": "~1.0.5", + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^6.4" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.x-dev" + } + }, "autoload": { "psr-4": { "phpDocumentor\\Reflection\\": [ @@ -846,24 +855,24 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-09-30T07:12:33+00:00" + "time": "2017-11-27T17:38:31+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.2.1", + "version": "0.4.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb" + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", - "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", + "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", "shasum": "" }, "require": { - "php": ">=5.5", + "php": "^5.5 || ^7.0", "phpdocumentor/reflection-common": "^1.0" }, "require-dev": { @@ -893,37 +902,37 @@ "email": "me@mikevanriel.com" } ], - "time": "2016-11-25T06:54:22+00:00" + "time": "2017-07-14T14:27:02+00:00" }, { "name": "phpspec/prophecy", - "version": "v1.7.0", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073" + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/93d39f1f7f9326d746203c7c056f300f7f126073", - "reference": "93d39f1f7f9326d746203c7c056f300f7f126073", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", "shasum": "" }, "require": { "doctrine/instantiator": "^1.0.2", "php": "^5.3|^7.0", - "phpdocumentor/reflection-docblock": "^2.0|^3.0.2", + "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0", "sebastian/comparator": "^1.1|^2.0", "sebastian/recursion-context": "^1.0|^2.0|^3.0" }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8 || ^5.6.5" + "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6.x-dev" + "dev-master": "1.7.x-dev" } }, "autoload": { @@ -956,45 +965,44 @@ "spy", "stub" ], - "time": "2017-03-02T20:05:34+00:00" + "time": "2017-11-24T13:59:53+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "5.2.1", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "dc421f9ca5082a0c0cb04afb171c765f79add85b" + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/dc421f9ca5082a0c0cb04afb171c765f79add85b", - "reference": "dc421f9ca5082a0c0cb04afb171c765f79add85b", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", "php": "^7.0", - "phpunit/php-file-iterator": "^1.3", - "phpunit/php-text-template": "^1.2", - "phpunit/php-token-stream": "^1.4.11 || ^2.0", - "sebastian/code-unit-reverse-lookup": "^1.0", + "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-token-stream": "^2.0.1", + "sebastian/code-unit-reverse-lookup": "^1.0.1", "sebastian/environment": "^3.0", - "sebastian/version": "^2.0", + "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, "require-dev": { - "ext-xdebug": "^2.5", "phpunit/phpunit": "^6.0" }, "suggest": { - "ext-xdebug": "^2.5.3" + "ext-xdebug": "^2.5.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2.x-dev" + "dev-master": "5.3.x-dev" } }, "autoload": { @@ -1009,7 +1017,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1020,20 +1028,20 @@ "testing", "xunit" ], - "time": "2017-04-21T08:03:57+00:00" + "time": "2017-12-06T09:29:45+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.2", + "version": "1.4.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5" + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/3cc8f69b3028d0f96a9078e6295d86e9bf019be5", - "reference": "3cc8f69b3028d0f96a9078e6295d86e9bf019be5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", + "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", "shasum": "" }, "require": { @@ -1067,7 +1075,7 @@ "filesystem", "iterator" ], - "time": "2016-10-03T07:40:28+00:00" + "time": "2017-11-27T13:52:08+00:00" }, { "name": "phpunit/php-text-template", @@ -1161,29 +1169,29 @@ }, { "name": "phpunit/php-token-stream", - "version": "1.4.11", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7" + "reference": "791198a2c6254db10131eecfe8c06670700904db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e03f8f67534427a787e21a385a67ec3ca6978ea7", - "reference": "e03f8f67534427a787e21a385a67ec3ca6978ea7", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/791198a2c6254db10131eecfe8c06670700904db", + "reference": "791198a2c6254db10131eecfe8c06670700904db", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.2.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1206,20 +1214,20 @@ "keywords": [ "tokenizer" ], - "time": "2017-02-27T10:12:30+00:00" + "time": "2017-11-27T05:48:46+00:00" }, { "name": "phpunit/phpunit", - "version": "6.1.2", + "version": "6.5.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "fbf2e46d5c563ee78c9b559bcbeb1c97cad6af0f" + "reference": "882e886cc928a0abd3c61282b2a64026237d14a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fbf2e46d5c563ee78c9b559bcbeb1c97cad6af0f", - "reference": "fbf2e46d5c563ee78c9b559bcbeb1c97cad6af0f", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/882e886cc928a0abd3c61282b2a64026237d14a4", + "reference": "882e886cc928a0abd3c61282b2a64026237d14a4", "shasum": "" }, "require": { @@ -1228,24 +1236,24 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.3", + "myclabs/deep-copy": "^1.6.1", "phar-io/manifest": "^1.0.1", "phar-io/version": "^1.0", "php": "^7.0", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^5.2", - "phpunit/php-file-iterator": "^1.4", - "phpunit/php-text-template": "^1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^4.0", - "sebastian/comparator": "^2.0", - "sebastian/diff": "^1.2", - "sebastian/environment": "^3.0.1", + "phpunit/php-code-coverage": "^5.3", + "phpunit/php-file-iterator": "^1.4.3", + "phpunit/php-text-template": "^1.2.1", + "phpunit/php-timer": "^1.0.9", + "phpunit/phpunit-mock-objects": "^5.0.4", + "sebastian/comparator": "^2.1", + "sebastian/diff": "^2.0", + "sebastian/environment": "^3.1", "sebastian/exporter": "^3.1", - "sebastian/global-state": "^1.1 || ^2.0", - "sebastian/object-enumerator": "^3.0.2", + "sebastian/global-state": "^2.0", + "sebastian/object-enumerator": "^3.0.3", "sebastian/resource-operations": "^1.0", - "sebastian/version": "^2.0" + "sebastian/version": "^2.0.1" }, "conflict": { "phpdocumentor/reflection-docblock": "3.0.2", @@ -1264,7 +1272,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1.x-dev" + "dev-master": "6.5.x-dev" } }, "autoload": { @@ -1290,33 +1298,33 @@ "testing", "xunit" ], - "time": "2017-04-25T21:30:13+00:00" + "time": "2017-12-06T09:42:03+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "4.0.1", + "version": "5.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "eabce450df194817a7d7e27e19013569a903a2bf" + "reference": "16b50f4167e5e85e81ca8a3dd105d0a5fd32009a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/eabce450df194817a7d7e27e19013569a903a2bf", - "reference": "eabce450df194817a7d7e27e19013569a903a2bf", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/16b50f4167e5e85e81ca8a3dd105d0a5fd32009a", + "reference": "16b50f4167e5e85e81ca8a3dd105d0a5fd32009a", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.2", + "doctrine/instantiator": "^1.0.5", "php": "^7.0", - "phpunit/php-text-template": "^1.2", + "phpunit/php-text-template": "^1.2.1", "sebastian/exporter": "^3.0" }, "conflict": { "phpunit/phpunit": "<6.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.5" }, "suggest": { "ext-soap": "*" @@ -1324,7 +1332,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "5.0.x-dev" } }, "autoload": { @@ -1339,7 +1347,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1349,7 +1357,7 @@ "mock", "xunit" ], - "time": "2017-03-03T06:30:20+00:00" + "time": "2017-12-02T05:31:19+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1398,30 +1406,30 @@ }, { "name": "sebastian/comparator", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "20f84f468cb67efee293246e6a09619b891f55f0" + "reference": "1174d9018191e93cb9d719edec01257fc05f8158" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/20f84f468cb67efee293246e6a09619b891f55f0", - "reference": "20f84f468cb67efee293246e6a09619b891f55f0", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1174d9018191e93cb9d719edec01257fc05f8158", + "reference": "1174d9018191e93cb9d719edec01257fc05f8158", "shasum": "" }, "require": { "php": "^7.0", - "sebastian/diff": "^1.2", - "sebastian/exporter": "^3.0" + "sebastian/diff": "^2.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^6.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.1.x-dev" } }, "autoload": { @@ -1452,38 +1460,38 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-03-03T06:26:08+00:00" + "time": "2017-11-03T07:16:52+00:00" }, { "name": "sebastian/diff", - "version": "1.4.1", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", - "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.8" + "phpunit/phpunit": "^6.2" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1510,20 +1518,20 @@ "keywords": [ "diff" ], - "time": "2015-12-08T07:14:41+00:00" + "time": "2017-08-03T08:09:46+00:00" }, { "name": "sebastian/environment", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "11e7710b7724d42c62249b0e9d3030240398949d" + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/11e7710b7724d42c62249b0e9d3030240398949d", - "reference": "11e7710b7724d42c62249b0e9d3030240398949d", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", "shasum": "" }, "require": { @@ -1535,7 +1543,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -1560,7 +1568,7 @@ "environment", "hhvm" ], - "time": "2017-04-21T14:40:32+00:00" + "time": "2017-07-01T08:51:00+00:00" }, { "name": "sebastian/exporter", @@ -1631,23 +1639,23 @@ }, { "name": "sebastian/global-state", - "version": "1.1.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -1655,7 +1663,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1678,25 +1686,25 @@ "keywords": [ "global state" ], - "time": "2015-10-12T03:26:01+00:00" + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", - "version": "3.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "31dd3379d16446c5d86dec32ab1ad1f378581ad8" + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/31dd3379d16446c5d86dec32ab1ad1f378581ad8", - "reference": "31dd3379d16446c5d86dec32ab1ad1f378581ad8", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", "shasum": "" }, "require": { "php": "^7.0", - "sebastian/object-reflector": "^1.0", + "sebastian/object-reflector": "^1.1.1", "sebastian/recursion-context": "^3.0" }, "require-dev": { @@ -1725,7 +1733,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-03-12T15:17:29+00:00" + "time": "2017-08-03T12:35:26+00:00" }, { "name": "sebastian/object-reflector", @@ -3009,12 +3017,12 @@ } ], "aliases": [], - "minimum-stability": "dev", + "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": true, + "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.0 || ^5.6" + "php": "^5.6 || ^7.0" }, "platform-dev": [] } From 41ee24c6413d080dfb43f609218c43dc04a061b0 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:36:31 -0600 Subject: [PATCH 33/40] Updates dependencies to work with PHP 7.2 - Requires updating to zend-inputfilter 2.8 series. - Requires updating to zend-session 2.8 series. --- composer.json | 4 +- composer.lock | 678 +++++++++++++++++++++----------------------------- 2 files changed, 279 insertions(+), 403 deletions(-) diff --git a/composer.json b/composer.json index 9f822d5e..07be654d 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ }, "require": { "php": "^5.6 || ^7.0", - "zendframework/zend-inputfilter": "^2.6", + "zendframework/zend-inputfilter": "^2.8", "zendframework/zend-hydrator": "^1.1 || ^2.1", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, @@ -31,7 +31,7 @@ "zendframework/zend-filter": "^2.6", "zendframework/zend-i18n": "^2.6", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.6.2", + "zendframework/zend-session": "^2.8.1", "zendframework/zend-text": "^2.6", "zendframework/zend-validator": "^2.6", "zendframework/zend-view": "^2.6.2", diff --git a/composer.lock b/composer.lock index 8ab0b104..11c76bc5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "bb5ff24714136f39babd777ac6d17a3d", + "content-hash": "076005ff7bc586421e47974a51766dd1", "packages": [ { "name": "container-interop/container-interop", @@ -88,16 +88,16 @@ }, { "name": "zendframework/zend-filter", - "version": "2.7.1", + "version": "2.7.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-filter.git", - "reference": "84c50246428efb0a1e52868e162dab3e149d5b80" + "reference": "b8d0ff872f126631bf63a932e33aa2d22d467175" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/84c50246428efb0a1e52868e162dab3e149d5b80", - "reference": "84c50246428efb0a1e52868e162dab3e149d5b80", + "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/b8d0ff872f126631bf63a932e33aa2d22d467175", + "reference": "b8d0ff872f126631bf63a932e33aa2d22d467175", "shasum": "" }, "require": { @@ -105,10 +105,10 @@ "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", "pear/archive_tar": "^1.4", - "phpunit/phpunit": "~4.0", - "zendframework/zend-crypt": "^2.6", + "phpunit/phpunit": "^6.0.10 || ^5.7.17", + "zendframework/zend-coding-standard": "~1.0.0", + "zendframework/zend-crypt": "^2.6 || ^3.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", "zendframework/zend-uri": "^2.5" }, @@ -144,29 +144,29 @@ "filter", "zf2" ], - "time": "2016-04-18T18:32:43+00:00" + "time": "2017-05-17T20:56:17+00:00" }, { "name": "zendframework/zend-hydrator", - "version": "2.2.1", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-hydrator.git", - "reference": "0ac0d3e569781f1895670b0c8d0dc7f25b8a3182" + "reference": "de0d6465fbc4b7ca345fddc148834c321c4b361f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/0ac0d3e569781f1895670b0c8d0dc7f25b8a3182", - "reference": "0ac0d3e569781f1895670b0c8d0dc7f25b8a3182", + "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/de0d6465fbc4b7ca345fddc148834c321c4b361f", + "reference": "de0d6465fbc4b7ca345fddc148834c321c4b361f", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "zendframework/zend-stdlib": "^3.0" }, "require-dev": { - "phpunit/phpunit": "^4.5", - "squizlabs/php_codesniffer": "^2.3.1", + "phpunit/phpunit": "^5.7.21 || ^6.3", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-eventmanager": "^3.0", "zendframework/zend-filter": "^2.6", "zendframework/zend-inputfilter": "^2.6", @@ -184,8 +184,8 @@ "branch-alias": { "dev-release-1.0": "1.0-dev", "dev-release-1.1": "1.1-dev", - "dev-master": "2.2-dev", - "dev-develop": "2.3-dev" + "dev-master": "2.3-dev", + "dev-develop": "2.4-dev" }, "zf": { "component": "Zend\\Hydrator", @@ -206,31 +206,31 @@ "hydrator", "zf2" ], - "time": "2016-04-18T17:59:29+00:00" + "time": "2017-10-02T15:01:27+00:00" }, { "name": "zendframework/zend-inputfilter", - "version": "2.7.3", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-inputfilter.git", - "reference": "0cf1bdcd8858a8583965310a7dae63ad75bd1237" + "reference": "e7edd625f2fcdd72a719a7023114c5f4b4f38488" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/0cf1bdcd8858a8583965310a7dae63ad75bd1237", - "reference": "0cf1bdcd8858a8583965310a7dae63ad75bd1237", + "url": "https://api.github.com/repos/zendframework/zend-inputfilter/zipball/e7edd625f2fcdd72a719a7023114c5f4b4f38488", + "reference": "e7edd625f2fcdd72a719a7023114c5f4b4f38488", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "zendframework/zend-filter": "^2.6", "zendframework/zend-stdlib": "^2.7 || ^3.0", - "zendframework/zend-validator": "^2.6" + "zendframework/zend-validator": "^2.10.1" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "squizlabs/php_codesniffer": "^2.6.2", + "phpunit/phpunit": "^5.7.23 || ^6.4.3", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { @@ -239,8 +239,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" }, "zf": { "component": "Zend\\InputFilter", @@ -256,12 +256,13 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-inputfilter", + "description": "Normalize and validate input sets from the web, APIs, the CLI, and more, including files", "keywords": [ + "ZendFramework", "inputfilter", - "zf2" + "zf" ], - "time": "2016-08-18T18:40:34+00:00" + "time": "2017-12-04T21:24:25+00:00" }, { "name": "zendframework/zend-stdlib", @@ -310,16 +311,16 @@ }, { "name": "zendframework/zend-validator", - "version": "2.9.0", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-validator.git", - "reference": "b71641582297eab52753b72cd4eb45a5ded4485c" + "reference": "010084ddbd33299bf51ea6f0e07f8f4e8bd832a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/b71641582297eab52753b72cd4eb45a5ded4485c", - "reference": "b71641582297eab52753b72cd4eb45a5ded4485c", + "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/010084ddbd33299bf51ea6f0e07f8f4e8bd832a8", + "reference": "010084ddbd33299bf51ea6f0e07f8f4e8bd832a8", "shasum": "" }, "require": { @@ -338,7 +339,7 @@ "zendframework/zend-i18n": "^2.6", "zendframework/zend-math": "^2.6", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", - "zendframework/zend-session": "^2.6.2", + "zendframework/zend-session": "^2.8", "zendframework/zend-uri": "^2.5" }, "suggest": { @@ -348,14 +349,14 @@ "zendframework/zend-i18n-resources": "Translations of validator messages", "zendframework/zend-math": "Zend\\Math component, required by the Csrf validator", "zendframework/zend-servicemanager": "Zend\\ServiceManager component to allow using the ValidatorPluginManager and validator chains", - "zendframework/zend-session": "Zend\\Session component, required by the Csrf validator", + "zendframework/zend-session": "Zend\\Session component, ^2.8; required by the Csrf validator", "zendframework/zend-uri": "Zend\\Uri component, required by the Uri and Sitemap\\Loc validators" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.9-dev", - "dev-develop": "2.10-dev" + "dev-master": "2.10-dev", + "dev-develop": "2.11-dev" }, "zf": { "component": "Zend\\Validator", @@ -377,27 +378,27 @@ "validator", "zf2" ], - "time": "2017-03-17T10:15:50+00:00" + "time": "2017-08-22T14:19:23+00:00" } ], "packages-dev": [ { "name": "doctrine/annotations", - "version": "v1.4.0", + "version": "v1.5.0", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "54cacc9b81758b14e3ce750f205a393d52339e97" + "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/54cacc9b81758b14e3ce750f205a393d52339e97", - "reference": "54cacc9b81758b14e3ce750f205a393d52339e97", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5beebb01b025c94e93686b7a0ed3edae81fe3e7f", + "reference": "5beebb01b025c94e93686b7a0ed3edae81fe3e7f", "shasum": "" }, "require": { "doctrine/lexer": "1.*", - "php": "^5.6 || ^7.0" + "php": "^7.1" }, "require-dev": { "doctrine/cache": "1.*", @@ -406,7 +407,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "1.5.x-dev" } }, "autoload": { @@ -447,7 +448,7 @@ "docblock", "parser" ], - "time": "2017-02-24T16:22:25+00:00" + "time": "2017-07-22T10:58:02+00:00" }, { "name": "doctrine/instantiator", @@ -604,16 +605,16 @@ }, { "name": "paragonie/random_compat", - "version": "v2.0.10", + "version": "v2.0.11", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d" + "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/634bae8e911eefa89c1abfbf1b66da679ac8f54d", - "reference": "634bae8e911eefa89c1abfbf1b66da679ac8f54d", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8", + "reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8", "shasum": "" }, "require": { @@ -648,109 +649,7 @@ "pseudorandom", "random" ], - "time": "2017-03-13T16:27:32+00:00" - }, - { - "name": "phar-io/manifest", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0", - "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0", - "shasum": "" - }, - "require": { - "ext-dom": "*", - "ext-phar": "*", - "phar-io/version": "^1.0.1", - "php": "^5.6 || ^7.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2017-03-05T18:14:27+00:00" - }, - { - "name": "phar-io/version", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df", - "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0" - }, - "type": "library", - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" - } - ], - "description": "Library for handling version information and constraints", - "time": "2017-03-05T17:38:23+00:00" + "time": "2017-09-27T21:40:39+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -969,40 +868,40 @@ }, { "name": "phpunit/php-code-coverage", - "version": "5.3.0", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1" + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/661f34d0bd3f1a7225ef491a70a020ad23a057a1", - "reference": "661f34d0bd3f1a7225ef491a70a020ad23a057a1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^7.0", - "phpunit/php-file-iterator": "^1.4.2", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^2.0.1", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.0", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "php": "^5.6 || ^7.0", + "phpunit/php-file-iterator": "^1.3", + "phpunit/php-text-template": "^1.2", + "phpunit/php-token-stream": "^1.4.2 || ^2.0", + "sebastian/code-unit-reverse-lookup": "^1.0", + "sebastian/environment": "^1.3.2 || ^2.0", + "sebastian/version": "^1.0 || ^2.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-xdebug": "^2.1.4", + "phpunit/phpunit": "^5.7" }, "suggest": { - "ext-xdebug": "^2.5.5" + "ext-xdebug": "^2.5.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.3.x-dev" + "dev-master": "4.0.x-dev" } }, "autoload": { @@ -1017,7 +916,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", + "email": "sb@sebastian-bergmann.de", "role": "lead" } ], @@ -1028,7 +927,7 @@ "testing", "xunit" ], - "time": "2017-12-06T09:29:45+00:00" + "time": "2017-04-02T07:44:40+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1218,16 +1117,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.5.3", + "version": "5.7.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "882e886cc928a0abd3c61282b2a64026237d14a4" + "reference": "4b1c822a68ae6577df38a59eb49b046712ec0f6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/882e886cc928a0abd3c61282b2a64026237d14a4", - "reference": "882e886cc928a0abd3c61282b2a64026237d14a4", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b1c822a68ae6577df38a59eb49b046712ec0f6a", + "reference": "4b1c822a68ae6577df38a59eb49b046712ec0f6a", "shasum": "" }, "require": { @@ -1236,35 +1135,33 @@ "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.6.1", - "phar-io/manifest": "^1.0.1", - "phar-io/version": "^1.0", - "php": "^7.0", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^5.3", - "phpunit/php-file-iterator": "^1.4.3", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^1.0.9", - "phpunit/phpunit-mock-objects": "^5.0.4", - "sebastian/comparator": "^2.1", - "sebastian/diff": "^2.0", - "sebastian/environment": "^3.1", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^1.0", - "sebastian/version": "^2.0.1" + "myclabs/deep-copy": "~1.3", + "php": "^5.6 || ^7.0", + "phpspec/prophecy": "^1.6.2", + "phpunit/php-code-coverage": "^4.0.4", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": "^1.0.6", + "phpunit/phpunit-mock-objects": "^3.2", + "sebastian/comparator": "^1.2.4", + "sebastian/diff": "^1.4.3", + "sebastian/environment": "^1.3.4 || ^2.0", + "sebastian/exporter": "~2.0", + "sebastian/global-state": "^1.1", + "sebastian/object-enumerator": "~2.0", + "sebastian/resource-operations": "~1.0", + "sebastian/version": "~1.0.3|~2.0", + "symfony/yaml": "~2.1|~3.0|~4.0" }, "conflict": { - "phpdocumentor/reflection-docblock": "3.0.2", - "phpunit/dbunit": "<3.0" + "phpdocumentor/reflection-docblock": "3.0.2" }, "require-dev": { "ext-pdo": "*" }, "suggest": { "ext-xdebug": "*", - "phpunit/php-invoker": "^1.1" + "phpunit/php-invoker": "~1.1" }, "bin": [ "phpunit" @@ -1272,7 +1169,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5.x-dev" + "dev-master": "5.7.x-dev" } }, "autoload": { @@ -1298,33 +1195,33 @@ "testing", "xunit" ], - "time": "2017-12-06T09:42:03+00:00" + "time": "2017-11-14T14:50:51+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "5.0.4", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "16b50f4167e5e85e81ca8a3dd105d0a5fd32009a" + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/16b50f4167e5e85e81ca8a3dd105d0a5fd32009a", - "reference": "16b50f4167e5e85e81ca8a3dd105d0a5fd32009a", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", + "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.0.5", - "php": "^7.0", - "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.0" + "doctrine/instantiator": "^1.0.2", + "php": "^5.6 || ^7.0", + "phpunit/php-text-template": "^1.2", + "sebastian/exporter": "^1.2 || ^2.0" }, "conflict": { - "phpunit/phpunit": "<6.0" + "phpunit/phpunit": "<5.4.0" }, "require-dev": { - "phpunit/phpunit": "^6.5" + "phpunit/phpunit": "^5.4" }, "suggest": { "ext-soap": "*" @@ -1332,7 +1229,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.0.x-dev" + "dev-master": "3.2.x-dev" } }, "autoload": { @@ -1347,7 +1244,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", + "email": "sb@sebastian-bergmann.de", "role": "lead" } ], @@ -1357,7 +1254,7 @@ "mock", "xunit" ], - "time": "2017-12-02T05:31:19+00:00" + "time": "2017-06-30T09:13:00+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1406,30 +1303,30 @@ }, { "name": "sebastian/comparator", - "version": "2.1.0", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1174d9018191e93cb9d719edec01257fc05f8158" + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1174d9018191e93cb9d719edec01257fc05f8158", - "reference": "1174d9018191e93cb9d719edec01257fc05f8158", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", "shasum": "" }, "require": { - "php": "^7.0", - "sebastian/diff": "^2.0", - "sebastian/exporter": "^3.1" + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2 || ~2.0" }, "require-dev": { - "phpunit/phpunit": "^6.4" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -1460,38 +1357,38 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "https://github.com/sebastianbergmann/comparator", + "homepage": "http://www.github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-11-03T07:16:52+00:00" + "time": "2017-01-29T09:50:25+00:00" }, { "name": "sebastian/diff", - "version": "2.0.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd" + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", - "reference": "347c1d8b49c5c3ee30c7040ea6fc446790e6bddd", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^6.2" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "1.4-dev" } }, "autoload": { @@ -1518,32 +1415,32 @@ "keywords": [ "diff" ], - "time": "2017-08-03T08:09:46+00:00" + "time": "2017-05-22T07:24:03+00:00" }, { "name": "sebastian/environment", - "version": "3.1.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5" + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5", - "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "^6.1" + "phpunit/phpunit": "^5.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1568,34 +1465,34 @@ "environment", "hhvm" ], - "time": "2017-07-01T08:51:00+00:00" + "time": "2016-11-26T07:53:53+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "234199f4528de6d12aaa58b612e98f7d36adb937" + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937", - "reference": "234199f4528de6d12aaa58b612e98f7d36adb937", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", "shasum": "" }, "require": { - "php": "^7.0", - "sebastian/recursion-context": "^3.0" + "php": ">=5.3.3", + "sebastian/recursion-context": "~2.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1635,27 +1532,27 @@ "export", "exporter" ], - "time": "2017-04-03T13:19:02+00:00" + "time": "2016-11-19T08:54:04+00:00" }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "~4.2" }, "suggest": { "ext-uopz": "*" @@ -1663,7 +1560,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "1.0-dev" } }, "autoload": { @@ -1686,34 +1583,33 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "time": "2015-10-12T03:26:01+00:00" }, { "name": "sebastian/object-enumerator", - "version": "3.0.3", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", - "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", + "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", "shasum": "" }, "require": { - "php": "^7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=5.6", + "sebastian/recursion-context": "~2.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "~5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1733,77 +1629,32 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-08-03T12:35:26+00:00" - }, - { - "name": "sebastian/object-reflector", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "773f97c67f28de00d397be301821b06708fca0be" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", - "reference": "773f97c67f28de00d397be301821b06708fca0be", - "shasum": "" - }, - "require": { - "php": "^7.0" - }, - "require-dev": { - "phpunit/phpunit": "^6.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - } - ], - "description": "Allows reflection of object attributes, including inherited and non-public ones", - "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2017-03-29T09:07:27+00:00" + "time": "2017-02-18T15:18:39+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", - "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1831,7 +1682,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2017-03-03T06:23:57+00:00" + "time": "2016-11-19T07:33:16+00:00" }, { "name": "sebastian/resource-operations", @@ -1920,16 +1771,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "2.8.1", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/squizlabs/PHP_CodeSniffer.git", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d" + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", - "reference": "d7cf0d894e8aa4c73712ee4a331cc1eaa37cdc7d", + "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/dcbed1074f8244661eecddfc2a675430d8d33f62", + "reference": "dcbed1074f8244661eecddfc2a675430d8d33f62", "shasum": "" }, "require": { @@ -1994,47 +1845,65 @@ "phpcs", "standards" ], - "time": "2017-03-01T22:17:45+00:00" + "time": "2017-05-22T02:43:20+00:00" }, { - "name": "theseer/tokenizer", - "version": "1.1.0", + "name": "symfony/yaml", + "version": "v4.0.1", "source": { "type": "git", - "url": "https://github.com/theseer/tokenizer.git", - "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b" + "url": "https://github.com/symfony/yaml.git", + "reference": "873417cb9949f07be8852d41e3be5ab6f09e1218" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b", - "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b", + "url": "https://api.github.com/repos/symfony/yaml/zipball/873417cb9949f07be8852d41e3be5ab6f09e1218", + "reference": "873417cb9949f07be8852d41e3be5ab6f09e1218", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-tokenizer": "*", - "ext-xmlwriter": "*", - "php": "^7.0" + "php": "^7.1.3" + }, + "conflict": { + "symfony/console": "<3.4" + }, + "require-dev": { + "symfony/console": "~3.4|~4.0" + }, + "suggest": { + "symfony/console": "For validating YAML files using the lint command" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, "autoload": { - "classmap": [ - "src/" + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], - "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2017-04-07T12:08:54+00:00" + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2017-12-04T18:34:52+00:00" }, { "name": "webmozart/assert", @@ -2214,27 +2083,27 @@ }, { "name": "zendframework/zend-code", - "version": "3.1.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-code.git", - "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27" + "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-code/zipball/2899c17f83a7207f2d7f53ec2f421204d3beea27", - "reference": "2899c17f83a7207f2d7f53ec2f421204d3beea27", + "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d", + "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d", "shasum": "" }, "require": { - "php": "^5.6 || 7.0.0 - 7.0.4 || ^7.0.6", + "php": "^7.1", "zendframework/zend-eventmanager": "^2.6 || ^3.0" }, "require-dev": { "doctrine/annotations": "~1.0", "ext-phar": "*", - "phpunit/phpunit": "^4.8.21", - "squizlabs/php_codesniffer": "^2.5", + "phpunit/phpunit": "^6.2.3", + "zendframework/zend-coding-standard": "^1.0.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "suggest": { @@ -2244,8 +2113,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" } }, "autoload": { @@ -2263,7 +2132,7 @@ "code", "zf2" ], - "time": "2016-10-24T13:23:32+00:00" + "time": "2017-10-20T15:21:32+00:00" }, { "name": "zendframework/zend-coding-standard", @@ -2340,16 +2209,16 @@ }, { "name": "zendframework/zend-eventmanager", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-eventmanager.git", - "reference": "c3bce7b7d47c54040b9ae51bc55491c72513b75d" + "reference": "9d72db10ceb6e42fb92350c0cb54460da61bd79c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/c3bce7b7d47c54040b9ae51bc55491c72513b75d", - "reference": "c3bce7b7d47c54040b9ae51bc55491c72513b75d", + "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/9d72db10ceb6e42fb92350c0cb54460da61bd79c", + "reference": "9d72db10ceb6e42fb92350c0cb54460da61bd79c", "shasum": "" }, "require": { @@ -2358,7 +2227,7 @@ "require-dev": { "athletic/athletic": "^0.1", "container-interop/container-interop": "^1.1.0", - "phpunit/phpunit": "^5.6", + "phpunit/phpunit": "^6.0.7 || ^5.7.14", "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-stdlib": "^2.7.3 || ^3.0" }, @@ -2369,8 +2238,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.2-dev", + "dev-develop": "3.3-dev" } }, "autoload": { @@ -2390,39 +2259,39 @@ "events", "zf2" ], - "time": "2016-12-19T21:47:12+00:00" + "time": "2017-07-11T19:17:22+00:00" }, { "name": "zendframework/zend-http", - "version": "2.6.0", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-http.git", - "reference": "09f4d279f46d86be63171ff62ee0f79eca878678" + "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-http/zipball/09f4d279f46d86be63171ff62ee0f79eca878678", - "reference": "09f4d279f46d86be63171ff62ee0f79eca878678", + "url": "https://api.github.com/repos/zendframework/zend-http/zipball/78aa510c0ea64bfb2aa234f50c4f232c9531acfa", + "reference": "78aa510c0ea64bfb2aa234f50c4f232c9531acfa", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "zendframework/zend-loader": "^2.5", - "zendframework/zend-stdlib": "^2.5 || ^3.0", - "zendframework/zend-uri": "^2.5", - "zendframework/zend-validator": "^2.5" + "php": "^5.6 || ^7.0", + "zendframework/zend-loader": "^2.5.1", + "zendframework/zend-stdlib": "^3.1 || ^2.7.7", + "zendframework/zend-uri": "^2.5.2", + "zendframework/zend-validator": "^2.10.1" }, "require-dev": { - "phpunit/phpunit": "^4.0", + "phpunit/phpunit": "^6.4.1 || ^5.7.15", "zendframework/zend-coding-standard": "~1.0.0", - "zendframework/zend-config": "^2.5" + "zendframework/zend-config": "^3.1 || ^2.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "2.7-dev", + "dev-develop": "2.8-dev" } }, "autoload": { @@ -2437,33 +2306,36 @@ "description": "provides an easy interface for performing Hyper-Text Transfer Protocol (HTTP) requests", "homepage": "https://github.com/zendframework/zend-http", "keywords": [ + "ZendFramework", "http", - "zf2" + "http client", + "zend", + "zf" ], - "time": "2017-01-31T14:41:02+00:00" + "time": "2017-10-13T12:06:24+00:00" }, { "name": "zendframework/zend-i18n", - "version": "2.7.3", + "version": "2.7.4", "source": { "type": "git", "url": "https://github.com/zendframework/zend-i18n.git", - "reference": "b2db0d8246a865c659f93199f90f5fc2cd2f3cd8" + "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/b2db0d8246a865c659f93199f90f5fc2cd2f3cd8", - "reference": "b2db0d8246a865c659f93199f90f5fc2cd2f3cd8", + "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/d3431e29cc00c2a1c6704e601d4371dbf24f6a31", + "reference": "d3431e29cc00c2a1c6704e601d4371dbf24f6a31", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^7.0 || ^5.6", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", + "phpunit/phpunit": "^6.0.8 || ^5.7.15", "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-config": "^2.6", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-filter": "^2.6.1", @@ -2507,7 +2379,7 @@ "i18n", "zf2" ], - "time": "2016-06-07T21:08:30+00:00" + "time": "2017-05-17T17:00:12+00:00" }, { "name": "zendframework/zend-json", @@ -2655,16 +2527,16 @@ }, { "name": "zendframework/zend-servicemanager", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/zendframework/zend-servicemanager.git", - "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0" + "reference": "0fa3d3cf588dde0850fff1efa60d44a7aa3c3ab7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/c3036efb81f71bfa36cc9962ee5d4474f36581d0", - "reference": "c3036efb81f71bfa36cc9962ee5d4474f36581d0", + "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/0fa3d3cf588dde0850fff1efa60d44a7aa3c3ab7", + "reference": "0fa3d3cf588dde0850fff1efa60d44a7aa3c3ab7", "shasum": "" }, "require": { @@ -2696,7 +2568,7 @@ "extra": { "branch-alias": { "dev-master": "3.3-dev", - "dev-develop": "3.4-dev" + "dev-develop": "4.0-dev" } }, "autoload": { @@ -2714,33 +2586,37 @@ "servicemanager", "zf" ], - "time": "2017-03-01T22:08:02+00:00" + "time": "2017-11-27T18:11:25+00:00" }, { "name": "zendframework/zend-session", - "version": "2.7.3", + "version": "2.8.3", "source": { "type": "git", "url": "https://github.com/zendframework/zend-session.git", - "reference": "346e9709657b81a5d53d70ce754730a26d1f02f2" + "reference": "c14be63df39b0caee784e53cd57c43eb48efefea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-session/zipball/346e9709657b81a5d53d70ce754730a26d1f02f2", - "reference": "346e9709657b81a5d53d70ce754730a26d1f02f2", + "url": "https://api.github.com/repos/zendframework/zend-session/zipball/c14be63df39b0caee784e53cd57c43eb48efefea", + "reference": "c14be63df39b0caee784e53cd57c43eb48efefea", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", + "php": "^5.6 || ^7.0", "zendframework/zend-eventmanager": "^2.6.2 || ^3.0", "zendframework/zend-stdlib": "^2.7 || ^3.0" }, + "conflict": { + "phpunit/phpunit": ">=6.5.0" + }, "require-dev": { "container-interop/container-interop": "^1.1", - "fabpot/php-cs-fixer": "1.7.*", "mongodb/mongodb": "^1.0.1", - "phpunit/phpunit": "~4.0", + "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0", + "phpunit/phpunit": "^5.7.5 || ^6.0.13", "zendframework/zend-cache": "^2.6.1", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-db": "^2.7", "zendframework/zend-http": "^2.5.4", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3", @@ -2757,8 +2633,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev", - "dev-develop": "2.8-dev" + "dev-master": "2.8-dev", + "dev-develop": "2.9-dev" }, "zf": { "component": "Zend\\Session", @@ -2775,12 +2651,12 @@ "BSD-3-Clause" ], "description": "manage and preserve session data, a logical complement of cookie data, across multiple page requests by the same client", - "homepage": "https://github.com/zendframework/zend-session", "keywords": [ + "ZendFramework", "session", - "zf2" + "zf" ], - "time": "2016-07-05T18:32:50+00:00" + "time": "2017-12-01T17:35:04+00:00" }, { "name": "zendframework/zend-text", From 3e6535fc9488385f520d556e886469d5b6723d7d Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:41:18 -0600 Subject: [PATCH 34/40] Do not allow failure for PHP 7.2 --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37cf241d..add7ccda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -60,8 +60,6 @@ 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 From 591064010be76fd82b3b5f91b16f2d96e3144dba Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:34:19 +0000 Subject: [PATCH 35/40] Updated Travis CI configuration - legacy dependencies - removed composer self-update - removed allow_failures on PHP 7.2 - cs-checks and coverage moved to run on PHP 7.1 with locked deps --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index add7ccda..a356a1a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 @@ -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 @@ -48,6 +47,8 @@ matrix: - php: 7.1 env: - DEPS=locked + - CS_CHECK=true + - TEST_COVERAGE=true - php: 7.1 env: - DEPS=latest @@ -63,7 +64,6 @@ matrix: 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 From 3a876fbceba548a14db6d34632fa85d9981c5305 Mon Sep 17 00:00:00 2001 From: webimpress Date: Wed, 6 Dec 2017 20:36:24 +0000 Subject: [PATCH 36/40] Updated Travis CI configuration - install section --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a356a1a5..951826d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -67,9 +67,9 @@ before_install: 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 From 10ec1cc2acff4cb7b752f63790887e1f0a91218e Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:55:30 -0600 Subject: [PATCH 37/40] Adds doctrine/annotations to the LEGACY_DEPS environments V1.5 of that library only supports PHP 7.1 and up, so locked versions of PHP 7 and PHP 5.5 need to be able to get the latest versions that that library supports for their PHP version. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 951826d8..f7a4c052 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: - php: 5.6 env: - DEPS=locked - - LEGACY_DEPS="phpunit/phpunit" + - LEGACY_DEPS="phpunit/phpunit doctrine/annotations" - php: 5.6 env: - DEPS=latest @@ -37,7 +37,7 @@ matrix: - php: 7 env: - DEPS=locked - - LEGACY_DEPS="phpunit/phpunit" + - LEGACY_DEPS="phpunit/phpunit doctrine/annotations" - php: 7 env: - DEPS=latest From 43c4d981abc4eab04d0205530b8cbc47e0f150a2 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 14:59:04 -0600 Subject: [PATCH 38/40] Adds zend-code to LEGACY_DEPS environment Version 3.3 requires PHP 7.1. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7a4c052..88881172 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,7 @@ matrix: - php: 5.6 env: - DEPS=locked - - LEGACY_DEPS="phpunit/phpunit doctrine/annotations" + - LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code" - php: 5.6 env: - DEPS=latest @@ -37,7 +37,7 @@ matrix: - php: 7 env: - DEPS=locked - - LEGACY_DEPS="phpunit/phpunit doctrine/annotations" + - LEGACY_DEPS="phpunit/phpunit doctrine/annotations zendframework/zend-code" - php: 7 env: - DEPS=latest From 9e7e0774b2e45369a97d694bb70282f72f9da2a4 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 15:06:06 -0600 Subject: [PATCH 39/40] Adds CHANGELOG entries for #171, #186, and #187 --- CHANGELOG.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6307326..b57369d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ All notable changes to this project will be documented in this file, in reverse for the `FormElementErrors` view helper to translate validation error messages using the composed translator and text domain instances. +- [#171](https://github.com/zendframework/zend-form/pull/171), + [#186](https://github.com/zendframework/zend-form/pull/186), and + [#187](https://github.com/zendframework/zend-form/pull/187) add support for + PHP 7.2. + ### Changed - Nothing. @@ -20,7 +25,11 @@ All notable changes to this project will be documented in this file, in reverse ### Removed -- Nothing. +- [#171](https://github.com/zendframework/zend-form/pull/171) removes support + for HHVM. + +- [#186](https://github.com/zendframework/zend-form/pull/186) removes support + for PHP 5.5. ### Fixed From 0cda1aff2950f3b9963f5d8e0def9f241b12c00b Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 15:07:02 -0600 Subject: [PATCH 40/40] Removes empty 2.10.3 release stub from CHANGELOG --- CHANGELOG.md | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b57369d8..446fa434 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,24 +49,6 @@ All notable changes to this project will be documented in this file, in reverse `DateTime`) when retrieving the value; this fixes edge cases where it was instead returning the format for `DateTimeImmutable` values. -## 2.10.3 - TBD - -### Added - -- Nothing. - -### Deprecated - -- Nothing. - -### Removed - -- Nothing. - -### Fixed - -- Nothing. - ## 2.10.2 - 2017-05-18 ### Added