Merge branch 'Asgraf-patch-1'

Author: Holt59

.travis.yml

@@ -14,19 +14,19 @@ env:
 matrix:
   include:
     - php: 5.6
-      env: CAKEPHP_VERSION=3.4.*
+      env: CAKEPHP_VERSION=3.5.0
     - php: 5.6
       env: CAKEPHP_VERSION=3.5.*
     - php: 7.0
-      env: CAKEPHP_VERSION=3.4.*
+      env: CAKEPHP_VERSION=3.5.0
     - php: 7.0
       env: CAKEPHP_VERSION=3.5.*
     - php: 7.1
-      env: CAKEPHP_VERSION=3.4.*
+      env: CAKEPHP_VERSION=3.5.0
     - php: 7.1
       env: CAKEPHP_VERSION=3.5.*
     - php: 7.2
-      env: CAKEPHP_VERSION=3.4.*
+      env: CAKEPHP_VERSION=3.5.0
     - php: 7.2
       env: CAKEPHP_VERSION=3.5.*
 

README.md

@@ -44,9 +44,9 @@ The full plugin documentation is available at https://holt59.github.io/cakephp3-
 
 | Version | Bootstrap version | CakePHP version | Information |
 |---------|-------------------|-----------------|-------------|
-| [master](https://github.com/Holt59/cakephp3-bootstrap-helpers/tree/master) / [3.1.2](https://github.com/Holt59/cakephp3-bootstrap-helpers/tree/v3.1.2) | 3 | >= 3.4.0 | Current active branch. |
-| > 3.0.5, <= [3.1.1](https://github.com/Holt59/cakephp3-bootstrap-helpers/tree/v3.1.1) | 3 | >= 3.2.3, < 3.4.0 | Not actively maintained (open issue(s) if necessary). |
-| <= 3.0.5 | 3 | >= 3.0.0 | Deprecated. |
+| [master](https://github.com/Holt59/cakephp3-bootstrap-helpers/tree/master) | 3 | >= 3.5.0 | Current active branch. |
+| [3.1.2](https://github.com/Holt59/cakephp3-bootstrap-helpers/tree/v3.1.2) | 3 | >= 3.4.0, < 3.5.0 | Not actively maintained (open issue(s) if necessary). |
+| <= [3.1.1](https://github.com/Holt59/cakephp3-bootstrap-helpers/tree/v3.1.1) | 3 | < 3.4.0 | Deprecated. |
 | [4.0.1-alpha](https://github.com/Holt59/cakephp3-bootstrap-helpers/tree/4.0.1-alpha) | 4 | >= 3.4.0 | Alpha, not all helpers are available. |
 
 #### Contributing

composer.json

@@ -6,7 +6,7 @@
     "type": "cakephp-plugin",
     "require": {
         "php": ">=5.5.9",
-        "cakephp/cakephp": ">=3.4.0"
+        "cakephp/cakephp": ">=3.5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "<6.0",

src/View/Helper/FlashHelper.php

@@ -37,7 +37,7 @@ public function render($key = 'flash', array $options = []) {
             return;
         }
 
-        $flash = $this->request->session()->read("Flash.$key");
+        $flash = $this->request->getSession()->read("Flash.$key");
         if (!is_array($flash)) {
             throw new \UnexpectedValueException(sprintf(
                 'Value for flash setting key "%s" must be an array.',
@@ -49,7 +49,7 @@ public function render($key = 'flash', array $options = []) {
                 $message['element'] = 'Bootstrap.'.$message['element'];
             }
         }
-        $this->request->session()->write("Flash.$key", $flash);
+        $this->request->getSession()->write("Flash.$key", $flash);
 
         return parent::render($key, $options);
     }