Merge 0a4f55d into 1f9f22e

.gitattributes

@@ -1,8 +1,10 @@
-/test export-ignore
-/vendor export-ignore
-.coveralls.yml export-ignore
-.gitattributes export-ignore
-.gitignore export-ignore
-.travis.yml export-ignore
-.php_cs export-ignore
-phpunit.xml.dist export-ignore
+/.coveralls.yml export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/composer.lock export-ignore
+/docs/ export-ignore
+/mkdocs.yml export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/test/ export-ignore

.gitignore

@@ -1,17 +1,7 @@
-.buildpath
-.DS_Store
-.idea
-.phpcd/
-.project
-.settings/
-.*.sw*
-.*.un~
-nbproject
-tmp/
-doc/html/
-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/

.travis.yml

@@ -2,28 +2,14 @@ sudo: false
 
 language: php
 
-branches:
-  except:
-    - /^release-.*$/
-    - /^ghgfk-.*$/
-
 cache:
   directories:
     - $HOME/.composer/cache
-    - vendor
-    - $HOME/.local
-    - zf-mkdoc-theme
 
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - COVERAGE_DEPS="satooshi/php-coveralls"
-    - LEGACY_DEPS="phpunit/phpunit"
-    - SITE_URL: https://zendframework.github.io/zend-navigation
-    - GH_USER_NAME: "Matthew Weier O'Phinney"
-    - GH_USER_EMAIL: matthew@weierophinney.net
-    - GH_REF: github.com/zendframework/zend-navigation.git
-    - secure: "tgcIcU0H/502W94XsyOA/aBb26CfaFJklEm4TZC/foM0qcoSB+U5PLmn+UtBFbuXBDApC2H/G6F+hpR1nTIp9aO9cizfpRB7GYPHJ4gq3crSgBMv5sMB0TJekypbEChoPAhxM+UT3imlA6kbw2ttcqvSqU3EcvyeIT5Ef8B4FDBPBDH6ozewUcYNoxHx1pcJnIkKdkZu9RedIt46GJ4TiJiImCS7txxPZOeNVHZpCMps/1gQEPdD6P/etvxjYrFLtnFyIdpTHB6DBnxbBlM9eYrUlUE47xW25m3gbCERNk0gBTaSXImEkk9mjnSwC1ek0SmEhaeLKxcl7o06C4sU5Evua9uUSFHBa17lGTMCJnKZ+YxIT31n/cX5vi+pcMxO2YBSXB/QiXJvhlxNtn6TqsEMYzJqOedX+t+7mexFsKLEOOut3HrjQV2ZxnTv+xnYWq+MrPlIcQhLMUTXHlAMf91el6bu1yF62I9dGTF0j252pZqGbNIst0i9Dfvd0I28f4AUDU2+YiuCuoAC9W1ISXPWd/b43gFsMSIuAFg0e3UT64CTQlUHIMHZWPVQ37TMcPmmg10RBM7jtrZPD74cJjlEilXbCNBZaDJUAQXTw51SetrqB/GfyZ9LKeHqsnd2zxXck1RiBVskwsZrveULnFS6pp9Z4j7etxrB8wSK48k="
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
   include:
@@ -33,8 +19,7 @@ matrix:
     - php: 5.6
       env:
         - DEPS=locked
-        - DEPLOY_DOCS="$(if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then echo -n 'true' ; else echo -n 'false' ; fi)"
-        - PATH="$HOME/.local/bin:$PATH"
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 5.6
       env:
         - DEPS=latest
@@ -44,54 +29,48 @@ matrix:
     - php: 7
       env:
         - DEPS=locked
+        - LEGACY_DEPS="phpunit/phpunit"
     - php: 7
       env:
         - DEPS=latest
-        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=lowest
     - php: 7.1
       env:
         - DEPS=locked
+        - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPS=latest
-    - php: 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
-  - travis_retry composer self-update
 
 install:
   - travis_retry composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $TRAVIS_PHP_VERSION =~ ^5.6 ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
+  - if [[ $LEGACY_DEPS != "" ]]; then travis_retry composer update $COMPOSER_ARGS --with-dependencies $LEGACY_DEPS ; fi
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
-  - composer show
+  - 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 composer upload-coverage ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry php vendor/bin/php-coveralls -v ; fi
+
+notifications:
+  email: false

LICENSE.md

@@ -1,16 +1,15 @@
-Copyright (c) 2005-2015, Zend Technologies USA, Inc.
-
+Copyright (c) 2005-2018, 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

README.md

@@ -1,12 +1,12 @@
 # zend-navigation
 
 [![Build Status](https://secure.travis-ci.org/zendframework/zend-navigation.svg?branch=master)](https://secure.travis-ci.org/zendframework/zend-navigation)
-[![Coverage Status](https://coveralls.io/repos/zendframework/zend-navigation/badge.svg?branch=master)](https://coveralls.io/r/zendframework/zend-navigation?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/zendframework/zend-navigation/badge.svg?branch=master)](https://coveralls.io/github/zendframework/zend-navigation?branch=master)
 
 `Zend\Navigation` is a component for managing trees of pointers to web pages.
 Simply put: It can be used for creating menus, breadcrumbs, links, and sitemaps,
 or serve as a model for other navigation related purposes.
 
 
 - File issues at https://github.com/zendframework/zend-navigation/issues
-- Documentation is at https://zendframework.github.io/zend-navigation/
+- Documentation is at https://docs.zendframework.com/zend-navigation/

composer.json

@@ -1,35 +1,38 @@
 {
     "name": "zendframework/zend-navigation",
-    "description": "provides support for managing trees of pointers to web pages",
+    "description": "Manage trees of pointers to web pages in order to build navigation systems",
     "license": "BSD-3-Clause",
     "keywords": [
-        "zf2",
+        "zendframework",
+        "zf",
         "navigation"
     ],
-    "homepage": "https://github.com/zendframework/zend-navigation",
-    "autoload": {
-        "psr-4": {
-            "Zend\\Navigation\\": "src/"
-        }
+    "support": {
+        "docs": "https://docs.zendframework.com/zend-navigation/",
+        "issues": "https://github.com/zendframework/zend-navigation/issues",
+        "source": "https://github.com/zendframework/zend-navigation",
+        "rss": "https://github.com/zendframework/zend-navigation/releases.atom",
+        "slack": "https://zendframework-slack.herokuapp.com",
+        "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
         "php": "^5.6 || ^7.0",
         "zendframework/zend-stdlib": "^2.7 || ^3.0"
     },
     "require-dev": {
+        "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+        "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-config": "^2.6 || ^3.1",
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-http": "^2.6",
         "zendframework/zend-i18n": "^2.7.3",
         "zendframework/zend-log": "^2.9.1",
         "zendframework/zend-mvc": "^2.7.9 || ^3.0.4",
-        "zendframework/zend-router": "^3.0.2",
         "zendframework/zend-permissions-acl": "^2.6",
+        "zendframework/zend-router": "^3.0.2",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3",
         "zendframework/zend-uri": "^2.5.2",
-        "zendframework/zend-view": "^2.9",
-        "phpunit/phpunit": "^6.0.8 || ^5.7.15",
-        "zendframework/zend-coding-standard": "~1.0.0"
+        "zendframework/zend-view": "^2.9"
     },
     "suggest": {
         "zendframework/zend-config": "^2.6 || ^3.1, to provide page configuration (optional, as arrays and Traversables are also allowed)",
@@ -38,23 +41,29 @@
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3, to use the navigation factories",
         "zendframework/zend-view": "^2.8.1, to use the navigation view helpers"
     },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
+    "autoload": {
+        "psr-4": {
+            "Zend\\Navigation\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "ZendTest\\Navigation\\": "test/"
+        }
+    },
+    "config": {
+        "sort-packages": true
+    },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.8-dev",
-            "dev-develop": "2.9-dev"
+            "dev-master": "2.8.x-dev",
+            "dev-develop": "2.9.x-dev"
         },
         "zf": {
             "component": "Zend\\Navigation",
             "config-provider": "Zend\\Navigation\\ConfigProvider"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "ZendTest\\Navigation\\": "test/"
-        }
-    },
     "scripts": {
         "check": [
             "@cs-check",
@@ -63,7 +72,6 @@
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "upload-coverage": "coveralls -v"
+        "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
     }
 }