joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-24 22:39:31 +00:00
Code Packages Releases Activity

[4.0] Update joomla/database (#27044)

Browse Source
This commit is contained in:
SharkyKZ 2019-12-06 12:56:13 +02:00 committed by George Wilson
parent 2960c8f945
commit f794274090
5 changed files with 38 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
administrator/components/com_menus/Controller/MenusController.php
View File

@ -198,10 +198,6 @@ class MenusController extends BaseController
return;
}
// Declare variables before binding.
$componentId = 0;
$itemId = 0;
$query = $db->getQuery(true)
->update($db->quoteName('#__menu'))
->set($db->quoteName('component_id') . ' = :componentId')

4
administrator/components/com_menus/Model/ItemModel.php
View File

@ -1381,10 +1381,6 @@ class ItemModel extends AdminModel
return false;
}
// Declare paramaters before binding.
$id = 0;
$params = '';
$query = $db->getQuery(true)
->update($db->quoteName('#__menu'))
->set($db->quoteName('params') . ' = :params')

22
administrator/components/com_menus/Model/MenusModel.php
View File

@ -80,7 +80,6 @@ class MenusModel extends ListModel
$db = $this->getDbo();
$menuTypes = array_column((array) $items, 'menutype');
// Get the published menu counts.
$query = $db->getQuery(true)
->select(
[
@ -89,14 +88,17 @@ class MenusModel extends ListModel
]
)
->from($db->quoteName('#__menu', 'm'))
->where($db->quoteName('m.published') . ' = 1')
->where($db->quoteName('m.published') . ' = :published')
->whereIn($db->quoteName('m.menutype'), $menuTypes, ParameterType::STRING)
->group($db->quoteName('m.menutype'));
->group($db->quoteName('m.menutype'))
->bind(':published', $published, ParameterType::INTEGER);
$db->setQuery($query);
// Get the published menu counts.
try
{
$published = 1;
$countPublished = $db->loadAssocList('menutype', 'count_published');
}
catch (\RuntimeException $e)
@ -107,14 +109,9 @@ class MenusModel extends ListModel
}
// Get the unpublished menu counts.
$query->clear('where')
->bind()
->where($db->quoteName('m.published') . ' = 0')
->whereIn($db->quoteName('m.menutype'), $menuTypes, ParameterType::STRING);
$db->setQuery($query);
try
{
$published = 0;
$countUnpublished = $db->loadAssocList('menutype', 'count_published');
}
catch (\RuntimeException $e)
@ -125,14 +122,9 @@ class MenusModel extends ListModel
}
// Get the trashed menu counts.
$query->clear('where')
->bind()
->where($db->quoteName('m.published') . ' = -2')
->whereIn($db->quoteName('m.menutype'), $menuTypes, ParameterType::STRING);
$db->setQuery($query);
try
{
$published = -2;
$countTrashed = $db->loadAssocList('menutype', 'count_published');
}
catch (\RuntimeException $e)

61
composer.lock generated
View File

@ -758,18 +758,17 @@
"source": {
"type": "git",
"url": "https://github.com/joomla-framework/database.git",
"reference": "c5cd726fb6137dede3a0f141df4271df310a9568"
"reference": "9013e0e238459fac2456279c7ff48aabf5233aaa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/joomla-framework/database/zipball/c5cd726fb6137dede3a0f141df4271df310a9568",
"reference": "c5cd726fb6137dede3a0f141df4271df310a9568",
"url": "https://api.github.com/repos/joomla-framework/database/zipball/9013e0e238459fac2456279c7ff48aabf5233aaa",
"reference": "9013e0e238459fac2456279c7ff48aabf5233aaa",
"shasum": ""
},
"require": {
"joomla/event": "~2.0",
"php": "~7.2",
"psr/log": "~1.0"
"php": "~7.2"
},
"require-dev": {
"joomla/archive": "~2.0",
@ -778,9 +777,10 @@
"joomla/di": "~1.0|~2.0",
"joomla/filesystem": "~1.3|~2.0",
"joomla/registry": "^1.4.5|~2.0",
"joomla/test": "~1.2",
"phpunit/dbunit": "~3.0",
"phpunit/phpunit": "~6.3"
"joomla/test": "~2.0",
"phpunit/phpunit": "~8.2",
"psr/log": "~1.1",
"symfony/phpunit-bridge": "~4.3"
},
"suggest": {
"ext-mysqli": "To connect to a MySQL database via MySQLi",
@ -791,7 +791,8 @@
"joomla/console": "To use the ExportCommand and ImportCommand classes, install joomla/console",
"joomla/di": "To use the Database ServiceProviderInterface objects, install joomla/di.",
"joomla/filesystem": "To use the ExportCommand and ImportCommand classes, install joomla/filesystem",
"joomla/registry": "To use the Database ServiceProviderInterface objects, install joomla/registry."
"joomla/registry": "To use the Database ServiceProviderInterface objects, install joomla/registry.",
"psr/log": "To use the LoggingMonitor, install psr/log."
},
"type": "joomla-package",
"extra": {
@ -815,7 +816,7 @@
"framework",
"joomla"
],
"time": "2019-09-10T10:17:45+00:00"
"time": "2019-11-11T04:05:51+00:00"
},
{
"name": "joomla/di",
@ -3625,9 +3626,9 @@
"authors": [
{
"name": "Franck Nijhof",
"role": "Developer / IT Manager",
"email": "franck.nijhof@dealerdirect.com",
"homepage": "http://www.frenck.nl"
"homepage": "http://www.frenck.nl",
"role": "Developer / IT Manager"
}
],
"description": "PHP_CodeSniffer Standards Composer Installer Plugin",
@ -5010,18 +5011,18 @@
"authors": [
{
"name": "Arne Blankerts",
"role": "Developer",
"email": "arne@blankerts.de"
"email": "arne@blankerts.de",
"role": "Developer"
},
{
"name": "Sebastian Heuer",
"role": "Developer",
"email": "sebastian@phpeople.de"
"email": "sebastian@phpeople.de",
"role": "Developer"
},
{
"name": "Sebastian Bergmann",
"role": "Developer",
"email": "sebastian@phpunit.de"
"email": "sebastian@phpunit.de",
"role": "Developer"
}
],
"description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
@ -5441,8 +5442,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "sebastian@phpunit.de"
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "FilterIterator implementation that filters files based on a list of suffixes.",
@ -5483,8 +5484,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "sebastian@phpunit.de"
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "Simple template engine.",
@ -5532,8 +5533,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "sebastian@phpunit.de"
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "Utility class for timing",
@ -6279,8 +6280,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "sebastian@phpunit.de"
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "Collection of value objects that represent the types of the PHP type system",
@ -6322,8 +6323,8 @@
"authors": [
{
"name": "Sebastian Bergmann",
"role": "lead",
"email": "sebastian@phpunit.de"
"email": "sebastian@phpunit.de",
"role": "lead"
}
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
@ -6972,8 +6973,8 @@
"authors": [
{
"name": "Arne Blankerts",
"role": "Developer",
"email": "arne@blankerts.de"
"email": "arne@blankerts.de",
"role": "Developer"
}
],
"description": "A small library for converting tokenized PHP source code into XML and potentially other formats",

4
libraries/src/Installer/Adapter/LanguageAdapter.php
View File

@ -124,10 +124,6 @@ class LanguageAdapter extends InstallerAdapter
$count = 0;
// Declare parameters before binding.
$userId = 0;
$registry = '';
// Prepare the query.
$query = $db->getQuery(true)
->update($db->quoteName('#__users'))