Merge branch 'hotfix/135' into develop

Close #135

Author: weierophinney

.travis.yml

@@ -2,16 +2,9 @@ sudo: false
 
 language: php
 
-branches:
-  except:
-    - /^release-.*$/
-    - /^ghgfk-.*$/
-
 cache:
   directories:
     - $HOME/.composer/cache
-    - $HOME/.local
-    - zf-mkdoc-theme
 
 env:
   global:
@@ -20,11 +13,6 @@ env:
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
     - LEGACY_DEPS="phpunit/phpunit"
     - LATEST_DEPS="zendframework/zend-mvc-plugin-flashmessenger zendframework/zend-mvc-i18n zendframework/zend-mvc-console"
-    - SITE_URL=https://zendframework.github.io/zend-view
-    - GH_USER_NAME="Matthew Weier O'Phinney"
-    - [email protected]
-    - GH_REF=github.com/zendframework/zend-view.git
-    - secure: "kF7z5CxnrD/lsX9sP1+SYLKm1HdT/u1F0xovlyT9fDWrz+X4DBe8Oybzk6UX5HKXQvdhVTfAbHoWhFxFrkcRKrtaEOltk68bYFgnSOYhrK5EhZz6CHqN2j1MtT6FRfdlSOi6OECvCE3wd8nYHixxEviIZyB3L5+H39FOiu5Zi+eJT/myp6IuBO6lQfnSgqKdvuQXlfWSn9VGQJztX6ea2U89eM/TAVWEwbhLAJOsOejkvAy2lvYhIZpvSEkFm9jSp3/JOw8MFljG8UEDZUkpj+zba5/vqzM8thTTbybhAIBF7wNeMNrAeFBnrPz5KDPEQYYG8NG4we6F7GvbevvBz+ej5OJPXx/ulhMiEWKN1qEmQHZ3Gl0kG0O+TgXfqLErbCNn4MLP/K0Avar03m9bvXtaTA5Yqde0rIdspjwdxmKi0OI76UnGETMDyWuXbHkRfhs54sUEOBUdM3dz5lXhlSWPCTlQCgzkVqlgTL5b8b1u7YKpkwJAFSXMhhJBycFCNCfqAy10l2wjgvhXhLgPHle7sSwYR6SMVzkjj59P1UKc2yrxkwl/S7cqrbaeGSGjDv/QVMLtBL3OLqXwIaKy3POF2gQJhFXdrmGzDOADyCbEXVUYve5pQOmT1RdVHaHiT7AmZXEQibR1DW2zzU9eX94XpK9LKzlSzUOtYT8LNNA="
 
 matrix:
   include:
@@ -34,9 +22,6 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - TEST_COVERAGE=true
-        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
-        - PATH="$HOME/.local/bin:$PATH"
     - php: 5.6
       env:
         - DEPS=latest
@@ -46,6 +31,8 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7
       env:
         - DEPS=latest
@@ -58,25 +45,18 @@ matrix:
     - php: 7.1
       env:
         - DEPS=latest
-    - php: hhvm 
+    - php: 7.2
       env:
         - DEPS=lowest
-    - php: hhvm 
+    - php: 7.2
       env:
         - DEPS=locked
-    - php: hhvm 
+    - php: 7.2
       env:
         - DEPS=latest
-  allow_failures:
-    - php: hhvm
-
-notifications:
-  irc: "irc.freenode.org#zftalk.dev"
-  email: false
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi
-  - composer self-update
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
@@ -85,15 +65,14 @@ install:
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
-  - composer show --installed
+  - stty cols 120 && composer show
 
 script:
   - 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
-
-after_success:
-  - if [[ $DEPLOY_DOCS == "true" ]]; then echo "Preparing to build and deploy documentation" ; ./zf-mkdoc-theme/deploy.sh ; echo "Completed deploying documentation" ; fi
 
 after_script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+
+notifications:
+  email: false

CHANGELOG.md

@@ -6,7 +6,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Added
 
-- Nothing.
+- [#135](https://github.com/zendframework/zend-view/pull/135) adds support
+  for PHP 7.2.
 
 ### Changed
 
@@ -18,7 +19,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Removed
 
-- Nothing.
+- [#135](https://github.com/zendframework/zend-view/pull/135) removes support
+  for HHVM.
 
 ### Fixed
 

composer.json

@@ -39,8 +39,8 @@
         "zendframework/zend-permissions-acl": "^2.6",
         "zendframework/zend-router": "^3.0.1",
         "zendframework/zend-serializer": "^2.6.1",
-        "zendframework/zend-session": "^2.6.2",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
+        "zendframework/zend-session": "^2.8.1",
         "zendframework/zend-uri": "^2.5"
     },
     "suggest": {

composer.lock

@@ -473,7 +473,9 @@ public function setCharset($charset)
         $item->modifiers = [];
 
         if (! $this->isValid($item)) {
-            throw new Exception\InvalidArgumentException('XHTML* doctype has no attribute charset; please use appendHttpEquiv()');
+            throw new Exception\InvalidArgumentException(
+                'XHTML* doctype has no attribute charset; please use appendHttpEquiv()'
+            );
         }
 
         $this->set($item);

src/Helper/HeadMeta.php

@@ -1,4 +1,10 @@
 <?php
-echo implode(', ', array_map(
-        create_function('$a', 'return $a->getLabel();'),
-        $this->vars()->pages));
+echo implode(
+    ', ',
+    array_map(
+        function($a) {
+            return $a->getLabel();
+        },
+        $this->vars()->pages
+    )
+);

test/Helper/Navigation/_files/mvc/views/bc.phtml

@@ -1,4 +1,10 @@
 <?php
-echo implode($this->vars()->separator, array_map(
-        create_function('$a', 'return $a->getLabel();'),
-        $this->vars()->pages));
+echo implode(
+    $this->vars()->separator,
+    array_map(
+        function($a) {
+            return $a->getLabel();
+        },
+        $this->vars()->pages
+    )
+);

test/Helper/Navigation/_files/mvc/views/bc_separator.phtml

@@ -3,7 +3,9 @@ echo $this->variable . PHP_EOL;
 echo implode(
     $this->vars()->separator,
     array_map(
-        create_function('$a', 'return $a->getLabel();'),
+        function($a) {
+            return $a->getLabel();
+        },
         $this->vars()->pages
     )
 );