Merge branch 'release/3.1.2'

zendframework · Dec 10, 2019 · 8ec4660 · 8ec4660
2 parents 04f7a5f + 6dfd5df
commit 8ec4660
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 12 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.
 
-## 3.1.2 - TBD
+## 3.1.2 - 2019-12-10
 
 ### Added
 

diff --git a/LICENSE.md b/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,

diff --git a/composer.json b/composer.json
@@ -13,7 +13,7 @@
         "issues": "https://github.com/zendframework/zend-di/issues",
         "source": "https://github.com/zendframework/zend-di",
         "rss": "https://github.com/zendframework/zend-di/releases.atom",
-        "slack": "https://zendframework-slack.herokuapp.com",
+        "chat": "https://zendframework-slack.herokuapp.com",
         "forum": "https://discourse.zendframework.com/c/questions/components"
     },
     "require": {
@@ -51,8 +51,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1-dev",
-            "dev-develop": "3.2-dev"
+            "dev-master": "3.1.x-dev",
+            "dev-develop": "3.2.x-dev"
         },
         "zf": {
             "component": "Zend\\Di",

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-di/issues?q=is%3Aopen) or [closed](https://github.com/zendframework/zend-di/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-di/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:

diff --git a/docs/book/cookbook/aot-guide.md b/docs/book/cookbook/aot-guide.md
@@ -52,12 +52,12 @@ $ composer require zendframework/zend-di
 > $ composer require zendframework/zend-di:^3.0
 > ```
 >
-> This approach will also notify you if there are conflicts with installing v3. 
+> This approach will also notify you if there are conflicts with installing v3.
 
 > ### Additional requirements for version 3.0.x
 >
 > Before version 3.1, `zendframework/zend-code` was required to be
-> added individually to your project for generating AoT code. Since version 
+> added individually to your project for generating AoT code. Since version
 > 3.1 this is no longer necessary.
 
 The component installer should ask you where to inject the config provider. Pick