Merge branch 'master' of github.com:dereuromark/cakephp-tools into fix-requestdata

.travis.yml

@@ -34,17 +34,13 @@ matrix:
 
 before_script:
   - if [[ $PREFER_LOWEST != 1 ]]; then composer install --prefer-source --no-interaction ; fi
-  - if [[ $PREFER_LOWEST == 1 ]]; then composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable ; fi
+  - if [[ $PREFER_LOWEST == 1 ]]; then composer update --prefer-lowest --prefer-stable --prefer-dist --no-interaction ; fi
 
-  - if [[ $CHECKS != 1 ]]; then composer require phpunit/phpunit:"^5.7.14|^6.0"; fi
+  - if [[ $CHECKS != 1 ]]; then composer require --dev phpunit/phpunit:"^5.7.14|^6.0"; fi
 
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'CREATE DATABASE cakephp_test;'; fi"
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'CREATE DATABASE cakephp_test;' -U postgres; fi"
 
-  - phpenv rehash
-  - set +H
-  - cp phpunit.xml.dist phpunit.xml
-
 script:
   - if [[ $DEFAULT == 1 ]]; then vendor/bin/phpunit; fi
 

README.md

@@ -2,7 +2,7 @@
 [![Build Status](https://api.travis-ci.org/dereuromark/cakephp-tools.svg?branch=master)](https://travis-ci.org/dereuromark/cakephp-tools)
 [![Coverage Status](https://codecov.io/gh/dereuromark/cakephp-tools/branch/master/graph/badge.svg)](https://codecov.io/gh/dereuromark/cakephp-tools)
 [![Latest Stable Version](https://poser.pugx.org/dereuromark/cakephp-tools/v/stable.svg)](https://packagist.org/packages/dereuromark/cakephp-tools)
-[![Minimum PHP Version](http://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg)](https://php.net/)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%205.6-8892BF.svg)](https://php.net/)
 [![License](https://poser.pugx.org/dereuromark/cakephp-tools/license.svg)](https://packagist.org/packages/dereuromark/cakephp-tools)
 [![Total Downloads](https://poser.pugx.org/dereuromark/cakephp-tools/d/total.svg)](https://packagist.org/packages/dereuromark/cakephp-tools)
 [![Coding Standards](https://img.shields.io/badge/cs-PSR--2--R-yellow.svg)](https://github.com/php-fig-rectified/fig-rectified-standards)

composer.json

@@ -9,7 +9,7 @@
 		{
 			"name": "Mark Scherer",
 			"role": "Author",
-			"homepage": "http://www.dereuromark.de"
+			"homepage": "https://www.dereuromark.de"
 		}
 	],
 	"require":{

docs/Behavior/Bitmasked.md

@@ -35,7 +35,7 @@ We first define values and make sure they follow the bitmask scheme:
 1, 2, 4, 8, 16, 32, 64, 128, ...
 ```
 
-I recommend using a DRY [enum approach](http://www.dereuromark.de/2010/06/24/static-enums-or-semihardcoded-attributes/), using your entity: 
+I recommend using a DRY [enum approach](https://www.dereuromark.de/2010/06/24/static-enums-or-semihardcoded-attributes/), using your entity: 
 ```php
 // A bunch of bool values
 const STATUS_ACTIVE = 1;
@@ -106,6 +106,6 @@ Note: This requires Search `^4.2.1`!
 
 ### Outview
 
-You can read more about how it began in [my blog post](http://www.dereuromark.de/2012/02/26/bitmasked-using-bitmasks-in-cakephp/).
+You can read more about how it began in [my blog post](https://www.dereuromark.de/2012/02/26/bitmasked-using-bitmasks-in-cakephp/).
 
 If you want to use a more DB or Config driven approach towards enums, you can also look into other plugins and CakePHP resources available, e.g. [this](https://github.com/CakeDC/Enum) implementation.

docs/Helper/Tree.md

@@ -116,4 +116,4 @@ The `treePath` is optional and needed for additional things like hiding unrelate
 
 ## Outview
 
-You can read some more tutorial like details in [my blog post](http://www.dereuromark.de/2013/02/17/cakephp-and-tree-structures/).
+You can read some more tutorial like details in [my blog post](https://www.dereuromark.de/2013/02/17/cakephp-and-tree-structures/).

src/Model/Behavior/BitmaskedBehavior.php

@@ -28,7 +28,7 @@ use Tools\Utility\Text;
  *
  * @author Mark Scherer
  * @license MIT
- * @link http://www.dereuromark.de/2012/02/26/bitmasked-using-bitmasks-in-cakephp/
+ * @link https://www.dereuromark.de/2012/02/26/bitmasked-using-bitmasks-in-cakephp/
  */
 class BitmaskedBehavior extends Behavior {
 

src/Model/Behavior/ConfirmableBehavior.php

@@ -15,7 +15,7 @@ use Cake\Validation\Validator;
  *
  * @link http://github.com/dereuromark/
  * @license http://opensource.org/licenses/mit-license.php MIT
- * @link http://www.dereuromark.de/2011/07/05/introducing-two-cakephp-behaviors/
+ * @link https://www.dereuromark.de/2011/07/05/introducing-two-cakephp-behaviors/
  */
 class ConfirmableBehavior extends Behavior {
 

src/Model/Behavior/PasswordableBehavior.php

@@ -32,7 +32,7 @@ if (!defined('PWD_MAX_LENGTH')) {
  * Usage: See docs
  *
  * @author Mark Scherer
- * @link http://www.dereuromark.de/2011/08/25/working-with-passwords-in-cakephp
+ * @link https://www.dereuromark.de/2011/08/25/working-with-passwords-in-cakephp
  * @license MIT
  */
 class PasswordableBehavior extends Behavior {

src/Model/Behavior/TypographicBehavior.php

@@ -32,7 +32,7 @@ use Cake\ORM\Behavior;
  * TODOS:
  * - respect primary and secondary quotations marks as well as alternatives
  *
- * @link http://www.dereuromark.de/2012/08/12/typographic-behavior-and-typography-helper/
+ * @link https://www.dereuromark.de/2012/08/12/typographic-behavior-and-typography-helper/
  * @link http://en.wikipedia.org/wiki/Non-English_usage_of_quotation_marks
  */
 class TypographicBehavior extends Behavior {

src/Model/Entity/Entity.php

@@ -10,7 +10,7 @@ class Entity extends CakeEntity {
 	 * The main method for any enumeration, should be called statically
 	 * Now also supports reordering/filtering
 	 *
-	 * @link http://www.dereuromark.de/2010/06/24/static-enums-or-semihardcoded-attributes/
+	 * @link https://www.dereuromark.de/2010/06/24/static-enums-or-semihardcoded-attributes/
 	 * @param string|array|null $value Integer or array of keys or NULL for complete array result
 	 * @param array $options Options
 	 * @param string|null $default Default value

src/View/Helper/TreeHelper.php

@@ -19,7 +19,7 @@ use Exception;
  *
  * @author Andy Dawson
  * @author Mark Scherer
- * @link http://www.dereuromark.de/2013/02/17/cakephp-and-tree-structures/
+ * @link https://www.dereuromark.de/2013/02/17/cakephp-and-tree-structures/
  */
 class TreeHelper extends Helper {
 

src/View/Helper/TypographyHelper.php

@@ -24,7 +24,7 @@ use Cake\View\Helper;
  * For Swiss, for example: "Some quote" might become «Some quote»
  * For German: "Some quote" might become „Some quote“
  *
- * @link http://www.dereuromark.de/2012/08/12/typographic-behavior-and-typography-helper/
+ * @link https://www.dereuromark.de/2012/08/12/typographic-behavior-and-typography-helper/
  */
 class TypographyHelper extends Helper {