Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Cake to v4.4.17 and associated updates (NOJIRA)
Benn Oshrin committed Sep 26, 2023
1 parent 1d81a94 commit 19dd41d
Showing 1,752 changed files with 46,345 additions and 44,878 deletions.
760 changes: 372 additions & 388 deletions app/composer.lock
View file

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion app/vendor/bin/jsonlint
View file
@@ -108,7 +108,10 @@ if (PHP_VERSION_ID < 80000) {
}
}

if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
if (
(function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
|| (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
) {
include("phpvfscomposer://" . __DIR__ . '/..'.'/seld/jsonlint/bin/jsonlint');
exit(0);
}
4 changes: 2 additions & 2 deletions app/vendor/cakephp/cakephp-codesniffer/.github/workflows/ci.yml
View file
@@ -10,7 +10,7 @@ on:

jobs:
testsuite:
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
@@ -69,7 +69,7 @@ jobs:

cs-stan:
name: Coding Standard & Static Analysis
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2
2 changes: 1 addition & 1 deletion app/vendor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/Commenting/DocBlockAlignmentSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 1.0.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

namespace CakePHP\Sniffs\Commenting;
4 changes: 2 additions & 2 deletions app/vendor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/Commenting/FunctionCommentSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.24
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace CakePHP\Sniffs\Commenting;

@@ -46,7 +46,7 @@
* @copyright 2006-2014 Squiz Pty Ltd (ABN 77 084 670 600)
* @license https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
* @version Release: @package_version@
* @link http://pear.php.net/package/PHP_CodeSniffer
* @link https://pear.php.net/package/PHP_CodeSniffer
*/
class FunctionCommentSniff implements Sniff
{
2 changes: 1 addition & 1 deletion app/vendor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/Commenting/InheritDocSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 4.1.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

namespace CakePHP\Sniffs\Commenting;
2 changes: 1 addition & 1 deletion ...r/cakephp/cakephp-codesniffer/CakePHP/Sniffs/ControlStructures/ControlStructuresSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.14
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

/**
2 changes: 1 addition & 1 deletion ...r/cakephp/cakephp-codesniffer/CakePHP/Sniffs/ControlStructures/ElseIfDeclarationSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.14
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

namespace CakePHP\Sniffs\ControlStructures;
2 changes: 1 addition & 1 deletion ...dor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/ControlStructures/WhileStructuresSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.14
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

namespace CakePHP\Sniffs\ControlStructures;
4 changes: 2 additions & 2 deletions ...ndor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/Formatting/BlankLineBeforeReturnSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 2.1.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

namespace CakePHP\Sniffs\Formatting;
@@ -22,7 +22,7 @@
* Throws errors if there's no blank line before return statements.
*
* @author Authors <Symfony2-coding-standard@escapestudios.github.com>
* @license http://spdx.org/licenses/MIT MIT License
* @license https://spdx.org/licenses/MIT MIT License
* @link https://github.com/escapestudios/Symfony2-coding-standard
*/
class BlankLineBeforeReturnSniff implements Sniff
2 changes: 1 addition & 1 deletion app/vendor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/Functions/ClosureDeclarationSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.28
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/
namespace CakePHP\Sniffs\Functions;

2 changes: 1 addition & 1 deletion ...r/cakephp/cakephp-codesniffer/CakePHP/Sniffs/NamingConventions/ValidFunctionNameSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.1
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

/**
2 changes: 1 addition & 1 deletion ...ndor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/NamingConventions/ValidTraitNameSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.10
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

/**
2 changes: 1 addition & 1 deletion app/vendor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/PHP/DisallowShortOpenTagSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.14
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

namespace CakePHP\Sniffs\PHP;
4 changes: 2 additions & 2 deletions app/vendor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/WhiteSpace/EmptyLinesSniff.php
View file
@@ -10,14 +10,14 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 2.4.0
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

/**
* Ensures that not more than one blank line occurs
*
* @author Mark Scherer
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

namespace CakePHP\Sniffs\WhiteSpace;
2 changes: 1 addition & 1 deletion ...vendor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/WhiteSpace/FunctionCallSpacingSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.12
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

/**
2 changes: 1 addition & 1 deletion app/vendor/cakephp/cakephp-codesniffer/CakePHP/Sniffs/WhiteSpace/TabAndSpaceSniff.php
View file
@@ -10,7 +10,7 @@
* @copyright Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
* @link https://github.com/cakephp/cakephp-codesniffer
* @since CakePHP CodeSniffer 0.1.11
* @license http://www.opensource.org/licenses/mit-license.php MIT License
* @license https://www.opensource.org/licenses/mit-license.php MIT License
*/

/**
3 changes: 0 additions & 3 deletions app/vendor/cakephp/cakephp-codesniffer/CakePHP/ruleset.xml
View file
@@ -154,9 +154,6 @@
<property name="linesCountBeforeDeclare" value="0"/>
<property name="linesCountAfterDeclare" value="1"/>
<property name="spacesCountAroundEqualsSign" value="0"/>
<!-- Property names used in slevomat/coding-standard v6 -->
<property name="newlinesCountAfterDeclare" value="2"/>
<property name="newlinesCountBetweenOpenTagAndDeclare" value="1"/>
</properties>
<exclude-pattern>*/config/*</exclude-pattern>
<exclude-pattern>*/templates/*</exclude-pattern>
2 changes: 1 addition & 1 deletion app/vendor/cakephp/cakephp-codesniffer/composer.json
View file
@@ -19,7 +19,7 @@
},
"require": {
"php": ">=7.2.0",
"slevomat/coding-standard": "^6.3.6 || ^7.0 || ^8.0",
"slevomat/coding-standard": "^7.0 || ^8.0",
"squizlabs/php_codesniffer": "^3.6"
},
"require-dev": {
11 changes: 5 additions & 6 deletions app/vendor/cakephp/cakephp-codesniffer/docs/README.md
View file
@@ -1,6 +1,6 @@
# CakePHP ruleset

The CakePHP standard contains 136 sniffs
The CakePHP standard contains 135 sniffs

CakePHP (19 sniffs)
-------------------
@@ -52,22 +52,22 @@ Generic (25 sniffs)
- Generic.WhiteSpace.IncrementDecrementSpacing
- Generic.WhiteSpace.ScopeIndent

PEAR (2 sniffs)
PEAR (1 sniff)
---------------
- PEAR.Functions.ValidDefaultValue
- PEAR.NamingConventions.ValidFunctionName

PSR1 (3 sniffs)
---------------
- PSR1.Classes.ClassDeclaration
- PSR1.Files.SideEffects
- PSR1.Methods.CamelCapsMethodName

PSR12 (16 sniffs)
PSR12 (17 sniffs)
-----------------
- PSR12.Classes.AnonClassDeclaration
- PSR12.Classes.ClassInstantiation
- PSR12.Classes.ClosingBrace
- PSR12.Classes.OpeningBraceSpace
- PSR12.ControlStructures.BooleanOperatorPlacement
- PSR12.ControlStructures.ControlStructureSpacing
- PSR12.Files.DeclareStatement
@@ -129,7 +129,7 @@ SlevomatCodingStandard (32 sniffs)
- SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing
- SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable

Squiz (29 sniffs)
Squiz (28 sniffs)
-----------------
- Squiz.Arrays.ArrayBracketSpacing
- Squiz.Classes.ClassFileName
@@ -144,7 +144,6 @@ Squiz (29 sniffs)
- Squiz.Functions.FunctionDeclarationArgumentSpacing
- Squiz.Functions.LowercaseFunctionKeywords
- Squiz.Functions.MultiLineFunctionDeclaration
- Squiz.NamingConventions.ValidFunctionName
- Squiz.Operators.ValidLogicalOperators
- Squiz.PHP.DisallowSizeFunctionsInLoops
- Squiz.PHP.Eval
2 changes: 1 addition & 1 deletion app/vendor/cakephp/cakephp/VERSION.txt
View file
@@ -16,4 +16,4 @@
// @license https://opensource.org/licenses/mit-license.php MIT License
// +--------------------------------------------------------------------------------------------+ //
////////////////////////////////////////////////////////////////////////////////////////////////////
4.4.12
4.4.17
2 changes: 1 addition & 1 deletion app/vendor/cakephp/cakephp/composer.json
View file
@@ -64,7 +64,7 @@
"suggest": {
"ext-curl": "To enable more efficient network calls in Http\\Client.",
"ext-openssl": "To use Security::encrypt() or have secure CSRF token generation.",
"lib-ICU": "The intl PHP library, to use Text::transliterate() or Text::slug()",
"lib-ICU": "To use locale-aware features in the I18n and Database packages",
"paragonie/csp-builder": "CSP builder, to use the CSP Middleware"
},
"provide": {

0 comments on commit 19dd41d

Please sign in to comment.