From fdfe7a92e922eaf5cad83912499758b9e8e4e1b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= Date: Sun, 25 Aug 2024 16:03:42 -0300 Subject: [PATCH] Upgrade phpmyadmin/sql-parser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Upgrading phpmyadmin/sql-parser (dev-master 3bc8d0d => dev-master f2bafbb) - Upgrading roave/security-advisories (dev-latest 8938260 => dev-latest f8de2a8) Signed-off-by: Maurício Meneghini Fauth --- composer.lock | 18 ++++---- tests/unit/Display/ResultsTest.php | 72 +++++++++++++++--------------- tests/unit/SqlTest.php | 2 +- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/composer.lock b/composer.lock index 7ae11d4b5d..fe64c08f52 100644 --- a/composer.lock +++ b/composer.lock @@ -454,12 +454,12 @@ "source": { "type": "git", "url": "https://github.com/phpmyadmin/sql-parser.git", - "reference": "3bc8d0dde4daaee6d074349655a248f3ee88937b" + "reference": "f2bafbbe3160926b6e2a773bae790df4cd76ea9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/3bc8d0dde4daaee6d074349655a248f3ee88937b", - "reference": "3bc8d0dde4daaee6d074349655a248f3ee88937b", + "url": "https://api.github.com/repos/phpmyadmin/sql-parser/zipball/f2bafbbe3160926b6e2a773bae790df4cd76ea9f", + "reference": "f2bafbbe3160926b6e2a773bae790df4cd76ea9f", "shasum": "" }, "require": { @@ -538,7 +538,7 @@ "type": "other" } ], - "time": "2024-08-01T00:10:53+00:00" + "time": "2024-08-25T18:42:36+00:00" }, { "name": "psr/cache", @@ -5738,12 +5738,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8938260885863ec2dd9f2aaf9a79ba14e58a92f6" + "reference": "f8de2a81061775002d96aea80b12f2ab3c5eeb8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8938260885863ec2dd9f2aaf9a79ba14e58a92f6", - "reference": "8938260885863ec2dd9f2aaf9a79ba14e58a92f6", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/f8de2a81061775002d96aea80b12f2ab3c5eeb8d", + "reference": "f8de2a81061775002d96aea80b12f2ab3c5eeb8d", "shasum": "" }, "conflict": { @@ -5954,7 +5954,7 @@ "friendsoftypo3/mediace": ">=7.6.2,<7.6.5", "friendsoftypo3/openid": ">=4.5,<4.5.31|>=4.7,<4.7.16|>=6,<6.0.11|>=6.1,<6.1.6", "froala/wysiwyg-editor": "<3.2.7|>=4.0.1,<=4.1.3", - "froxlor/froxlor": "<2.1.9", + "froxlor/froxlor": "<=2.2.0.0-RC3", "frozennode/administrator": "<=5.0.12", "fuel/core": "<1.8.1", "funadmin/funadmin": "<=3.2|>=3.3.2,<=3.3.3", @@ -6547,7 +6547,7 @@ "type": "tidelift" } ], - "time": "2024-08-19T21:04:39+00:00" + "time": "2024-08-23T19:04:38+00:00" }, { "name": "sebastian/cli-parser", diff --git a/tests/unit/Display/ResultsTest.php b/tests/unit/Display/ResultsTest.php index 93027d9245..a57b7c51f0 100644 --- a/tests/unit/Display/ResultsTest.php +++ b/tests/unit/Display/ResultsTest.php @@ -1229,13 +1229,13 @@ class ResultsTest extends AbstractTestCase [ 'column_name' => 'id', 'order_link' => 'id' . '' . '' . "\n" . '', 'comments' => '', 'is_browse_pointer_enabled' => true, @@ -1256,13 +1256,13 @@ class ResultsTest extends AbstractTestCase [ 'column_name' => 'name', 'order_link' => 'name' . '' . '' . "\n" . '', 'comments' => '', 'is_browse_pointer_enabled' => true, @@ -1283,15 +1283,15 @@ class ResultsTest extends AbstractTestCase [ 'column_name' => 'datetimefield', 'order_link' => 'datetimefield' . '' . '' . "\n" . '', 'comments' => '', 'is_browse_pointer_enabled' => true, @@ -1345,17 +1345,17 @@ class ResultsTest extends AbstractTestCase ], 'options' => [ [ - 'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` ASC', + 'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` ASC', 'content' => 'PRIMARY (ASC)', 'is_selected' => false, ], [ - 'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` DESC', + 'value' => 'SELECT * FROM `test_db`.`test_table` ORDER BY `id` DESC', 'content' => 'PRIMARY (DESC)', 'is_selected' => false, ], [ - 'value' => 'SELECT * FROM `test_db`.`test_table` ', + 'value' => 'SELECT * FROM `test_db`.`test_table`', 'content' => 'None', 'is_selected' => true, ], @@ -1524,13 +1524,13 @@ class ResultsTest extends AbstractTestCase 'column_name' => 'Rows', 'order_link' => 'Rows', 'comments' => '', 'is_browse_pointer_enabled' => true, @@ -1553,15 +1553,15 @@ class ResultsTest extends AbstractTestCase 'column_name' => 'name', 'order_link' => 'name Ascending Descending 1' . "\n" . '', 'comments' => '', 'is_browse_pointer_enabled' => true, diff --git a/tests/unit/SqlTest.php b/tests/unit/SqlTest.php index 7156cf33ac..1b099b1266 100644 --- a/tests/unit/SqlTest.php +++ b/tests/unit/SqlTest.php @@ -82,7 +82,7 @@ class SqlTest extends AbstractTestCase $GLOBALS['_SESSION']['tmpval']['pos'] = 1; $GLOBALS['_SESSION']['tmpval']['max_rows'] = 2; - self::assertSame('SELECT * FROM test LIMIT 1, 2 ', $this->callFunction( + self::assertSame('SELECT * FROM test LIMIT 1, 2', $this->callFunction( $this->sql, Sql::class, 'getSqlWithLimitClause',