mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-06-24 22:39:31 +00:00
Merge commit 'e4b7024' into 4.0-dev
This commit is contained in:
commit
57b8537823
|
@ -1,4 +1,4 @@
|
|||
Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon) [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
|
||||
Joomla! CMS™ [![Analytics](https://ga-beacon.appspot.com/UA-544070-3/joomla-cms/readme)](https://github.com/igrigorik/ga-beacon)
|
||||
====================
|
||||
|
||||
Build Status
|
||||
|
|
|
@ -83,7 +83,7 @@
|
|||
"web-auth/webauthn-lib": "2.1.*"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "~8.0",
|
||||
"phpunit/phpunit": "^8.5",
|
||||
"joomla/cms-coding-standards": "~2.0.0-alpha2@dev",
|
||||
"joomla/coding-standards": "~3.0@dev",
|
||||
"joomla/mediawiki": "dev-master",
|
||||
|
|
35
composer.lock
generated
35
composer.lock
generated
|
@ -4,7 +4,7 @@
|
|||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "f2b1f4fb0d151b0bb8b484a06b8d8858",
|
||||
"content-hash": "0955d7ab2dd79ed25e7cb52e299b81ff",
|
||||
"packages": [
|
||||
{
|
||||
"name": "algo26-matthias/idna-convert",
|
||||
|
@ -5421,6 +5421,7 @@
|
|||
}
|
||||
],
|
||||
"description": "JSONPath implementation for parsing, searching and flattening arrays",
|
||||
"abandoned": "softcreatr/jsonpath",
|
||||
"time": "2019-07-15T17:23:22+00:00"
|
||||
},
|
||||
{
|
||||
|
@ -6772,39 +6773,39 @@
|
|||
},
|
||||
{
|
||||
"name": "phpunit/phpunit",
|
||||
"version": "8.5.8",
|
||||
"version": "8.5.9",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/sebastianbergmann/phpunit.git",
|
||||
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997"
|
||||
"reference": "f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34c18baa6a44f1d1fbf0338907139e9dce95b997",
|
||||
"reference": "34c18baa6a44f1d1fbf0338907139e9dce95b997",
|
||||
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6",
|
||||
"reference": "f5c8a5dd5e7e8d68d7562bfb48d47287d33937d6",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"doctrine/instantiator": "^1.2.0",
|
||||
"doctrine/instantiator": "^1.3.1",
|
||||
"ext-dom": "*",
|
||||
"ext-json": "*",
|
||||
"ext-libxml": "*",
|
||||
"ext-mbstring": "*",
|
||||
"ext-xml": "*",
|
||||
"ext-xmlwriter": "*",
|
||||
"myclabs/deep-copy": "^1.9.1",
|
||||
"myclabs/deep-copy": "^1.10.0",
|
||||
"phar-io/manifest": "^1.0.3",
|
||||
"phar-io/version": "^2.0.1",
|
||||
"php": "^7.2",
|
||||
"phpspec/prophecy": "^1.8.1",
|
||||
"phpunit/php-code-coverage": "^7.0.7",
|
||||
"phpspec/prophecy": "^1.10.3",
|
||||
"phpunit/php-code-coverage": "^7.0.10",
|
||||
"phpunit/php-file-iterator": "^2.0.2",
|
||||
"phpunit/php-text-template": "^1.2.1",
|
||||
"phpunit/php-timer": "^2.1.2",
|
||||
"sebastian/comparator": "^3.0.2",
|
||||
"sebastian/diff": "^3.0.2",
|
||||
"sebastian/environment": "^4.2.2",
|
||||
"sebastian/exporter": "^3.1.1",
|
||||
"sebastian/environment": "^4.2.3",
|
||||
"sebastian/exporter": "^3.1.2",
|
||||
"sebastian/global-state": "^3.0.0",
|
||||
"sebastian/object-enumerator": "^3.0.3",
|
||||
"sebastian/resource-operations": "^2.0.1",
|
||||
|
@ -6851,7 +6852,17 @@
|
|||
"testing",
|
||||
"xunit"
|
||||
],
|
||||
"time": "2020-06-22T07:06:58+00:00"
|
||||
"funding": [
|
||||
{
|
||||
"url": "https://phpunit.de/donate.html",
|
||||
"type": "custom"
|
||||
},
|
||||
{
|
||||
"url": "https://github.com/sebastianbergmann",
|
||||
"type": "github"
|
||||
}
|
||||
],
|
||||
"time": "2020-11-10T12:51:38+00:00"
|
||||
},
|
||||
{
|
||||
"name": "psr/event-dispatcher",
|
||||
|
|
|
@ -13,7 +13,7 @@ namespace Joomla\CMS\Categories;
|
|||
/**
|
||||
* Option based categories factory.
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @since 3.10.0
|
||||
*/
|
||||
class CategoryFactory implements CategoryFactoryInterface
|
||||
{
|
||||
|
@ -46,7 +46,7 @@ class CategoryFactory implements CategoryFactoryInterface
|
|||
*
|
||||
* @return CategoryInterface
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @since 3.10.0
|
||||
*
|
||||
* @throws SectionNotFoundException
|
||||
*/
|
||||
|
|
|
@ -13,7 +13,7 @@ namespace Joomla\CMS\Categories;
|
|||
/**
|
||||
* Category factory interface
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @since 3.10.0
|
||||
*/
|
||||
interface CategoryFactoryInterface
|
||||
{
|
||||
|
@ -25,7 +25,7 @@ interface CategoryFactoryInterface
|
|||
*
|
||||
* @return CategoryInterface
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @since 3.10.0
|
||||
*
|
||||
* @throws SectionNotFoundException
|
||||
*/
|
||||
|
|
|
@ -13,7 +13,7 @@ namespace Joomla\CMS\Categories;
|
|||
/**
|
||||
* The category interface.
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @since 3.10.0
|
||||
*/
|
||||
interface CategoryInterface
|
||||
{
|
||||
|
@ -25,7 +25,7 @@ interface CategoryInterface
|
|||
*
|
||||
* @return CategoryNode|null CategoryNode object or null if $id is not valid
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @since 3.10.0
|
||||
*/
|
||||
public function get($id = 'root', $forceload = false);
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ namespace Joomla\CMS\Categories;
|
|||
/**
|
||||
* Representing when a category section cannot be found.
|
||||
*
|
||||
* @since 4.0.0
|
||||
* @since 3.10.0
|
||||
*/
|
||||
class SectionNotFoundException extends \RuntimeException
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue
Block a user