diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2021-03-11 10:42:58 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2021-03-11 10:46:37 +0000 |
| commit | 182e92b8057680b1580cd7e0047fed04407c1f37 (patch) | |
| tree | d26d619f8f2361c73778c9f0cd0250bdd9b753f7 /app/Http/RequestHandlers/GedcomLoad.php | |
| parent | f7cf8a155e2743f3d124eef3d30a558ab062fa4b (diff) | |
| download | webtrees-182e92b8057680b1580cd7e0047fed04407c1f37.tar.gz webtrees-182e92b8057680b1580cd7e0047fed04407c1f37.tar.bz2 webtrees-182e92b8057680b1580cd7e0047fed04407c1f37.zip | |
Remove vendor dir, add support for PHP 8.0, drop support for PHP 7.1 and 7.2
Diffstat (limited to 'app/Http/RequestHandlers/GedcomLoad.php')
| -rw-r--r-- | app/Http/RequestHandlers/GedcomLoad.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/Http/RequestHandlers/GedcomLoad.php b/app/Http/RequestHandlers/GedcomLoad.php index 08afabbb76..24bbc29d42 100644 --- a/app/Http/RequestHandlers/GedcomLoad.php +++ b/app/Http/RequestHandlers/GedcomLoad.php @@ -29,10 +29,8 @@ use Fisharebest\Webtrees\Services\TimeoutService; use Fisharebest\Webtrees\Services\TreeService; use Fisharebest\Webtrees\Tree; use Illuminate\Database\Capsule\Manager as DB; -use Illuminate\Database\DetectsDeadlocks; +use Illuminate\Database\DetectsConcurrencyErrors; use Illuminate\Database\Query\Expression; -use Illuminate\Support\Str; -use PDOException; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; @@ -55,7 +53,7 @@ use function view; class GedcomLoad implements RequestHandlerInterface { use ViewResponseTrait; - use DetectsDeadlocks; + use DetectsConcurrencyErrors; /** @var TimeoutService */ private $timeout_service; |
