Merged from upstream

.travis.yml

@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 cache:
@@ -21,7 +19,7 @@ matrix:
         - mysql
       env:
         - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
+        - LEGACY_DEPS="phpunit/phpunit zendframework/zend-hydrator"
         - TEST_INTEGRATION=true
         - TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL=true
     - php: 5.6
@@ -35,7 +33,7 @@ matrix:
         - mysql
       env:
         - DEPS=locked
-        - LEGACY_DEPS="phpunit/phpunit"
+        - LEGACY_DEPS="phpunit/phpunit zendframework/zend-hydrator"
         - TEST_INTEGRATION=true
         - TESTS_ZEND_DB_ADAPTER_DRIVER_MYSQL=true
     - php: 7.0
@@ -49,6 +47,7 @@ matrix:
         - mysql
       env:
         - DEPS=locked
+        - LEGACY_DEPS="zendframework/zend-hydrator"
         - CS_CHECK=true
         - TEST_COVERAGE=true
         - TEST_INTEGRATION=true
@@ -78,6 +77,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
@@ -90,8 +98,6 @@ install:
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
   - stty cols 120 && composer show
 
-before_script:
-
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
   - if [[ $TEST_INTEGRATION == 'true' ]]; then composer test-integration ; fi

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.9.4 - TBD
+## 2.10.1 - TBD
 
 ### Added
 
@@ -24,6 +24,48 @@ All notable changes to this project will be documented in this file, in reverse
 
 - Nothing.
 
+## 2.10.0 - 2019-02-25
+
+### Added
+
+- [#157](https://github.com/zendframework/zend-db/pull/157) added support of
+  `Zend\Db\Sql\TableIdentifier` in DDL
+- [#345](https://github.com/zendframework/zend-db/pull/345) allow usage with
+ zend-hydrator v3
+- [#346](https://github.com/zendframework/zend-db/pull/346) adds support for PHP
+ 7.3
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- [#303](https://github.com/zendframework/zend-db/pull/303) fixes #295 issue:
+ handle empty array as datasource at `AbstractResultSet::initialize()` at PHP
+  7.2
+- [#313](https://github.com/zendframework/zend-db/pull/313) test
+ `AbstractResultSet::current()` to return null on empty array
+- [#329](https://github.com/zendframework/zend-db/pull/329) fixes Exception
+ thrown when calling `prepareStatementForSqlObject` on a Select with a
+ sub-Select that has limit and/or offset set
+- [#337](https://github.com/zendframework/zend-db/pull/337) fixes #330 current
+  NULL for mysqli
+- [#338](https://github.com/zendframework/zend-db/pull/338) restore missing use
+ `ResultSet` in `AbstractTableGateway`
+- [#341](https://github.com/zendframework/zend-db/pull/341) fixes undefined
+ variable bug in MetadataFeature
+- [#357](https://github.com/zendframework/zend-db/pull/357) fixes named params
+ in subquery - limit and offset (issue #355)
+
 ## 2.9.3 - 2018-04-09
 
 ### Added

composer.json

@@ -23,7 +23,7 @@
         "phpunit/phpunit": "^5.7.25 || ^6.4.4",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
-        "zendframework/zend-hydrator": "^1.1 || ^2.1",
+        "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
         "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3"
     },
     "suggest": {