brian/wp-plugin-boilerplate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

updating to resolve git conflicts

Browse Source
This commit is contained in:
Brian
2023-03-09 13:08:18 -07:00
parent d21eb055d3 7370a1e7e2
commit 53571362b7
11 changed files with 991 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

342
composer.lock generated
View File

@@ -4,36 +4,35 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "a1d2fa14a3a85a873ef48e5fa182ef12",
"content-hash": "6fa6e29e5c44798ae9959277f4a2a98a",
"packages": [
{
"name": "eftec/bladeone",
"version": "4.8",
"version": "3.52",
"source": {
"type": "git",
"url": "https://github.com/EFTEC/BladeOne.git",
"reference": "26b79fc337a7c584c7d222dc1dbc6d34771d0394"
"reference": "a19bf66917de0b29836983db87a455a4f6e32148"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/EFTEC/BladeOne/zipball/26b79fc337a7c584c7d222dc1dbc6d34771d0394",
"reference": "26b79fc337a7c584c7d222dc1dbc6d34771d0394",
"url": "https://api.github.com/repos/EFTEC/BladeOne/zipball/a19bf66917de0b29836983db87a455a4f6e32148",
"reference": "a19bf66917de0b29836983db87a455a4f6e32148",
"shasum": ""
},
"require": {
"ext-json": "*",
"php": ">=7.2.5"
"php": ">=5.6"
},
"require-dev": {
"phpunit/phpunit": "^8.5.23"
"friendsofphp/php-cs-fixer": "^2.16.1",
"phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.5.4"
},
"suggest": {
"eftec/bladeonehtml": "Extension to create forms",
"ext-mbstring": "This extension is used if it's active"
},
"bin": [
"lib/bladeonecli"
],
"type": "library",
"autoload": {
"psr-4": {
@@ -61,9 +60,9 @@
],
"support": {
"issues": "https://github.com/EFTEC/BladeOne/issues",
"source": "https://github.com/EFTEC/BladeOne/tree/4.8"
"source": "https://github.com/EFTEC/BladeOne/tree/3.52"
},
"time": "2023-01-12T01:22:51+00:00"
"time": "2021-04-17T13:49:01+00:00"
}
],
"packages-dev": [
@@ -379,6 +378,153 @@
},
"time": "2022-02-21T12:50:22+00:00"
},
{
"name": "php-stubs/wordpress-stubs",
"version": "v6.1.1",
"source": {
"type": "git",
"url": "https://github.com/php-stubs/wordpress-stubs.git",
"reference": "601c429ba8d91ef50a2a1bec05a7cd38b88064ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-stubs/wordpress-stubs/zipball/601c429ba8d91ef50a2a1bec05a7cd38b88064ff",
"reference": "601c429ba8d91ef50a2a1bec05a7cd38b88064ff",
"shasum": ""
},
"require-dev": {
"nikic/php-parser": "< 4.12.0",
"php": "~7.3 || ~8.0",
"php-stubs/generator": "^0.8.3",
"phpdocumentor/reflection-docblock": "^5.3",
"phpstan/phpstan": "^1.2"
},
"suggest": {
"paragonie/sodium_compat": "Pure PHP implementation of libsodium",
"symfony/polyfill-php73": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
"szepeviktor/phpstan-wordpress": "WordPress extensions for PHPStan"
},
"type": "library",
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "WordPress function and class declaration stubs for static analysis.",
"homepage": "https://github.com/php-stubs/wordpress-stubs",
"keywords": [
"PHPStan",
"static analysis",
"wordpress"
],
"support": {
"issues": "https://github.com/php-stubs/wordpress-stubs/issues",
"source": "https://github.com/php-stubs/wordpress-stubs/tree/v6.1.1"
},
"time": "2023-02-09T11:10:35+00:00"
},
{
"name": "phpstan/extension-installer",
"version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/extension-installer.git",
"reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
"reference": "f06dbb052ddc394e7896fcd1cfcd533f9f6ace40",
"shasum": ""
},
"require": {
"composer-plugin-api": "^2.0",
"php": "^7.2 || ^8.0",
"phpstan/phpstan": "^1.8.0"
},
"require-dev": {
"composer/composer": "^2.0",
"php-parallel-lint/php-parallel-lint": "^1.2.0",
"phpstan/phpstan-strict-rules": "^0.11 || ^0.12 || ^1.0"
},
"type": "composer-plugin",
"extra": {
"class": "PHPStan\\ExtensionInstaller\\Plugin"
},
"autoload": {
"psr-4": {
"PHPStan\\ExtensionInstaller\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "Composer plugin for automatic installation of PHPStan extensions",
"support": {
"issues": "https://github.com/phpstan/extension-installer/issues",
"source": "https://github.com/phpstan/extension-installer/tree/1.2.0"
},
"time": "2022-10-17T12:59:16+00:00"
},
{
"name": "phpstan/phpstan",
"version": "1.10.6",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
"reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
"shasum": ""
},
"require": {
"php": "^7.2|^8.0"
},
"conflict": {
"phpstan/phpstan-shim": "*"
},
"bin": [
"phpstan",
"phpstan.phar"
],
"type": "library",
"autoload": {
"files": [
"bootstrap.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "PHPStan - PHP Static Analysis Tool",
"keywords": [
"dev",
"static analysis"
],
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/1.10.6"
},
"funding": [
{
"url": "https://github.com/ondrejmirtes",
"type": "github"
},
{
"url": "https://github.com/phpstan",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/phpstan/phpstan",
"type": "tidelift"
}
],
"time": "2023-03-09T16:55:12+00:00"
},
{
"name": "rmccue/requests",
"version": "v1.8.1",
@@ -561,20 +707,169 @@
"time": "2023-02-16T09:57:23+00:00"
},
{
"name": "wp-cli/i18n-command",
"version": "v2.2.13",
"name": "symfony/polyfill-php73",
"version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/wp-cli/i18n-command.git",
"reference": "77ece9e2c914bb56ea72b9ee9f00556dece07b3f"
"url": "https://github.com/symfony/polyfill-php73.git",
"reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/77ece9e2c914bb56ea72b9ee9f00556dece07b3f",
"reference": "77ece9e2c914bb56ea72b9ee9f00556dece07b3f",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
"reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
"shasum": ""
},
"require": {
"php": ">=7.1"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
"url": "https://github.com/symfony/polyfill"
}
},
"autoload": {
"files": [
"bootstrap.php"
],
"psr-4": {
"Symfony\\Polyfill\\Php73\\": ""
},
"classmap": [
"Resources/stubs"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Nicolas Grekas",
"email": "p@tchwork.com"
},
{
"name": "Symfony Community",
"homepage": "https://symfony.com/contributors"
}
],
"description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
"homepage": "https://symfony.com",
"keywords": [
"compatibility",
"polyfill",
"portable",
"shim"
],
"support": {
"source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0"
},
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2022-11-03T14:55:06+00:00"
},
{
"name": "szepeviktor/phpstan-wordpress",
"version": "v1.1.7",
"source": {
"type": "git",
"url": "https://github.com/szepeviktor/phpstan-wordpress.git",
"reference": "979dcb81a01942b576b9fbf72dcb9515c57a4aa8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/szepeviktor/phpstan-wordpress/zipball/979dcb81a01942b576b9fbf72dcb9515c57a4aa8",
"reference": "979dcb81a01942b576b9fbf72dcb9515c57a4aa8",
"shasum": ""
},
"require": {
"php": "^7.2 || ^8.0",
"php-stubs/wordpress-stubs": "^4.7 || ^5.0 || ^6.0",
"phpstan/phpstan": "^1.8.7",
"symfony/polyfill-php73": "^1.12.0"
},
"require-dev": {
"composer/composer": "^2.1.14",
"dealerdirect/phpcodesniffer-composer-installer": "^1.0",
"php-parallel-lint/php-parallel-lint": "^1.1",
"phpstan/phpstan-strict-rules": "^1.2",
"phpunit/phpunit": "^8.0 || ^9.0",
"szepeviktor/phpcs-psr-12-neutron-hybrid-ruleset": "^0.8"
},
"type": "phpstan-extension",
"extra": {
"phpstan": {
"includes": [
"extension.neon"
]
}
},
"autoload": {
"psr-4": {
"SzepeViktor\\PHPStan\\WordPress\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"description": "WordPress extensions for PHPStan",
"keywords": [
"PHPStan",
"code analyse",
"code analysis",
"static analysis",
"wordpress"
],
"support": {
"issues": "https://github.com/szepeviktor/phpstan-wordpress/issues",
"source": "https://github.com/szepeviktor/phpstan-wordpress/tree/v1.1.7"
},
"funding": [
{
"url": "https://www.paypal.me/szepeviktor",
"type": "custom"
},
{
"url": "https://github.com/szepeviktor",
"type": "github"
}
],
"time": "2023-02-04T13:10:27+00:00"
},
{
"name": "wp-cli/i18n-command",
"version": "v2.4.2",
"source": {
"type": "git",
"url": "https://github.com/wp-cli/i18n-command.git",
"reference": "43d5cf8968dbddf90907083ad048f12be5ca3d43"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/43d5cf8968dbddf90907083ad048f12be5ca3d43",
"reference": "43d5cf8968dbddf90907083ad048f12be5ca3d43",
"shasum": ""
},
"require": {
"eftec/bladeone": "3.52",
"gettext/gettext": "^4.8",
"mck89/peast": "^1.13.11",
"wp-cli/wp-cli": "^2.5"
@@ -584,6 +879,7 @@
"wp-cli/wp-cli-tests": "^3.1"
},
"suggest": {
"ext-json": "Used for reading and generating JSON translation files",
"ext-mbstring": "Used for calculating include/exclude matches in code extraction"
},
"type": "wp-cli-package",
@@ -595,7 +891,9 @@
"commands": [
"i18n",
"i18n make-pot",
"i18n make-json"
"i18n make-json",
"i18n make-mo",
"i18n update-po"
]
},
"autoload": {
@@ -620,9 +918,9 @@
"homepage": "https://github.com/wp-cli/i18n-command",
"support": {
"issues": "https://github.com/wp-cli/i18n-command/issues",
"source": "https://github.com/wp-cli/i18n-command/tree/v2.2.13"
"source": "https://github.com/wp-cli/i18n-command/tree/v2.4.2"
},
"time": "2022-01-13T01:40:51+00:00"
"time": "2023-02-17T18:14:41+00:00"
},
{
"name": "wp-cli/mustangostang-spyc",
@@ -867,7 +1165,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": ">=8.0.0"
"php": ">=8.0.2"
},
"platform-dev": [],
"plugin-api-version": "2.3.0"