Merge branch 'release/2.4.2' into release-2.4

zendframework · Oct 4, 2019 · 2bfc684 · 2bfc684
2 parents 474eb93 + 8d72b8a
commit 2bfc684
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -53,6 +53,15 @@ matrix:
     - php: 7.2
       env:
         - DEPS=latest
+    - php: 7.3
+      env:
+        - DEPS=lowest
+    - php: 7.3
+      env:
+        - DEPS=locked
+    - php: 7.3
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

diff --git 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.4.2 - TBD
+## 2.4.2 - 2019-10-04
 
 ### Added
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2005-2018, Zend Technologies USA, Inc.
+Copyright (c) 2005-2019, Zend Technologies USA, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -1,7 +1,7 @@
 docs_dir: docs/book
 site_dir: docs/html
-pages:
-    - index.md
+nav:
+    - Home: index.md
     - "Quick Start": quick-start.md
     - Reference:
       - "Filters": filter.md
@@ -13,6 +13,5 @@ pages:
         - "Underscore Mapping": naming-strategy/underscore-naming-strategy.md
         - "Composite": naming-strategy/composite-naming-strategy.md
 site_name: zend-hydrator
-site_description: zend-hydrator
+site_description: "Serialize objects to arrays, and vice versa"
 repo_url: 'https://github.com/zendframework/zend-hydrator'
-copyright: 'Copyright (c) 2005-2018 <a href="https://www.zend.com/">Zend Technologies USA Inc.</a>'