Commit28c73f8

authored and

committed

[Console] Add a way to use custom lock factory in lockableTrait

1 parent272f021 commit28c73f8Copy full SHA for 28c73f8

File tree

+62

-5

lines changed

+62

-5

lines changed

Lines changed: 11 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,8 @@ trait LockableTrait`
`26`	`26`	`{`
`27`	`27`	`private ?LockInterface$lock =null;`
`28`	`28`
	`29`	`+private ?LockFactory$lockFactory =null;`
	`30`	`+`
`29`	`31`	`/**`
`30`	`32`	`* Locks a command.`
`31`	`33`	`*/`
`@@ -39,13 +41,17 @@ private function lock(?string $name = null, bool $blocking = false): bool`
`39`	`41`	`thrownewLogicException('A lock is already in place.');`
`40`	`42`	`}`
`41`	`43`
`42`		`-if (SemaphoreStore::isSupported()) {`
`43`		`-$store =newSemaphoreStore();`
`44`		`- }else {`
`45`		`-$store =newFlockStore();`
	`44`	`+if (null ===$this->lockFactory) {`
	`45`	`+if (SemaphoreStore::isSupported()) {`
	`46`	`+$store =newSemaphoreStore();`
	`47`	`+ }else {`
	`48`	`+$store =newFlockStore();`
	`49`	`+ }`
	`50`	`+`
	`51`	`+$this->lockFactory = (newLockFactory($store));`
`46`	`52`	`}`
`47`	`53`
`48`		`-$this->lock =(newLockFactory($store))->createLock($name ?:$this->getName());`
	`54`	`+$this->lock =$this->lockFactory->createLock($name ?:$this->getName());`
`49`	`55`	`if (!$this->lock->acquire($blocking)) {`
`50`	`56`	`$this->lock =null;`
`51`	`57`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`usePHPUnit\Framework\TestCase;`
`15`	`15`	`useSymfony\Component\Console\Tester\CommandTester;`
`16`	`16`	`useSymfony\Component\Lock\LockFactory;`
	`17`	`+useSymfony\Component\Lock\SharedLockInterface;`
`17`	`18`	`useSymfony\Component\Lock\Store\FlockStore;`
`18`	`19`	`useSymfony\Component\Lock\Store\SemaphoreStore;`
`19`	`20`
`@@ -26,6 +27,7 @@ public static function setUpBeforeClass(): void`
`26`	`27`	`self::$fixturesPath =__DIR__.'/../Fixtures/';`
`27`	`28`	`require_onceself::$fixturesPath.'/FooLockCommand.php';`
`28`	`29`	`require_onceself::$fixturesPath.'/FooLock2Command.php';`
	`30`	`+require_onceself::$fixturesPath.'/FooLock3Command.php';`
`29`	`31`	`}`
`30`	`32`
`31`	`33`	`publicfunctiontestLockIsReleased()`
`@@ -64,4 +66,18 @@ public function testMultipleLockCallsThrowLogicException()`
`64`	`66`	`$tester =newCommandTester($command);`
`65`	`67`	`$this->assertSame(1,$tester->execute([]));`
`66`	`68`	`}`
	`69`	`+`
	`70`	`+publicfunctiontestCustomLockFactoryIsUsed()`
	`71`	`+ {`
	`72`	`+$lockFactory =$this->createMock(LockFactory::class);`
	`73`	`+$command =new \FooLock3Command($lockFactory);`
	`74`	`+`
	`75`	`+$tester =newCommandTester($command);`
	`76`	`+`
	`77`	`+$lock =$this->createMock(SharedLockInterface::class);`
	`78`	`+$lock->method('acquire')->willReturn(false);`
	`79`	`+`
	`80`	`+$lockFactory->expects(static::once())->method('createLock')->willReturn($lock);`
	`81`	`+$this->assertSame(1,$tester->execute([]));`
	`82`	`+ }`
`67`	`83`	`}`

Lines changed: 35 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,35 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+useSymfony\Component\Console\Command\Command;`
	`4`	`+useSymfony\Component\Console\Command\LockableTrait;`
	`5`	`+useSymfony\Component\Console\Input\InputInterface;`
	`6`	`+useSymfony\Component\Console\Output\OutputInterface;`
	`7`	`+useSymfony\Component\Lock\LockFactory;`
	`8`	`+`
	`9`	`+class FooLock3Commandextends Command`
	`10`	`+{`
	`11`	`+use LockableTrait;`
	`12`	`+`
	`13`	`+publicfunction__construct(LockFactory$lockFactory)`
	`14`	`+ {`
	`15`	`+parent::__construct();`
	`16`	`+`
	`17`	`+$this->lockFactory =$lockFactory;`
	`18`	`+ }`
	`19`	`+`
	`20`	`+protectedfunctionconfigure():void`
	`21`	`+ {`
	`22`	`+$this->setName('foo:lock3');`
	`23`	`+ }`
	`24`	`+`
	`25`	`+protectedfunctionexecute(InputInterface$input,OutputInterface$output):int`
	`26`	`+ {`
	`27`	`+if (!$this->lock()) {`
	`28`	`+return1;`
	`29`	`+ }`
	`30`	`+`
	`31`	`+$this->release();`
	`32`	`+`
	`33`	`+return2;`
	`34`	`+ }`
	`35`	`+}`

Comments

(0)