-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from Erwane/cakephp5-compatibility
Cakephp5 compatibility
- Loading branch information
Showing
17 changed files
with
179 additions
and
326 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,18 @@ | ||
| # editorconfig.org | ||
| ; This file is for unifying the coding style for different editors and IDEs. | ||
| ; More information at http://editorconfig.org | ||
|
|
||
| root = true | ||
|
|
||
| [*] | ||
| indent_style = space | ||
| charset = utf-8 | ||
| indent_size = 4 | ||
| indent_style = space | ||
| end_of_line = lf | ||
| trim_trailing_whitespace = true | ||
| insert_final_newline = true | ||
| trim_trailing_whitespace = true | ||
|
|
||
| [*.yml] | ||
| indent_size = 2 | ||
|
|
||
| [*.md] | ||
| trim_trailing_whitespace = false | ||
|
|
||
| [*.{yaml,yml}] | ||
| indent_size = 2 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,49 +1,10 @@ | ||
| # Define the line ending behavior of the different file extensions | ||
| # Set default behaviour, in case users don't have core.autocrlf set. | ||
| * text=auto | ||
| * text eol=lf | ||
|
|
||
| # Explicitly declare text files we want to always be normalized and converted | ||
| # to native line endings on checkout. | ||
| *.php text | ||
| *.default text | ||
| *.ctp text | ||
| *.sql text | ||
| *.md text | ||
| *.po text | ||
| *.js text | ||
| *.css text | ||
| *.ini text | ||
| *.properties text | ||
| *.txt text | ||
| *.xml text | ||
| *.svg text | ||
| *.yml text | ||
| .htaccess text | ||
|
|
||
| # Declare files that will always have CRLF line endings on checkout. | ||
| *.bat eol=crlf | ||
|
|
||
| # Declare files that will always have LF line endings on checkout. | ||
| *.pem eol=lf | ||
|
|
||
| # Denote all files that are truly binary and should not be modified. | ||
| *.png binary | ||
| *.jpg binary | ||
| *.gif binary | ||
| *.ico binary | ||
| *.mo binary | ||
| *.pdf binary | ||
| *.phar binary | ||
| *.woff binary | ||
| *.woff2 binary | ||
| *.ttf binary | ||
| *.otf binary | ||
| *.eot binary | ||
| *.gz binary | ||
| *.bz2 binary | ||
| *.7z binary | ||
| *.zip binary | ||
| *.docx binary | ||
| *.xlsx binary | ||
| *.mmdb binary | ||
| /.github/ export-ignore | ||
| /docs/ export-ignore | ||
| /tests/ export-ignore | ||
| .editorconfig export-ignore | ||
| .gitattributes export-ignore | ||
| .gitignore export-ignore | ||
| .composer.lock export-ignore | ||
| /grumphp.yml export-ignore | ||
| /phpcs.xml export-ignore | ||
| /phpunit.xml.dist export-ignore |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,10 +9,25 @@ | |
| "license": "MIT", | ||
| "authors": [ | ||
| { | ||
| "name": "erwane", | ||
| "email": "[email protected]" | ||
| "name": "Erwane Breton", | ||
| "email": "[email protected]", | ||
| "homepage": "https://erwane-breton.fr" | ||
| } | ||
| ], | ||
| "support": { | ||
| "issues": "https://github.com/Erwane/cakephp-hcaptcha/issues", | ||
| "source": "https://github.com/Erwane/cakephp-hcaptcha" | ||
| }, | ||
| "require": { | ||
| "php": "^8.1", | ||
| "cakephp/cakephp": "^5.0" | ||
| }, | ||
| "require-dev": { | ||
| "cakephp/cakephp-codesniffer": "^5.0", | ||
| "php-parallel-lint/php-parallel-lint": "^1.3", | ||
| "phpro/grumphp": "^2.0", | ||
| "phpunit/phpunit": "^10.5.5 || ^11.1.3" | ||
| }, | ||
| "autoload": { | ||
| "psr-4": { | ||
| "HCaptcha\\": "src/" | ||
|
|
@@ -23,22 +38,13 @@ | |
| "HCaptcha\\Test\\": "tests/" | ||
| } | ||
| }, | ||
| "require": { | ||
| "php": "^7.2 | ^8.0", | ||
| "ext-intl": "*", | ||
| "cakephp/cakephp": "^4.0" | ||
| }, | ||
| "require-dev": { | ||
| "cakephp/cakephp-codesniffer": "^4.0", | ||
| "php-parallel-lint/php-parallel-lint": "^1.0", | ||
| "phpro/grumphp": "^v0.19 | ^v1.0", | ||
| "phpunit/phpunit": "^8.0 | ^9.0" | ||
| }, | ||
| "scripts": { | ||
| "cscheck": "vendor/bin/phpcs -p src/ tests/", | ||
| "csfix": "vendor/bin/phpcbf src/ tests/" | ||
| "csfix": "vendor/bin/phpcbf -p src/ tests/" | ||
| }, | ||
| "config": { | ||
| "platform-check": true, | ||
| "sort-packages": true, | ||
| "allow-plugins": { | ||
| "dealerdirect/phpcodesniffer-composer-installer": true, | ||
| "phpro/grumphp": true | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" | ||
| bootstrap="tests/bootstrap.php" | ||
| colors="true" | ||
| backupGlobals="true" | ||
| cacheDirectory=".phpunit.cache" | ||
| stopOnFailure="false"> | ||
|
|
||
| <php> | ||
| <ini name="memory_limit" value="-1"/> | ||
| <ini name="error_reporting" value="32767"/> | ||
| <const name="PHPUNIT_TESTSUITE" value="true"/> | ||
| </php> | ||
|
|
||
| <extensions> | ||
| <bootstrap class="Cake\TestSuite\Fixture\Extension\PHPUnitExtension"/> | ||
| </extensions> | ||
|
|
||
| <testsuites> | ||
| <testsuite name="default"> | ||
| <directory>tests/TestCase</directory> | ||
| </testsuite> | ||
| </testsuites> | ||
|
|
||
| <source> | ||
| <include> | ||
| <directory suffix=".php">src/</directory> | ||
| </include> | ||
| </source> | ||
| </phpunit> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.