diff options
| -rw-r--r-- | composer.json | 3 | ||||
| -rw-r--r-- | composer.lock | 16 | ||||
| -rw-r--r-- | tests/MockGlobalFunctions.php | 25 | ||||
| -rw-r--r-- | tests/app/Census/CensusColumnRelationToHeadTest.php | 8 |
4 files changed, 15 insertions, 37 deletions
diff --git a/composer.json b/composer.json index f6c0764572..046e2b04cf 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,6 @@ "autoload-dev": { "classmap": [ "tests/TestCase.php", - "tests/MockGlobalFunctions.php", "tests/app/Elements/AbstractElementTestCase.php" ] }, @@ -32,7 +31,7 @@ } }, "require": { - "php": "8.3 - 8.4", + "php": "8.3 - 8.5", "ext-ctype": "*", "ext-curl": "*", "ext-gd": "*", diff --git a/composer.lock b/composer.lock index 9b45fb59d3..535a12b199 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "594a516f5c1857ec10ca30be5f439f4f", + "content-hash": "667992bbe05e1d897b6d7a77eca6dce0", "packages": [ { "name": "aura/router", @@ -5712,16 +5712,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.1", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" + "reference": "024473a478be9df5fdaca2c793f2232fe788e414" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", - "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/024473a478be9df5fdaca2c793f2232fe788e414", + "reference": "024473a478be9df5fdaca2c793f2232fe788e414", "shasum": "" }, "require": { @@ -5760,7 +5760,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.0" }, "funding": [ { @@ -5768,7 +5768,7 @@ "type": "tidelift" } ], - "time": "2024-11-08T17:47:46+00:00" + "time": "2025-02-12T12:17:51+00:00" }, { "name": "nikic/php-parser", @@ -7981,7 +7981,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "8.3 - 8.4", + "php": "8.3 - 8.5", "ext-ctype": "*", "ext-curl": "*", "ext-gd": "*", diff --git a/tests/MockGlobalFunctions.php b/tests/MockGlobalFunctions.php deleted file mode 100644 index 2bba1bf940..0000000000 --- a/tests/MockGlobalFunctions.php +++ /dev/null @@ -1,25 +0,0 @@ -<?php - -/** - * webtrees: online genealogy - * Copyright (C) 2025 webtrees development team - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <https://www.gnu.org/licenses/>. - */ - -declare(strict_types=1); - -namespace Fisharebest\Webtrees; - -abstract class MockGlobalFunctions -{ - abstract public function iniGet(string $varname): string; -} diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php index fb02ce3f08..4b2a2ffeb3 100644 --- a/tests/app/Census/CensusColumnRelationToHeadTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadTest.php @@ -27,14 +27,18 @@ use PHPUnit\Framework\Attributes\CoversClass; #[CoversClass(AbstractCensusColumn::class)] class CensusColumnRelationToHeadTest extends TestCase { + protected static bool $uses_database = true; + public function testNull(): void { - $individual = $this->createMock(Individual::class); + $individual1 = $this->createMock(Individual::class); + $individual2 = $this->createMock(Individual::class); $census = $this->createMock(CensusInterface::class); $column = new CensusColumnRelationToHead($census, '', ''); - self::assertSame('-', $column->generate($individual, $individual)); + self::assertSame('-', $column->generate($individual1, $individual1)); + self::assertSame('', $column->generate($individual1, $individual2)); } } |