Skip to content
This repository was archived by the owner on Mar 5, 2022. It is now read-only.

Commit 35e2155

Browse files
committed
Making the plugin CakePHP 3.6 compatible
1 parent 0a56dbc commit 35e2155

13 files changed

+793
-441
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
root = true
55

66
[*]
7-
indent_style = spaces
7+
indent_style = space
88
end_of_line = lf
99
insert_final_newline = true
1010
trim_trailing_whitespace = true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ Icon
55

66
Vendor/*
77
/.idea
8+
/coverage/*

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
language: php
22

33
php:
4-
- 5.6
54
- 7.0
5+
- 7.1
66

77
matrix:
8-
allow_failures:
9-
- php: 7.0
10-
118
fast_finish: true
129

1310
include:
14-
- php: 5.6
11+
- php: 7.1
1512
env:
1613
- COVERALLS=1
1714

README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@ The plugin includes a trait, a view helper, a behavior and a shell to clean your
1313

1414
---
1515

16-
**For CakePHP 2.x use the 1.x version or branch!**
16+
* For **CakePHP 2.x** use the 1.x version or branch.
17+
* For **CakePHP <=3.5** use the 2.0 version or branch.
1718

1819
Documentation
1920
-------------
@@ -25,13 +26,6 @@ Support
2526

2627
For support and feature request, please visit the [Support Site](https://github.com/burzum/cakephp-html-purifier/issues).
2728

28-
Branch strategy
29-
-------------
30-
31-
* The **master** branch holds the `STABLE` latest version of the plugin.
32-
* The **2.0** branch is `UNSTABLE` and used to test new features before releasing them.
33-
* Only **hot fixes** are accepted against the master branch.
34-
3529
Contributing to this Plugin
3630
---------------------------
3731

@@ -43,6 +37,6 @@ Please feel free to contribute to the plugin with new issues, requests, unit tes
4337
License
4438
-------
4539

46-
Copyright 2012 - 2016 Florian Krämer
40+
Copyright 2012 - 2018 Florian Krämer
4741

4842
Licensed under the [MIT](http://www.opensource.org/licenses/mit-license.php) License. Redistributions of the source code included in this repository must retain the copyright notice found in each file.

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
],
1414
"minimum-stability": "stable",
1515
"require": {
16-
"cakephp/cakephp": "3.*",
17-
"ezyang/htmlpurifier": "*"
16+
"cakephp/cakephp": "^3.6",
17+
"ezyang/htmlpurifier": "*",
18+
"cakephp/cakephp-codesniffer": "^3.0"
1819
},
1920
"require-dev": {
20-
"phpunit/phpunit": "5.*"
21+
"phpunit/phpunit": "6.*"
2122
},
2223
"autoload": {
2324
"psr-4": {

0 commit comments

Comments
 (0)