Merge branch 'release/2.11.0'

Author: michalbundyra

.gitattributes

@@ -2,11 +2,11 @@
 /.coveralls.yml export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
-/.php_cs 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
 /Vagrantfile export-ignore

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.11.0 - TBD
+## 2.11.0 - 2019-12-31
 
 ### Added
 
@@ -26,28 +26,6 @@ All notable changes to this project will be documented in this file, in reverse
 
 - [#146](https://github.com/zendframework/zend-db/pull/146) fixes setting correct value for `lastInsertValue` pre-insert in `SequenceFeature`.
 
-## 2.10.2 - TBD
-
-### Added
-
-- Nothing.
-
-### Changed
-
-- Nothing.
-
-### Deprecated
-
-- Nothing.
-
-### Removed
-
-- Nothing.
-
-### Fixed
-
-- Nothing.
-
 ## 2.10.1 - 2019-12-31
 
 - Nothing.

LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2017, 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,

composer.json

@@ -12,15 +12,15 @@
         "issues": "https://github.com/zendframework/zend-db/issues",
         "source": "https://github.com/zendframework/zend-db",
         "rss": "https://github.com/zendframework/zend-db/releases.atom",
-        "slack": "https://zendframework-slack.herokuapp.com",
+        "chat": "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.25 || ^6.4.4",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.14",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-eventmanager": "^2.6.2 || ^3.0",
         "zendframework/zend-hydrator": "^1.1 || ^2.1 || ^3.0",
@@ -50,8 +50,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.10.x-dev",
-            "dev-develop": "2.11.x-dev"
+            "dev-master": "2.11.x-dev",
+            "dev-develop": "2.12.x-dev"
         },
         "zf": {
             "component": "Zend\\Db",
@@ -67,7 +67,7 @@
         "cs-fix": "phpcbf",
         "test": "phpunit --colors=always --testsuite \"unit test\"",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
-        "test-integration" : "phpunit --colors=always --testsuite \"integration test\"",
+        "test-integration": "phpunit --colors=always --testsuite \"integration test\"",
         "upload-coverage": "coveralls -v"
     }
 }