diff --git a/composer.lock b/composer.lock index fc21d66bd..7cfb0a69b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,11 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], -<<<<<<< HEAD - "content-hash": "bc62e37f7b1284f43f6ef6a37cefdc4e", -======= - "content-hash": "504e2218c0e04e1fa32d32ac8cf91ce3", ->>>>>>> bbPress connector test added + "content-hash": "1c03e2523af39d4774f40edf98977b82", "packages": [ { "name": "composer/installers", @@ -135,19 +131,6 @@ "zend", "zikula" ], -<<<<<<< HEAD -======= - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], ->>>>>>> bbPress connector test added "time": "2020-04-07T06:57:05+00:00" } ], @@ -206,24 +189,10 @@ "ssl", "tls" ], -<<<<<<< HEAD -======= - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], ->>>>>>> bbPress connector test added "time": "2020-04-08T08:27:21+00:00" }, { "name": "composer/composer", -<<<<<<< HEAD "version": "1.10.8", "source": { "type": "git", @@ -234,18 +203,6 @@ "type": "zip", "url": "https://api.github.com/repos/composer/composer/zipball/56e0e094478f30935e9128552188355fa9712291", "reference": "56e0e094478f30935e9128552188355fa9712291", -======= - "version": "1.10.7", - "source": { - "type": "git", - "url": "https://github.com/composer/composer.git", - "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/956608ea4f7de9e58c53dfb019d85ae62b193c39", - "reference": "956608ea4f7de9e58c53dfb019d85ae62b193c39", ->>>>>>> bbPress connector test added "shasum": "" }, "require": { @@ -264,16 +221,11 @@ "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0" }, "conflict": { - "symfony/console": "2.8.38", - "symfony/phpunit-bridge": "3.4.40" + "symfony/console": "2.8.38" }, "require-dev": { "phpspec/prophecy": "^1.10", -<<<<<<< HEAD "symfony/phpunit-bridge": "^4.2" -======= - "symfony/phpunit-bridge": "^3.4" ->>>>>>> bbPress connector test added }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -317,25 +269,7 @@ "dependency", "package" ], -<<<<<<< HEAD "time": "2020-06-24T19:23:30+00:00" -======= - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], - "time": "2020-06-03T08:03:56+00:00" ->>>>>>> bbPress connector test added }, { "name": "composer/semver", @@ -500,23 +434,6 @@ "Xdebug", "performance" ], -<<<<<<< HEAD -======= - "funding": [ - { - "url": "https://packagist.com", - "type": "custom" - }, - { - "url": "https://github.com/composer", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/composer/composer", - "type": "tidelift" - } - ], ->>>>>>> bbPress connector test added "time": "2020-06-04T11:16:35+00:00" }, { @@ -2731,19 +2648,6 @@ "parser", "validator" ], -<<<<<<< HEAD -======= - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/seld/jsonlint", - "type": "tidelift" - } - ], ->>>>>>> bbPress connector test added "time": "2020-04-30T19:05:18+00:00" }, { @@ -2903,23 +2807,6 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-05-22T10:56:48+00:00" }, { @@ -2992,23 +2879,6 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-05-30T18:58:05+00:00" }, { @@ -3065,23 +2935,6 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-05-22T18:25:20+00:00" }, { @@ -3132,23 +2985,6 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-05-30T17:48:24+00:00" }, { @@ -3198,23 +3034,6 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-02-14T07:34:21+00:00" }, { @@ -3277,23 +3096,6 @@ "polyfill", "portable" ], -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-06-06T08:46:27+00:00" }, { @@ -3360,23 +3162,6 @@ "portable", "shim" ], -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-06-06T08:46:27+00:00" }, { @@ -3440,23 +3225,6 @@ "portable", "shim" ], -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-06-06T08:46:27+00:00" }, { @@ -3512,23 +3280,6 @@ "portable", "shim" ], -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-05-12T16:47:27+00:00" }, { @@ -3578,23 +3329,6 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-05-23T17:05:51+00:00" }, { @@ -3644,23 +3378,6 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-03-15T09:38:08+00:00" }, { @@ -3720,23 +3437,6 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", -<<<<<<< HEAD -======= - "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" - } - ], ->>>>>>> bbPress connector test added "time": "2020-05-11T07:51:54+00:00" }, { @@ -3787,69 +3487,19 @@ "validate" ], "time": "2020-06-16T10:16:42+00:00" -<<<<<<< HEAD -======= - }, - { - "name": "wordpress/wordpress", - "version": "5.4.2", - "source": { - "type": "git", - "url": "https://github.com/WordPress/wordpress-develop.git", - "reference": "addf14cf983bc57e12f8acdb76c33f501ea74fcc" - }, - "require": { - "php": ">=5.6" - }, - "require-dev": { - "dealerdirect/phpcodesniffer-composer-installer": "~0.6.0", - "phpcompatibility/phpcompatibility-wp": "^2.1.0", - "wp-coding-standards/wpcs": "~2.1.0" - }, - "type": "library", - "scripts": { - "compat": [ - "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --standard=phpcompat.xml.dist --report=summary,source" - ], - "format": [ - "@php ./vendor/squizlabs/php_codesniffer/bin/phpcbf --report=summary,source" - ], - "lint": [ - "@php ./vendor/squizlabs/php_codesniffer/bin/phpcs --report=summary,source" - ], - "lint:errors": [ - "@lint -n" - ] - }, - "license": [ - "GPL-2.0-or-later" - ], - "description": "WordPress is open source software you can use to create a beautiful website, blog, or app.", - "homepage": "https://wordpress.org", - "keywords": [ - "blog", - "cms", - "wordpress", - "wp" - ], - "support": { - "issues": "https://core.trac.wordpress.org/" - }, - "time": "2020-06-10T21:40:13+00:00" ->>>>>>> bbPress connector test added }, { "name": "wp-cli/cache-command", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/wp-cli/cache-command.git", - "reference": "d3264aecf0e981b61adc020f5f6664f6538b7434" + "reference": "f6c2678c960b60bddaded01d5a33eb0a012451f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/cache-command/zipball/d3264aecf0e981b61adc020f5f6664f6538b7434", - "reference": "d3264aecf0e981b61adc020f5f6664f6538b7434", + "url": "https://api.github.com/repos/wp-cli/cache-command/zipball/f6c2678c960b60bddaded01d5a33eb0a012451f6", + "reference": "f6c2678c960b60bddaded01d5a33eb0a012451f6", "shasum": "" }, "require": { @@ -3905,20 +3555,20 @@ ], "description": "Manages object and transient caches.", "homepage": "https://github.com/wp-cli/cache-command", - "time": "2019-11-12T01:43:12+00:00" + "time": "2020-06-12T00:17:09+00:00" }, { "name": "wp-cli/checksum-command", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/wp-cli/checksum-command.git", - "reference": "7db66668ec116c5ccef7bc27b4354fa81b85018a" + "reference": "6b2648b01cd016044e2862afc96d3cb2028f2fee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/checksum-command/zipball/7db66668ec116c5ccef7bc27b4354fa81b85018a", - "reference": "7db66668ec116c5ccef7bc27b4354fa81b85018a", + "url": "https://api.github.com/repos/wp-cli/checksum-command/zipball/6b2648b01cd016044e2862afc96d3cb2028f2fee", + "reference": "6b2648b01cd016044e2862afc96d3cb2028f2fee", "shasum": "" }, "require": { @@ -3960,20 +3610,20 @@ ], "description": "Verifies file integrity by comparing to published checksums.", "homepage": "https://github.com/wp-cli/checksum-command", - "time": "2019-04-25T00:28:02+00:00" + "time": "2020-06-10T13:24:38+00:00" }, { "name": "wp-cli/config-command", - "version": "v2.0.5", + "version": "v2.0.6", "source": { "type": "git", "url": "https://github.com/wp-cli/config-command.git", - "reference": "9530dc42eebcae1fde10ad9e4aad312e06267eb9" + "reference": "f204bc62c557adb08f32a84683cc1dbfd23e6d96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/config-command/zipball/9530dc42eebcae1fde10ad9e4aad312e06267eb9", - "reference": "9530dc42eebcae1fde10ad9e4aad312e06267eb9", + "url": "https://api.github.com/repos/wp-cli/config-command/zipball/f204bc62c557adb08f32a84683cc1dbfd23e6d96", + "reference": "f204bc62c557adb08f32a84683cc1dbfd23e6d96", "shasum": "" }, "require": { @@ -4029,24 +3679,24 @@ ], "description": "Generates and reads the wp-config.php file.", "homepage": "https://github.com/wp-cli/config-command", - "time": "2019-11-12T01:43:26+00:00" + "time": "2020-06-11T00:17:12+00:00" }, { "name": "wp-cli/core-command", - "version": "v2.0.8", + "version": "v2.0.10", "source": { "type": "git", "url": "https://github.com/wp-cli/core-command.git", - "reference": "be62a9364c77a99698364a888362a8c8b9414f2f" + "reference": "a2eb072919b252b3c8859f4c9b68fdbb9601099d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/core-command/zipball/be62a9364c77a99698364a888362a8c8b9414f2f", - "reference": "be62a9364c77a99698364a888362a8c8b9414f2f", + "url": "https://api.github.com/repos/wp-cli/core-command/zipball/a2eb072919b252b3c8859f4c9b68fdbb9601099d", + "reference": "a2eb072919b252b3c8859f4c9b68fdbb9601099d", "shasum": "" }, "require": { - "composer/semver": "^1.4", + "composer/semver": "^1.4 || ^2 || ^3", "wp-cli/wp-cli": "^2.4" }, "require-dev": { @@ -4096,20 +3746,20 @@ ], "description": "Downloads, installs, updates, and manages a WordPress installation.", "homepage": "https://github.com/wp-cli/core-command", - "time": "2019-11-12T15:31:38+00:00" + "time": "2020-07-05T13:48:05+00:00" }, { "name": "wp-cli/cron-command", - "version": "v2.0.4", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/wp-cli/cron-command.git", - "reference": "184ce82dfd6e7284a73f039ae39cf51a5f73174e" + "reference": "f4e1d02642fc56d84504dd012aeb64adee0aae8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/cron-command/zipball/184ce82dfd6e7284a73f039ae39cf51a5f73174e", - "reference": "184ce82dfd6e7284a73f039ae39cf51a5f73174e", + "url": "https://api.github.com/repos/wp-cli/cron-command/zipball/f4e1d02642fc56d84504dd012aeb64adee0aae8c", + "reference": "f4e1d02642fc56d84504dd012aeb64adee0aae8c", "shasum": "" }, "require": { @@ -4159,7 +3809,7 @@ ], "description": "Tests, runs, and deletes WP-Cron events; manages WP-Cron schedules.", "homepage": "https://github.com/wp-cli/cron-command", - "time": "2019-12-17T17:53:36+00:00" + "time": "2020-07-04T07:16:56+00:00" }, { "name": "wp-cli/db-command", @@ -4233,16 +3883,16 @@ }, { "name": "wp-cli/embed-command", - "version": "v2.0.4", + "version": "v2.0.6", "source": { "type": "git", "url": "https://github.com/wp-cli/embed-command.git", - "reference": "f67fd41a056c6cb847e8601e058fa836b9e5d325" + "reference": "7186d8f969de31324dd2b54a18e5718f2c5db3e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/embed-command/zipball/f67fd41a056c6cb847e8601e058fa836b9e5d325", - "reference": "f67fd41a056c6cb847e8601e058fa836b9e5d325", + "url": "https://api.github.com/repos/wp-cli/embed-command/zipball/7186d8f969de31324dd2b54a18e5718f2c5db3e5", + "reference": "7186d8f969de31324dd2b54a18e5718f2c5db3e5", "shasum": "" }, "require": { @@ -4292,7 +3942,7 @@ ], "description": "Inspects oEmbed providers, clears embed cache, and more.", "homepage": "https://github.com/wp-cli/embed-command", - "time": "2019-11-12T01:43:50+00:00" + "time": "2020-07-05T19:16:43+00:00" }, { "name": "wp-cli/entity-command", @@ -4502,16 +4152,16 @@ }, { "name": "wp-cli/eval-command", - "version": "v2.0.6", + "version": "v2.0.7", "source": { "type": "git", "url": "https://github.com/wp-cli/eval-command.git", - "reference": "d379732f9899387a6a631ccea5116b3da6f16300" + "reference": "390627d0cb5d991ad341c367de1e8e4534edc5ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/eval-command/zipball/d379732f9899387a6a631ccea5116b3da6f16300", - "reference": "d379732f9899387a6a631ccea5116b3da6f16300", + "url": "https://api.github.com/repos/wp-cli/eval-command/zipball/390627d0cb5d991ad341c367de1e8e4534edc5ad", + "reference": "390627d0cb5d991ad341c367de1e8e4534edc5ad", "shasum": "" }, "require": { @@ -4552,20 +4202,20 @@ ], "description": "Executes arbitrary PHP code or files.", "homepage": "https://github.com/wp-cli/eval-command", - "time": "2020-02-06T11:24:47+00:00" + "time": "2020-06-13T00:17:03+00:00" }, { "name": "wp-cli/export-command", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/wp-cli/export-command.git", - "reference": "a31b1777a199a8437127ad3db1b6b92e9cb5cd9b" + "reference": "d1b280be8a7d806e345bb4c6965bc85ef0a8bb8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/export-command/zipball/a31b1777a199a8437127ad3db1b6b92e9cb5cd9b", - "reference": "a31b1777a199a8437127ad3db1b6b92e9cb5cd9b", + "url": "https://api.github.com/repos/wp-cli/export-command/zipball/d1b280be8a7d806e345bb4c6965bc85ef0a8bb8a", + "reference": "d1b280be8a7d806e345bb4c6965bc85ef0a8bb8a", "shasum": "" }, "require": { @@ -4610,24 +4260,24 @@ ], "description": "Exports WordPress content to a WXR file.", "homepage": "https://github.com/wp-cli/export-command", - "time": "2019-07-16T16:39:17+00:00" + "time": "2020-06-13T00:17:03+00:00" }, { "name": "wp-cli/extension-command", - "version": "v2.0.9", + "version": "v2.0.10", "source": { "type": "git", "url": "https://github.com/wp-cli/extension-command.git", - "reference": "b6b042fbeb7b3765e28b92e2971739af3d4ee888" + "reference": "2bc83433707fa4d2127f2ff48357ccbbee39052f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/extension-command/zipball/b6b042fbeb7b3765e28b92e2971739af3d4ee888", - "reference": "b6b042fbeb7b3765e28b92e2971739af3d4ee888", + "url": "https://api.github.com/repos/wp-cli/extension-command/zipball/2bc83433707fa4d2127f2ff48357ccbbee39052f", + "reference": "2bc83433707fa4d2127f2ff48357ccbbee39052f", "shasum": "" }, "require": { - "composer/semver": "^1.4", + "composer/semver": "^1.4 || ^2.0", "wp-cli/wp-cli": "^2" }, "require-dev": { @@ -4702,20 +4352,20 @@ ], "description": "Manages plugins and themes, including installs, activations, and updates.", "homepage": "https://github.com/wp-cli/extension-command", - "time": "2020-04-13T14:55:45+00:00" + "time": "2020-07-05T08:07:53+00:00" }, { "name": "wp-cli/i18n-command", - "version": "v2.2.3", + "version": "v2.2.4", "source": { "type": "git", "url": "https://github.com/wp-cli/i18n-command.git", - "reference": "7a5d483d872dfec1b89d88d348666ecd59454d52" + "reference": "9784ff2c074d1765442b618e6d3a43fee2093a05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/7a5d483d872dfec1b89d88d348666ecd59454d52", - "reference": "7a5d483d872dfec1b89d88d348666ecd59454d52", + "url": "https://api.github.com/repos/wp-cli/i18n-command/zipball/9784ff2c074d1765442b618e6d3a43fee2093a05", + "reference": "9784ff2c074d1765442b618e6d3a43fee2093a05", "shasum": "" }, "require": { @@ -4759,20 +4409,20 @@ ], "description": "Provides internationalization tools for WordPress projects.", "homepage": "https://github.com/wp-cli/i18n-command", - "time": "2020-06-04T07:07:10+00:00" + "time": "2020-06-12T00:17:09+00:00" }, { "name": "wp-cli/import-command", - "version": "v2.0.2", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/wp-cli/import-command.git", - "reference": "e28a7f55138ceb53f2ff5926874d8e5582c87db8" + "reference": "5c5762401b570b95a61152411c4120cd69419001" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/import-command/zipball/e28a7f55138ceb53f2ff5926874d8e5582c87db8", - "reference": "e28a7f55138ceb53f2ff5926874d8e5582c87db8", + "url": "https://api.github.com/repos/wp-cli/import-command/zipball/5c5762401b570b95a61152411c4120cd69419001", + "reference": "5c5762401b570b95a61152411c4120cd69419001", "shasum": "" }, "require": { @@ -4815,20 +4465,20 @@ ], "description": "Imports content from a given WXR file.", "homepage": "https://github.com/wp-cli/import-command", - "time": "2019-04-19T14:32:57+00:00" + "time": "2020-06-11T00:17:12+00:00" }, { "name": "wp-cli/language-command", - "version": "v2.0.5", + "version": "v2.0.6", "source": { "type": "git", "url": "https://github.com/wp-cli/language-command.git", - "reference": "a14a385efffba2060f947afa85f7ffd7e7cda5d7" + "reference": "569be810e057cf9df7d7924e62ebe569e440f6b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/language-command/zipball/a14a385efffba2060f947afa85f7ffd7e7cda5d7", - "reference": "a14a385efffba2060f947afa85f7ffd7e7cda5d7", + "url": "https://api.github.com/repos/wp-cli/language-command/zipball/569be810e057cf9df7d7924e62ebe569e440f6b1", + "reference": "569be810e057cf9df7d7924e62ebe569e440f6b1", "shasum": "" }, "require": { @@ -4890,20 +4540,20 @@ ], "description": "Installs, activates, and manages language packs.", "homepage": "https://github.com/wp-cli/language-command", - "time": "2019-11-12T01:33:31+00:00" + "time": "2020-06-12T00:17:09+00:00" }, { "name": "wp-cli/maintenance-mode-command", - "version": "v2.0.2", + "version": "v2.0.3", "source": { "type": "git", "url": "https://github.com/wp-cli/maintenance-mode-command.git", - "reference": "3c80e731e1032607a2e9589ae6b6398e95c05b91" + "reference": "5409778b62daf93e2192f43e2774c5d263d7297d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/maintenance-mode-command/zipball/3c80e731e1032607a2e9589ae6b6398e95c05b91", - "reference": "3c80e731e1032607a2e9589ae6b6398e95c05b91", + "url": "https://api.github.com/repos/wp-cli/maintenance-mode-command/zipball/5409778b62daf93e2192f43e2774c5d263d7297d", + "reference": "5409778b62daf93e2192f43e2774c5d263d7297d", "shasum": "" }, "require": { @@ -4947,20 +4597,20 @@ ], "description": "Activates, deactivates or checks the status of the maintenance mode of a site.", "homepage": "https://github.com/wp-cli/maintenance-mode-command", - "time": "2019-11-12T01:32:41+00:00" + "time": "2020-06-11T00:17:12+00:00" }, { "name": "wp-cli/media-command", - "version": "v2.0.8", + "version": "v2.0.9", "source": { "type": "git", "url": "https://github.com/wp-cli/media-command.git", - "reference": "5181e5cee2f6cb43cfee6cacf3b08e8fb166b2b5" + "reference": "830e72a2cbd3eeec95a97df2c1c17d925d86790d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/media-command/zipball/5181e5cee2f6cb43cfee6cacf3b08e8fb166b2b5", - "reference": "5181e5cee2f6cb43cfee6cacf3b08e8fb166b2b5", + "url": "https://api.github.com/repos/wp-cli/media-command/zipball/830e72a2cbd3eeec95a97df2c1c17d925d86790d", + "reference": "830e72a2cbd3eeec95a97df2c1c17d925d86790d", "shasum": "" }, "require": { @@ -5005,7 +4655,7 @@ ], "description": "Imports files as attachments, regenerates thumbnails, or lists registered image sizes.", "homepage": "https://github.com/wp-cli/media-command", - "time": "2020-05-13T16:21:49+00:00" + "time": "2020-06-11T00:17:12+00:00" }, { "name": "wp-cli/mustangostang-spyc", @@ -5168,16 +4818,16 @@ }, { "name": "wp-cli/rewrite-command", - "version": "v2.0.4", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/wp-cli/rewrite-command.git", - "reference": "3879bcbf7e695f68097cedb8415ed04915a25465" + "reference": "5115c82d6c339ac783d5ee9c7d3ce2949ac25a4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/rewrite-command/zipball/3879bcbf7e695f68097cedb8415ed04915a25465", - "reference": "3879bcbf7e695f68097cedb8415ed04915a25465", + "url": "https://api.github.com/repos/wp-cli/rewrite-command/zipball/5115c82d6c339ac783d5ee9c7d3ce2949ac25a4b", + "reference": "5115c82d6c339ac783d5ee9c7d3ce2949ac25a4b", "shasum": "" }, "require": { @@ -5221,20 +4871,20 @@ ], "description": "Lists or flushes the site's rewrite rules, updates the permalink structure.", "homepage": "https://github.com/wp-cli/rewrite-command", - "time": "2019-11-12T01:31:23+00:00" + "time": "2020-06-12T00:17:09+00:00" }, { "name": "wp-cli/role-command", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/wp-cli/role-command.git", - "reference": "bad54a1b02331ee6460cc6a6f967e37dd91e07a3" + "reference": "9f2172988dee5bbeb98e54f291254bee94a556a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/role-command/zipball/bad54a1b02331ee6460cc6a6f967e37dd91e07a3", - "reference": "bad54a1b02331ee6460cc6a6f967e37dd91e07a3", + "url": "https://api.github.com/repos/wp-cli/role-command/zipball/9f2172988dee5bbeb98e54f291254bee94a556a6", + "reference": "9f2172988dee5bbeb98e54f291254bee94a556a6", "shasum": "" }, "require": { @@ -5283,7 +4933,7 @@ ], "description": "Adds, removes, lists, and resets roles and capabilities.", "homepage": "https://github.com/wp-cli/role-command", - "time": "2019-11-12T01:30:59+00:00" + "time": "2020-06-11T00:17:12+00:00" }, { "name": "wp-cli/scaffold-command", @@ -5350,16 +5000,16 @@ }, { "name": "wp-cli/search-replace-command", - "version": "v2.0.6", + "version": "v2.0.7", "source": { "type": "git", "url": "https://github.com/wp-cli/search-replace-command.git", - "reference": "f446ca1f90144b496dbacb373868118ba40df028" + "reference": "1104e4fb7dd83e85dedb8a98ed8f0ac30639694b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/search-replace-command/zipball/f446ca1f90144b496dbacb373868118ba40df028", - "reference": "f446ca1f90144b496dbacb373868118ba40df028", + "url": "https://api.github.com/repos/wp-cli/search-replace-command/zipball/1104e4fb7dd83e85dedb8a98ed8f0ac30639694b", + "reference": "1104e4fb7dd83e85dedb8a98ed8f0ac30639694b", "shasum": "" }, "require": { @@ -5402,20 +5052,20 @@ ], "description": "Searches/replaces strings in the database.", "homepage": "https://github.com/wp-cli/search-replace-command", - "time": "2019-12-13T09:13:20+00:00" + "time": "2020-06-10T13:24:39+00:00" }, { "name": "wp-cli/server-command", - "version": "v2.0.4", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/wp-cli/server-command.git", - "reference": "b0c8db803aea2133973a9a35b0d94fb62487b456" + "reference": "945b6843d9f130c378869e3277a33af3fceea78d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/server-command/zipball/b0c8db803aea2133973a9a35b0d94fb62487b456", - "reference": "b0c8db803aea2133973a9a35b0d94fb62487b456", + "url": "https://api.github.com/repos/wp-cli/server-command/zipball/945b6843d9f130c378869e3277a33af3fceea78d", + "reference": "945b6843d9f130c378869e3277a33af3fceea78d", "shasum": "" }, "require": { @@ -5455,20 +5105,20 @@ ], "description": "Launches PHP's built-in web server for a specific WordPress installation.", "homepage": "https://github.com/wp-cli/server-command", - "time": "2019-11-12T11:32:15+00:00" + "time": "2020-06-16T00:17:21+00:00" }, { "name": "wp-cli/shell-command", - "version": "v2.0.4", + "version": "v2.0.5", "source": { "type": "git", "url": "https://github.com/wp-cli/shell-command.git", - "reference": "293cc82fe6e99c0168bf834787ac5d0e17825723" + "reference": "f655611701ed331c336932091860e66839a535f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/shell-command/zipball/293cc82fe6e99c0168bf834787ac5d0e17825723", - "reference": "293cc82fe6e99c0168bf834787ac5d0e17825723", + "url": "https://api.github.com/repos/wp-cli/shell-command/zipball/f655611701ed331c336932091860e66839a535f3", + "reference": "f655611701ed331c336932091860e66839a535f3", "shasum": "" }, "require": { @@ -5509,20 +5159,20 @@ ], "description": "Opens an interactive PHP console for running and testing PHP code.", "homepage": "https://github.com/wp-cli/shell-command", - "time": "2019-11-12T01:29:25+00:00" + "time": "2020-06-12T00:17:09+00:00" }, { "name": "wp-cli/super-admin-command", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/wp-cli/super-admin-command.git", - "reference": "b3f3078d25c17ee586a5f31cb5ce3553613e85b4" + "reference": "a4b93491afb74a7e4836ab4ab5c2d8c42fa5e3d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/super-admin-command/zipball/b3f3078d25c17ee586a5f31cb5ce3553613e85b4", - "reference": "b3f3078d25c17ee586a5f31cb5ce3553613e85b4", + "url": "https://api.github.com/repos/wp-cli/super-admin-command/zipball/a4b93491afb74a7e4836ab4ab5c2d8c42fa5e3d1", + "reference": "a4b93491afb74a7e4836ab4ab5c2d8c42fa5e3d1", "shasum": "" }, "require": { @@ -5566,20 +5216,20 @@ ], "description": "Lists, adds, or removes super admin users on a multisite installation.", "homepage": "https://github.com/wp-cli/super-admin-command", - "time": "2019-11-12T01:28:59+00:00" + "time": "2020-06-10T13:24:39+00:00" }, { "name": "wp-cli/widget-command", - "version": "v2.1.0", + "version": "v2.1.1", "source": { "type": "git", "url": "https://github.com/wp-cli/widget-command.git", - "reference": "ddbc2c3e9966fae8de05a3200b04e0faf42fe06f" + "reference": "1ba59443fc07608450155c7770fe459ddfbc412f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/widget-command/zipball/ddbc2c3e9966fae8de05a3200b04e0faf42fe06f", - "reference": "ddbc2c3e9966fae8de05a3200b04e0faf42fe06f", + "url": "https://api.github.com/repos/wp-cli/widget-command/zipball/1ba59443fc07608450155c7770fe459ddfbc412f", + "reference": "1ba59443fc07608450155c7770fe459ddfbc412f", "shasum": "" }, "require": { @@ -5629,7 +5279,7 @@ ], "description": "Adds, moves, and removes widgets; lists sidebars.", "homepage": "https://github.com/wp-cli/widget-command", - "time": "2020-01-18T02:17:30+00:00" + "time": "2020-06-16T00:17:21+00:00" }, { "name": "wp-cli/wp-cli", @@ -5765,16 +5415,16 @@ }, { "name": "wp-cli/wp-config-transformer", - "version": "v1.2.6", + "version": "v1.2.7", "source": { "type": "git", "url": "https://github.com/wp-cli/wp-config-transformer.git", - "reference": "1ca98343443a8e4585865db5f50e8e6121fee70b" + "reference": "bae1e975ed1277470e3dcc7fd0ef99c2d4f4c7a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/wp-cli/wp-config-transformer/zipball/1ca98343443a8e4585865db5f50e8e6121fee70b", - "reference": "1ca98343443a8e4585865db5f50e8e6121fee70b", + "url": "https://api.github.com/repos/wp-cli/wp-config-transformer/zipball/bae1e975ed1277470e3dcc7fd0ef99c2d4f4c7a8", + "reference": "bae1e975ed1277470e3dcc7fd0ef99c2d4f4c7a8", "shasum": "" }, "require": { @@ -5782,7 +5432,7 @@ }, "require-dev": { "composer/composer": "^1.5.6", - "phpunit/phpunit": "^6.5.5", + "phpunit/phpunit": "^6.5.5 || ^7.0.0", "wp-coding-standards/wpcs": "^0.14.0 || ^1.0.0 || ^2.0.0" }, "type": "library", @@ -5802,7 +5452,7 @@ } ], "description": "Programmatically edit a wp-config.php file.", - "time": "2019-07-23T17:24:43+00:00" + "time": "2020-07-05T12:30:35+00:00" }, { "name": "wp-coding-standards/wpcs", @@ -5849,27 +5499,6 @@ "wordpress" ], "time": "2020-05-13T23:57:56+00:00" -<<<<<<< HEAD -======= - }, - { - "name": "wpackagist-plugin/bbpress", - "version": "2.6.5", - "source": { - "type": "svn", - "url": "https://plugins.svn.wordpress.org/bbpress/", - "reference": "tags/2.6.5" - }, - "dist": { - "type": "zip", - "url": "https://downloads.wordpress.org/plugin/bbpress.2.6.5.zip" - }, - "require": { - "composer/installers": "~1.0" - }, - "type": "wordpress-plugin", - "homepage": "https://wordpress.org/plugins/bbpress/" ->>>>>>> bbPress connector test added }, { "name": "wp-phpunit/wp-phpunit", @@ -5915,7 +5544,24 @@ "time": "2020-04-01T14:35:27+00:00" }, { -<<<<<<< HEAD + "name": "wpackagist-plugin/bbpress", + "version": "2.6.5", + "source": { + "type": "svn", + "url": "https://plugins.svn.wordpress.org/bbpress/", + "reference": "tags/2.6.5" + }, + "dist": { + "type": "zip", + "url": "https://downloads.wordpress.org/plugin/bbpress.2.6.5.zip" + }, + "require": { + "composer/installers": "~1.0" + }, + "type": "wordpress-plugin", + "homepage": "https://wordpress.org/plugins/bbpress/" + }, + { "name": "wpsh/local", "version": "0.2.3", "source": { @@ -5927,19 +5573,6 @@ "type": "zip", "url": "https://api.github.com/repos/wpsh/wpsh-local/zipball/17338432ed06386273a1ee4db8c8467aa8feab17", "reference": "17338432ed06386273a1ee4db8c8467aa8feab17", -======= - "name": "xwp/wp-dev-lib", - "version": "1.6.4", - "source": { - "type": "git", - "url": "https://github.com/xwp/wp-dev-lib.git", - "reference": "38bef6879b1c71f8dec75beee77a13a89d2b1f79" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/xwp/wp-dev-lib/zipball/38bef6879b1c71f8dec75beee77a13a89d2b1f79", - "reference": "38bef6879b1c71f8dec75beee77a13a89d2b1f79", ->>>>>>> bbPress connector test added "shasum": "" }, "type": "library", @@ -5947,28 +5580,8 @@ "license": [ "MIT" ], -<<<<<<< HEAD "description": "A Docker Compose development environment for any project.", "time": "2019-06-12T10:54:32+00:00" -======= - "authors": [ - { - "name": "XWP", - "email": "technology@xwp.co", - "homepage": "https://xwp.co" - } - ], - "description": "Common code used during development of WordPress plugins and themes", - "homepage": "https://github.com/xwp/wp-dev-lib", - "keywords": [ - "development", - "plugins", - "themes", - "tools", - "wordpress" - ], - "time": "2020-05-12T02:27:04+00:00" ->>>>>>> bbPress connector test added } ], "aliases": [], diff --git a/tests/tests/connectors/test-class-connector-bbpress.php b/tests/tests/connectors/test-class-connector-bbpress.php index e47d95d9b..dd727484b 100644 --- a/tests/tests/connectors/test-class-connector-bbpress.php +++ b/tests/tests/connectors/test-class-connector-bbpress.php @@ -2,14 +2,18 @@ namespace WP_Stream; class Test_WP_Stream_Connector_BbPress extends WP_StreamTestCase { - public function setUp() { parent::setUp(); + $post_connector = new Connector_Posts(); + $post_connector->register(); + // Make partial of Connector_ACF class, with mocked "log" function. $this->mock = $this->getMockBuilder( Connector_BbPress::class ) - ->setMethods( [ 'log', 'log_override' ] ) + ->setMethods( [ 'log' ] ) ->getMock(); + + $this->mock->register(); } public function tearDown() { @@ -21,49 +25,75 @@ public function test_bbpress_installed_and_activated() { } public function test_log_override() { - $this->mock->expects( $this->atLeastOnce() ) - ->method( 'log_override' ) - ->willReturn( - 'bbpress', - _x( - '"%1$s" %2$s published', + $asserted = false; + + add_action( + 'wp_stream_log_data', + function( $data ) use( &$asserted ) { + $message = _x( + '"%1$s" %2$s updated', '1: Post title, 2: Post type singular name', 'stream' - ), - array( - 'post_title' => 'Test Forum', - 'singular_name' => $post_type_name, - 'post_date' => $post->post_date, - 'post_date_gmt' => $post->post_date_gmt, - 'new_status' => $new, - 'old_status' => $old, - 'revision_id' => $revision_id, - ), - $this->greaterThan( 0 ), - 'forum', - 'publish', - null - ); + ); - bbp_insert_forum( [ 'post_title' => 'Test Forum' ] ); + $this->assertSame( 'bbpress', $data['connector'] ); + $this->assertSame( $message, $data['message'] ); + $this->assertSame( 'Test Forum', $data['args']['post_title'] ); + $this->assertSame( 'forum', $data['context'] ); + $this->assertSame( 'updated', $data['action'] ); + $asserted = true; + + return $data; + }, + 99 + ); + + $forum_id = bbp_insert_forum( [ 'post_title' => 'Test Forum' ] ); + + $this->assertGreaterThan( 0, $forum_id ); + $this->assertTrue( $asserted ); } public function test_callback_bbp_toggle_topic_admin() { - $this->markTestIncomplete( - 'Not implemented yet.' + $forum_id = bbp_insert_forum( [ 'post_title' => 'Test Forum' ] ); + $topic_id = bbp_insert_topic( + [ + 'post_title' => 'Test Topic', + 'post_parent' => $forum_id, + ] ); + $topic = get_post( $topic_id ); // Expected log calls. $this->mock->expects( $this->atLeastOnce() ) ->method( 'log' ) - ->withConsecutive( - + ->with( + $this->equalTo( _x( '%1$s "%2$s" topic', '1: Action, 2: Topic title', 'stream' ) ), + $this->equalTo( + array( + 'action_title' => esc_html_x( 'Closed', 'bbpress', 'stream' ), + 'topic_title' => $topic->post_title, + 'action' => 'closed', + ) + ), + $this->equalTo( $topic_id ), + $this->equalTo( 'topic' ), + $this->equalTo( 'closed' ) ); // Do stuff - + do_action( + 'bbp_toggle_topic_admin', + bbp_close_topic( $topic_id ), + array( 'ID' => $topic_id ), + 'bbp_toggle_topic_close', + array( + 'bbp_topic_toggle_notice' => 'closed', + 'topic_id' => $topic_id + ) + ); // Check callback test action. - $this->assertFalse( 0 === did_action( 'wp_stream_test_callback_save_post' ) ); + $this->assertFalse( 0 === did_action( 'wp_stream_test_callback_bbp_toggle_topic_admin' ) ); } }