Merge branch 'develop'

zendframework · Oct 19, 2019 · 3137ae1 · 3137ae1
2 parents 004fd91 + 7416f60
commit 3137ae1
Show file tree

Hide file tree

Showing 11 changed files with 151 additions and 225 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 cache:
@@ -53,6 +51,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,6 +2,34 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.2.0 - TBD
+
+### Added
+
+- [#24](https://github.com/zendframework/zend-mvc-plugin-flashmessenger/pull/24) adds support for PHP 7.3.
+
+- [#22](https://github.com/zendframework/zend-mvc-plugin-flashmessenger/pull/22) adds `Zend\Mvc\Plugin\FlashMessenger\View\HelperTrait`,
+  which can be used to provide IDE autocompletion for view helpers
+  provided by zend-mvc-plugin-flashmessenger. See
+  https://docs.zendframework.com/zend-mvc-plugin-flashmessenger/view-helper/#ide-auto-completion-in-templates
+  for more information.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- [#24](https://github.com/zendframework/zend-mvc-plugin-flashmessenger/pull/24) removes support for zend-stdlib v2 releases.
+
+### Fixed
+
+- Nothing.
+
 ## 1.1.1 - TBD
 
 ### Added

diff --git a/README.md b/README.md
@@ -6,12 +6,35 @@
 Flash messages [derive from Rails](http://api.rubyonrails.org/classes/ActionDispatch/Flash.html),
 and are used to expose messages from one action to the next, after which they
 are cleared; a typical use case is with
-[Post/Redirect/Get](https://docs.zendframework.com/zend-mvc-plugin-prg), where
+[Post/Redirect/Get](https://docs.zendframework.com/zend-mvc-plugin-prg/), where
 they are created in the `POST` handler, and then displayed by the `GET` handler
 to indicate success or failure to the end-user.
 
 This component provides a flash messenger controller plugin for
 [zend-mvc](https://docs.zendframework.com/zend-mvc/) versions 3.0 and up.
 
-- File issues at https://github.com/zendframework/zend-mvc-plugin-flashmessenger/issues
-- Documentation is at https://docs.zendframework.com/zend-mvc-plugin-flashmessenger/
+## Installation
+
+Run the following to install this library:
+
+```bash
+$ composer require zendframework/zend-mvc-plugin-flashmessenger
+```
+
+If you are using the [zend-component-installer](https://docs.zendframework.com/zend-component-installer/),
+you're done!
+
+If not, you will need to add the component as a module to your
+application. Add the entry `'Zend\Mvc\Plugin\FlashMessenger'` to
+your list of modules in your application configuration (typically
+one of `config/application.config.php` or `config/modules.config.php`).
+
+## Documentation
+
+Browse the documentation online at https://docs.zendframework.com/zend-mvc-plugin-flashmessenger/
+
+## Support
+
+* [Issues](https://github.com/zendframework/zend-mvc-plugin-flashmessenger/issues/)
+* [Chat](https://zendframework-slack.herokuapp.com/)
+* [Forum](https://discourse.zendframework.com/)
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "php": "^5.6 || ^7.0",
         "zendframework/zend-mvc": "^3.0",
         "zendframework/zend-session": "^2.8.5",
-        "zendframework/zend-stdlib": "^2.7 || ^3.0",
+        "zendframework/zend-stdlib": "^3.2.1",
         "zendframework/zend-view": "^2.10"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/docs/book/flash-messenger-plugin.md → docs/book/controller-plugin.md b/docs/book/flash-messenger-plugin.md → docs/book/controller-plugin.md
diff --git a/docs/book/index.html b/docs/book/index.html
diff --git a/docs/book/index.md b/docs/book/index.md
diff --git a/docs/book/index.md b/docs/book/index.md
@@ -0,0 +1,15 @@
+## Installation
+
+Install via composer:
+
+```bash
+$ composer require zendframework/zend-mvc-plugin-flashmessenger
+```
+
+If you are using the [zend-component-installer](https://docs.zendframework.com/zend-component-installer/),
+you're done!
+
+If not, you will need to add the component as a module to your
+application. Add the entry `'Zend\Mvc\Plugin\FlashMessenger'` to
+your list of modules in your application configuration (typically
+one of `config/application.config.php` or `config/modules.config.php`).