diff options
| -rw-r--r-- | app/Http/Controllers/Admin/MediaController.php | 1 | ||||
| -rw-r--r-- | app/Http/Controllers/EditMediaController.php | 1 | ||||
| -rw-r--r-- | app/Http/Middleware/NoRouteFound.php | 5 | ||||
| -rw-r--r-- | app/I18N.php | 1 | ||||
| -rw-r--r-- | app/Module/RelationshipsChartModule.php | 1 | ||||
| -rw-r--r-- | app/Services/UpgradeService.php | 3 | ||||
| -rw-r--r-- | modules_v4/example-server-configuration.disable/module.php | 1 | ||||
| -rw-r--r-- | resources/views/interactive-tree-chart.phtml | 7 | ||||
| -rw-r--r-- | resources/views/modules/ancestors-chart/page.phtml | 7 | ||||
| -rw-r--r-- | tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php | 1 | ||||
| -rw-r--r-- | tests/app/Http/Controllers/Admin/MapProviderControllerTest.php | 1 | ||||
| -rw-r--r-- | tests/app/Http/Controllers/CalendarControllerTest.php | 1 | ||||
| -rw-r--r-- | tests/app/Services/SearchServiceTest.php | 3 | ||||
| -rw-r--r-- | tests/app/WebtreesTest.php | 2 |
14 files changed, 11 insertions, 24 deletions
diff --git a/app/Http/Controllers/Admin/MediaController.php b/app/Http/Controllers/Admin/MediaController.php index a42d8ff9bd..0d39412922 100644 --- a/app/Http/Controllers/Admin/MediaController.php +++ b/app/Http/Controllers/Admin/MediaController.php @@ -43,7 +43,6 @@ use function preg_match; use function str_replace; use function strpos; use function trim; -use function var_dump; use const UPLOAD_ERR_OK; /** diff --git a/app/Http/Controllers/EditMediaController.php b/app/Http/Controllers/EditMediaController.php index 4abee3d92a..011bc8ad09 100644 --- a/app/Http/Controllers/EditMediaController.php +++ b/app/Http/Controllers/EditMediaController.php @@ -40,7 +40,6 @@ use Psr\Http\Message\UploadedFileInterface; use RecursiveDirectoryIterator; use RecursiveIteratorIterator; use RuntimeException; -use Symfony\Component\HttpFoundation\File\Exception\FileException; use Symfony\Component\HttpFoundation\File\UploadedFile; use Throwable; use const UPLOAD_ERR_OK; diff --git a/app/Http/Middleware/NoRouteFound.php b/app/Http/Middleware/NoRouteFound.php index 0023c69b93..f196f5e8e7 100644 --- a/app/Http/Middleware/NoRouteFound.php +++ b/app/Http/Middleware/NoRouteFound.php @@ -17,18 +17,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\Middleware; -use Fig\Http\Message\RequestMethodInterface; use Fisharebest\Webtrees\Auth; -use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Http\ViewResponseTrait; -use Fisharebest\Webtrees\I18N; -use Fisharebest\Webtrees\Session; use Fisharebest\Webtrees\Tree; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\MiddlewareInterface; use Psr\Http\Server\RequestHandlerInterface; -use function in_array; use function redirect; use function route; diff --git a/app/I18N.php b/app/I18N.php index fdf49ef488..efea0d5bb4 100644 --- a/app/I18N.php +++ b/app/I18N.php @@ -34,7 +34,6 @@ use function filemtime; use function file_exists; use function html_entity_decode; use function in_array; -use function intdiv; use function mb_strtolower; use function mb_strtoupper; use function mb_substr; diff --git a/app/Module/RelationshipsChartModule.php b/app/Module/RelationshipsChartModule.php index 4484527f83..48037beace 100644 --- a/app/Module/RelationshipsChartModule.php +++ b/app/Module/RelationshipsChartModule.php @@ -23,7 +23,6 @@ use Fisharebest\Webtrees\Contracts\UserInterface; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\FlashMessages; use Fisharebest\Webtrees\Functions\Functions; -use Fisharebest\Webtrees\Functions\FunctionsPrint; use Fisharebest\Webtrees\I18N; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Menu; diff --git a/app/Services/UpgradeService.php b/app/Services/UpgradeService.php index 9283c5264f..f20071a7a5 100644 --- a/app/Services/UpgradeService.php +++ b/app/Services/UpgradeService.php @@ -55,9 +55,6 @@ class UpgradeService // Note: earlier versions of webtrees used svn.webtrees.net, so we must maintain both URLs. private const UPDATE_URL = 'https://dev.webtrees.net/build/latest-version.txt'; - // Create this file to put the site into maintenance mode. - private const LOCK_FILE = 'data/offline.txt'; - // If the update server doesn't respond after this time, give up. private const HTTP_TIMEOUT = 3.0; diff --git a/modules_v4/example-server-configuration.disable/module.php b/modules_v4/example-server-configuration.disable/module.php index 1649480480..94b16f939c 100644 --- a/modules_v4/example-server-configuration.disable/module.php +++ b/modules_v4/example-server-configuration.disable/module.php @@ -7,7 +7,6 @@ use Fisharebest\Webtrees\Module\ModuleCustomInterface; use Fisharebest\Webtrees\Module\ModuleCustomTrait; use Fisharebest\Webtrees\Services\ServerCheckService; use Illuminate\Database\Capsule\Manager as DB; -use function realpath; /** * An example module to modify PHP and database configuration. diff --git a/resources/views/interactive-tree-chart.phtml b/resources/views/interactive-tree-chart.phtml index 3a5a8c2f29..4e1e05061e 100644 --- a/resources/views/interactive-tree-chart.phtml +++ b/resources/views/interactive-tree-chart.phtml @@ -1,5 +1,8 @@ -<?php use Fisharebest\Webtrees\I18N; ?> -<?php use Fisharebest\Webtrees\Webtrees; ?> +<?php + +use Fisharebest\Webtrees\I18N; + +?> <div id="<?= $name ?>_out" class="tv_out"> <div id="tv_tools"> diff --git a/resources/views/modules/ancestors-chart/page.phtml b/resources/views/modules/ancestors-chart/page.phtml index 28d54e54a7..0cde25474e 100644 --- a/resources/views/modules/ancestors-chart/page.phtml +++ b/resources/views/modules/ancestors-chart/page.phtml @@ -1,5 +1,8 @@ -<?php use Fisharebest\Webtrees\I18N; ?> -<?php use Fisharebest\Webtrees\View; ?> +<?php + +use Fisharebest\Webtrees\I18N; + +?> <h2 class="wt-page-title"> <?= $title ?> diff --git a/tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php b/tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php index 76cd12f2b0..7c28edd20f 100644 --- a/tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php +++ b/tests/app/Http/Controllers/Admin/ChangesLogControllerTest.php @@ -23,7 +23,6 @@ use Fisharebest\Webtrees\Services\DatatablesService; use Fisharebest\Webtrees\Services\UserService; use Fisharebest\Webtrees\TestCase; use Fisharebest\Webtrees\Tree; -use Fisharebest\Webtrees\Http\Request; /** * Test the changes log controller diff --git a/tests/app/Http/Controllers/Admin/MapProviderControllerTest.php b/tests/app/Http/Controllers/Admin/MapProviderControllerTest.php index 16f251ea37..e4d2e4e928 100644 --- a/tests/app/Http/Controllers/Admin/MapProviderControllerTest.php +++ b/tests/app/Http/Controllers/Admin/MapProviderControllerTest.php @@ -18,7 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Http\Controllers\Admin; use Fisharebest\Webtrees\TestCase; -use Psr\Http\Message\ResponseInterface; /** * Test the changes log controller diff --git a/tests/app/Http/Controllers/CalendarControllerTest.php b/tests/app/Http/Controllers/CalendarControllerTest.php index 1a2e44293a..c4c84e47e8 100644 --- a/tests/app/Http/Controllers/CalendarControllerTest.php +++ b/tests/app/Http/Controllers/CalendarControllerTest.php @@ -22,7 +22,6 @@ use Fisharebest\Localization\Locale\LocaleEnUs; use Fisharebest\Webtrees\Services\CalendarService; use Fisharebest\Webtrees\Services\LocalizationService; use Fisharebest\Webtrees\Tree; -use Fisharebest\Webtrees\Http\Request; /** * Test the module controller diff --git a/tests/app/Services/SearchServiceTest.php b/tests/app/Services/SearchServiceTest.php index 1ffb6ad309..b61707c906 100644 --- a/tests/app/Services/SearchServiceTest.php +++ b/tests/app/Services/SearchServiceTest.php @@ -17,7 +17,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Services; -use Fisharebest\Localization\Locale\LocaleEnUs; use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; @@ -35,7 +34,7 @@ class SearchServiceTest extends TestCase */ public function testSearchesReturnCollections(): void { - $search_service = new SearchService(new LocaleEnUs()); + $search_service = new SearchService(); $tree = $this->importTree('demo.ged'); $result = $search_service->searchFamilies([$tree], ['windsor']); diff --git a/tests/app/WebtreesTest.php b/tests/app/WebtreesTest.php index a075ac742a..7cb213efa5 100644 --- a/tests/app/WebtreesTest.php +++ b/tests/app/WebtreesTest.php @@ -18,8 +18,6 @@ declare(strict_types=1); namespace Fisharebest\Webtrees; use ErrorException; -use function date_default_timezone_get; -use function date_default_timezone_set; use function error_reporting; use function set_error_handler; |
