mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-06-20 11:05:08 +00:00
Merge branch '4.3-dev' into 4.4-dev
This commit is contained in:
Allon Moritz
commit
8229caf16b
|
|
@ -193,7 +193,7 @@ class StepsModel extends ListModel
|
|||
$query->where($db->quoteName('a.id') . ' = :search')
|
||||
->bind(':search', $search, ParameterType::INTEGER);
|
||||
} elseif (stripos($search, 'description:') === 0) {
|
||||
$search = '%' . substr($search, 8) . '%';
|
||||
$search = '%' . substr($search, 12) . '%';
|
||||
$query->where('(' . $db->quoteName('a.description') . ' LIKE :search1)')
|
||||
->bind([':search1'], $search);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -501,7 +501,7 @@ class TourModel extends AdminModel
|
|||
*
|
||||
* @return boolean
|
||||
*
|
||||
* @since __DEPLOY_VERSION__
|
||||
* @since 4.3.0
|
||||
*/
|
||||
protected function setStepsLanguage(int $id, string $language = '*'): bool
|
||||
{
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ class ToursModel extends ListModel
|
|||
$query->where($db->quoteName('a.id') . ' = :search')
|
||||
->bind(':search', $search, ParameterType::INTEGER);
|
||||
} elseif (stripos($search, 'description:') === 0) {
|
||||
$search = '%' . substr($search, 8) . '%';
|
||||
$search = '%' . substr($search, 12) . '%';
|
||||
$query->where('(' . $db->quoteName('a.description') . ' LIKE :search1)')
|
||||
->bind([':search1'], $search);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -81,6 +81,8 @@
|
|||
"symfony/options-resolver": "^5.4.21",
|
||||
"symfony/polyfill-mbstring": "^1.27.0",
|
||||
"symfony/polyfill-php73": "^1.27",
|
||||
"symfony/polyfill-php80": "^1.27",
|
||||
"symfony/polyfill-php81": "^1.27",
|
||||
"symfony/web-link": "^5.4.21",
|
||||
"symfony/yaml": "^5.4.21",
|
||||
"typo3/phar-stream-wrapper": "^3.1.7",
|
||||
|
|
|
|||
161
composer.lock
generated
161
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": "0925bd79a9d305ac9e82a6736610202e",
|
||||
"content-hash": "5dbb1ea5e8d451c8557c927881d94685",
|
||||
"packages": [
|
||||
{
|
||||
"name": "algo26-matthias/idna-convert",
|
||||
|
|
@ -3685,6 +3685,7 @@
|
|||
"rhumsaa/uuid": "self.version"
|
||||
},
|
||||
"require-dev": {
|
||||
"codeception/aspect-mock": "^1 | ^2",
|
||||
"doctrine/annotations": "^1.2",
|
||||
"goaop/framework": "1.0.0-alpha.2 | ^1 | >=2.1.0 <=2.3.2",
|
||||
"mockery/mockery": "^0.9.11 | ^1",
|
||||
|
|
@ -4928,6 +4929,85 @@
|
|||
],
|
||||
"time": "2022-11-03T14:55:06+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php81",
|
||||
"version": "v1.27.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php81.git",
|
||||
"reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a",
|
||||
"reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a",
|
||||
"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\\Php81\\": ""
|
||||
},
|
||||
"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 8.1+ features to lower PHP versions",
|
||||
"homepage": "https://symfony.com",
|
||||
"keywords": [
|
||||
"compatibility",
|
||||
"polyfill",
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/polyfill-php81/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": "symfony/service-contracts",
|
||||
"version": "v2.5.2",
|
||||
|
|
@ -9624,85 +9704,6 @@
|
|||
],
|
||||
"time": "2023-02-16T09:33:00+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-php81",
|
||||
"version": "v1.27.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/polyfill-php81.git",
|
||||
"reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a",
|
||||
"reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a",
|
||||
"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\\Php81\\": ""
|
||||
},
|
||||
"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 8.1+ features to lower PHP versions",
|
||||
"homepage": "https://symfony.com",
|
||||
"keywords": [
|
||||
"compatibility",
|
||||
"polyfill",
|
||||
"portable",
|
||||
"shim"
|
||||
],
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/polyfill-php81/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": "symfony/process",
|
||||
"version": "v5.4.21",
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ final class Version
|
|||
* @var string
|
||||
* @since 3.5
|
||||
*/
|
||||
public const RELDATE = '7-March-2023';
|
||||
public const RELDATE = '21-March-2023';
|
||||
|
||||
/**
|
||||
* Release time.
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ final class GuidedTours extends CMSPlugin implements SubscriberInterface
|
|||
*
|
||||
* @var bool
|
||||
*
|
||||
* @since __DEPLOY_VERSION__
|
||||
* @since 4.3.0
|
||||
*/
|
||||
protected static $enabled = false;
|
||||
|
||||
|
|
@ -70,7 +70,7 @@ final class GuidedTours extends CMSPlugin implements SubscriberInterface
|
|||
* @param array $config An optional associative array of configuration settings.
|
||||
* @param boolean $enabled An internal flag whether plugin should listen any event.
|
||||
*
|
||||
* @since __DEPLOY_VERSION__
|
||||
* @since 4.3.0
|
||||
*/
|
||||
public function __construct($subject, array $config = [], bool $enabled = false)
|
||||
{
|
||||
|
|
@ -85,7 +85,7 @@ final class GuidedTours extends CMSPlugin implements SubscriberInterface
|
|||
*
|
||||
* @return array
|
||||
*
|
||||
* @since __DEPLOY_VERSION__
|
||||
* @since 4.3.0
|
||||
*/
|
||||
public static function getSubscribedEvents(): array
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user