Removed the semaphore size from the key

lyrixx · lyrixx · commit 14e6f376883d · 2020-03-19T17:43:54.000+01:00
diff --git a/src/Symfony/Component/Semaphore/Key.php b/src/Symfony/Component/Semaphore/Key.php
@@ -47,7 +47,7 @@ public function __construct(string $resource, int $limit, int $weight = 1)
 
     public function __toString(): string
     {
-        return $this->resource.':'.$this->limit;
+        return $this->resource;
     }
 
     public function getLimit(): int
diff --git a/src/Symfony/Component/Semaphore/Tests/SemaphoreTest.php b/src/Symfony/Component/Semaphore/Tests/SemaphoreTest.php
@@ -73,7 +73,7 @@ public function testAcquireThrowException()
         ;
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Failed to acquire the "key:1" semaphore.');
+        $this->expectExceptionMessage('Failed to acquire the "key" semaphore.');
 
         $semaphore->acquire();
     }
@@ -124,7 +124,7 @@ public function testRefreshWhenItFails()
         ;
 
         $this->expectException(SemaphoreExpiredException::class);
-        $this->expectExceptionMessage('The semaphore "key:1" has expired: message.');
+        $this->expectExceptionMessage('The semaphore "key" has expired: message.');
 
         $semaphore->refresh();
     }
@@ -143,7 +143,7 @@ public function testRefreshWhenItFailsHard()
         ;
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Failed to define an expiration for the "key:1" semaphore.');
+        $this->expectExceptionMessage('Failed to define an expiration for the "key" semaphore.');
 
         $semaphore->refresh();
     }
@@ -177,7 +177,7 @@ public function testReleaseWhenItFails()
         ;
 
         $this->expectException(SemaphoreReleasingException::class);
-        $this->expectExceptionMessage('The semaphore "key:1" could not be released: message.');
+        $this->expectExceptionMessage('The semaphore "key" could not be released: message.');
 
         $semaphore->release();
     }
@@ -196,7 +196,7 @@ public function testReleaseWhenItFailsHard()
         ;
 
         $this->expectException(RuntimeException::class);
-        $this->expectExceptionMessage('Failed to release the "key:1" semaphore.');
+        $this->expectExceptionMessage('Failed to release the "key" semaphore.');
 
         $semaphore->release();
     }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(string $resource, int $limit, int $weight = 1)`
`47`	`47`
`48`	`48`	`public function __toString(): string`
`49`	`49`	`{`
`50`		`- return $this->resource.':'.$this->limit;`
	`50`	`+ return $this->resource;`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public function getLimit(): int`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function testAcquireThrowException()`
`73`	`73`	`;`
`74`	`74`
`75`	`75`	`$this->expectException(RuntimeException::class);`
`76`		`- $this->expectExceptionMessage('Failed to acquire the "key:1" semaphore.');`
	`76`	`+ $this->expectExceptionMessage('Failed to acquire the "key" semaphore.');`
`77`	`77`
`78`	`78`	`$semaphore->acquire();`
`79`	`79`	`}`
`@@ -124,7 +124,7 @@ public function testRefreshWhenItFails()`
`124`	`124`	`;`
`125`	`125`
`126`	`126`	`$this->expectException(SemaphoreExpiredException::class);`
`127`		`- $this->expectExceptionMessage('The semaphore "key:1" has expired: message.');`
	`127`	`+ $this->expectExceptionMessage('The semaphore "key" has expired: message.');`
`128`	`128`
`129`	`129`	`$semaphore->refresh();`
`130`	`130`	`}`
`@@ -143,7 +143,7 @@ public function testRefreshWhenItFailsHard()`
`143`	`143`	`;`
`144`	`144`
`145`	`145`	`$this->expectException(RuntimeException::class);`
`146`		`- $this->expectExceptionMessage('Failed to define an expiration for the "key:1" semaphore.');`
	`146`	`+ $this->expectExceptionMessage('Failed to define an expiration for the "key" semaphore.');`
`147`	`147`
`148`	`148`	`$semaphore->refresh();`
`149`	`149`	`}`
`@@ -177,7 +177,7 @@ public function testReleaseWhenItFails()`
`177`	`177`	`;`
`178`	`178`
`179`	`179`	`$this->expectException(SemaphoreReleasingException::class);`
`180`		`- $this->expectExceptionMessage('The semaphore "key:1" could not be released: message.');`
	`180`	`+ $this->expectExceptionMessage('The semaphore "key" could not be released: message.');`
`181`	`181`
`182`	`182`	`$semaphore->release();`
`183`	`183`	`}`
`@@ -196,7 +196,7 @@ public function testReleaseWhenItFailsHard()`
`196`	`196`	`;`
`197`	`197`
`198`	`198`	`$this->expectException(RuntimeException::class);`
`199`		`- $this->expectExceptionMessage('Failed to release the "key:1" semaphore.');`
	`199`	`+ $this->expectExceptionMessage('Failed to release the "key" semaphore.');`
`200`	`200`
`201`	`201`	`$semaphore->release();`
`202`	`202`	`}`