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

Commit

Permalink
Making the plugin CakePHP 3.6 compatible
Browse files Browse the repository at this point in the history
  • Loading branch information
burzum committed May 14, 2018
1 parent 0a56dbc commit 35e2155
Show file tree
Hide file tree
Showing 13 changed files with 793 additions and 441 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
root = true

[*]
indent_style = spaces
indent_style = space
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Icon

Vendor/*
/.idea
/coverage/*
7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
language: php

php:
- 5.6
- 7.0
- 7.1

matrix:
allow_failures:
- php: 7.0

fast_finish: true

include:
- php: 5.6
- php: 7.1
env:
- COVERALLS=1

Expand Down
12 changes: 3 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ The plugin includes a trait, a view helper, a behavior and a shell to clean your

---

**For CakePHP 2.x use the 1.x version or branch!**
* For **CakePHP 2.x** use the 1.x version or branch.
* For **CakePHP <=3.5** use the 2.0 version or branch.

Documentation
-------------
Expand All @@ -25,13 +26,6 @@ Support

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

Branch strategy
-------------

* The **master** branch holds the `STABLE` latest version of the plugin.
* The **2.0** branch is `UNSTABLE` and used to test new features before releasing them.
* Only **hot fixes** are accepted against the master branch.

Contributing to this Plugin
---------------------------

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

Copyright 2012 - 2016 Florian Krämer
Copyright 2012 - 2018 Florian Krämer

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.
7 changes: 4 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,12 @@
],
"minimum-stability": "stable",
"require": {
"cakephp/cakephp": "3.*",
"ezyang/htmlpurifier": "*"
"cakephp/cakephp": "^3.6",
"ezyang/htmlpurifier": "*",
"cakephp/cakephp-codesniffer": "^3.0"
},
"require-dev": {
"phpunit/phpunit": "5.*"
"phpunit/phpunit": "6.*"
},
"autoload": {
"psr-4": {
Expand Down
Loading

0 comments on commit 35e2155

Please sign in to comment.