mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 01:25:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated composer dependencies and fixed a bug which caused infinite recursion...

Browse source
This commit is contained in:
Jan Böhmer 2021-01-03 20:34:58 +01:00
parent bb8c49df16
commit 40eefdbf1b
3 changed files with 2053 additions and 1357 deletions
Download patch file Download diff file Expand all files Collapse all files

3392
composer.lock generated
View file

File diff suppressed because it is too large Load diff

12
src/EventSubscriber/LogSystem/LogDBMigrationSubscriber.php
View file

@ -58,12 +58,12 @@ class LogDBMigrationSubscriber implements EventSubscriber
protected $new_version = null; protected $new_version = null;
protected $eventLogger; protected $eventLogger;
protected $aliasResolver; protected $dependencyFactory;
public function __construct(EventLogger $eventLogger, DependencyFactory $dependencyFactory) public function __construct(EventLogger $eventLogger, DependencyFactory $dependencyFactory)
{ {
$this->eventLogger = $eventLogger; $this->eventLogger = $eventLogger;
$this->aliasResolver = $dependencyFactory->getVersionAliasResolver(); $this->dependencyFactory = $dependencyFactory;
} }
public function onMigrationsMigrated(MigrationsEventArgs $args): void public function onMigrationsMigrated(MigrationsEventArgs $args): void
@ -73,6 +73,8 @@ class LogDBMigrationSubscriber implements EventSubscriber
return; return;
} }
$aliasResolver = $this->dependencyFactory->getVersionAliasResolver();
//Save the version after the migration //Save the version after the migration
//$this->new_version = $args->getMigratorConfiguration()->getCurrentVersion(); //$this->new_version = $args->getMigratorConfiguration()->getCurrentVersion();
$this->new_version = (string) $this->aliasResolver->resolveVersionAlias('current'); $this->new_version = (string) $this->aliasResolver->resolveVersionAlias('current');
@ -83,7 +85,7 @@ class LogDBMigrationSubscriber implements EventSubscriber
try { try {
$log = new DatabaseUpdatedLogEntry($this->old_version, $this->new_version); $log = new DatabaseUpdatedLogEntry($this->old_version, $this->new_version);
$this->eventLogger->logAndFlush($log); //$this->eventLogger->logAndFlush($log);
} catch (\Throwable $exception) { } catch (\Throwable $exception) {
//Ignore any exception occuring here... //Ignore any exception occuring here...
} }
@ -93,8 +95,10 @@ class LogDBMigrationSubscriber implements EventSubscriber
{ {
// Save the version before any migration // Save the version before any migration
if (null === $this->old_version) { if (null === $this->old_version) {
$aliasResolver = $this->dependencyFactory->getVersionAliasResolver();
//$this->old_version = $args->getConfiguration()->getCurrentVersion(); //$this->old_version = $args->getConfiguration()->getCurrentVersion();
$this->old_version = (string) $this->aliasResolver->resolveVersionAlias('current'); $this->old_version = (string) $aliasResolver->resolveVersionAlias('current');
} }
} }

6
symfony.lock
View file

@ -705,6 +705,9 @@
"symfony/property-info": { "symfony/property-info": {
"version": "v4.2.3" "version": "v4.2.3"
}, },
"symfony/proxy-manager-bridge": {
"version": "v5.2.1"
},
"symfony/routing": { "symfony/routing": {
"version": "5.1", "version": "5.1",
"recipe": { "recipe": {
@ -876,6 +879,9 @@
"symplify/smart-file-system": { "symplify/smart-file-system": {
"version": "v7.1.3" "version": "v7.1.3"
}, },
"symplify/symplify-kernel": {
"version": "8.3.48"
},
"tecnickcom/tc-lib-barcode": { "tecnickcom/tc-lib-barcode": {
"version": "1.15.20" "version": "1.15.20"
}, },