Merge branch 'release/2.9.2'

zendframework · Aug 19, 2019 · d78f2cd · d78f2cd
2 parents 63e7fe3 + a763c39
commit d78f2cd
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
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.9.2 - TBD
+## 2.9.2 - 2019-08-19
 
 ### 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/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "zendframework/zend-filter",
-    "description": "provides a set of commonly needed data filters",
+    "description": "Programmatically filter and normalize data and files",
     "license": "BSD-3-Clause",
     "keywords": [
         "zf",
@@ -12,7 +12,7 @@
         "issues": "https://github.com/zendframework/zend-filter/issues",
         "source": "https://github.com/zendframework/zend-filter",
         "rss": "https://github.com/zendframework/zend-filter/releases.atom",
-        "slack": "https://zendframework-slack.herokuapp.com",
+        "chat": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
@@ -28,16 +28,16 @@
         "zendframework/zend-servicemanager": "^2.7.8 || ^3.3",
         "zendframework/zend-uri": "^2.6"
     },
+    "conflict": {
+        "zendframework/zend-validator": "<2.10.1"
+    },
     "suggest": {
         "psr/http-factory-implementation": "psr/http-factory-implementation, for creating file upload instances when consuming PSR-7 in file upload filters",
         "zendframework/zend-crypt": "Zend\\Crypt component, for encryption filters",
         "zendframework/zend-i18n": "Zend\\I18n component for filters depending on i18n functionality",
         "zendframework/zend-servicemanager": "Zend\\ServiceManager component, for using the filter chain functionality",
         "zendframework/zend-uri": "Zend\\Uri component, for the UriNormalize filter"
     },
-    "conflict": {
-        "zendframework/zend-validator": "<2.10.1"
-    },
     "autoload": {
         "psr-4": {
             "Zend\\Filter\\": "src/"

diff --git a/composer.lock b/composer.lock
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -7,7 +7,7 @@ read/subscribe to the following resources:
 
  - [Coding Standards](https://github.com/zendframework/zend-coding-standard)
  - [Forums](https://discourse.zendframework.com/c/contributors)
- - [Slack](https://zendframework-slack.herokuapp.com)
+ - [Chat](https://zendframework-slack.herokuapp.com)
  - [Code of Conduct](CODE_OF_CONDUCT.md)
 
 If you are working on new features or refactoring

diff --git a/docs/ISSUE_TEMPLATE.md b/docs/ISSUE_TEMPLATE.md
@@ -1,5 +1,5 @@
  - [ ] I was not able to find an [open](https://github.com/zendframework/zend-filter/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-filter/issues?q=is%3Aclosed) issue matching what I'm seeing.
- - [ ] This is not a question. (Questions should be asked on [slack](https://zendframework.slack.com/) ([Signup for Slack here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).)
+ - [ ] This is not a question. (Questions should be asked on [chat](https://zendframework.slack.com/) ([Signup here](https://zendframework-slack.herokuapp.com/)) or our [forums](https://discourse.zendframework.com/).)
 
 Provide a narrative description of what you are trying to accomplish.
 

diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md
@@ -3,13 +3,13 @@
 Zend Framework offers three support channels:
 
 - For real-time questions, use our
-  [Slack](https://zendframework-slack.herokuapp.com)
+  [chat](https://zendframework-slack.herokuapp.com)
 - For detailed questions (e.g., those requiring examples) use our
   [forums](https://discourse.zendframework.com/c/questions/components)
 - To report issues, use this repository's
   [issue tracker](https://github.com/zendframework/zend-filter/issues/new)
 
-**DO NOT** use the issue tracker to ask questions; use Slack or the forums for
+**DO NOT** use the issue tracker to ask questions; use chat or the forums for
 that. Questions posed to the issue tracker will be closed.
 
 When reporting an issue, please include the following details: