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

Add PHP 7.2 support, drop HHVM #171

Merged
merged 4 commits into from
Dec 1, 2017
Merged

Add PHP 7.2 support, drop HHVM #171

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cc0dd3
Adapt .travis.yml to recent ZF standards
Slamdunk Jun 22, 2017
7038329
Travis: drop HVVM & Add PHP 7.2
Slamdunk Jun 22, 2017
fbda16c
Prepare to PHP 7.2
Slamdunk Jun 22, 2017
38c0550
Travis matrix: nightly -> 7.2
Slamdunk Aug 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -60,17 +59,17 @@ matrix:
- php: 7.1
env:
- DEPS=latest
- php: hhvm
- php: nightly
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nightly now refers to PHP 7.3-dev, we should then add also PHP 7.2 here.
@Slamdunk would you be able to update your PR, please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The main point to refer to nightly is to test against 7.2, not the latest.
I'll change nightly to 7.2, removing nightly entirely; it is too early to bother to 7.3

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, thank you for suggestion

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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
3 changes: 2 additions & 1 deletion test/View/Helper/FormSelectTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down