Remove Filesystem\LockHandler
This commit is contained in:
parent
545df8f205
commit
39ab789ce3
@ -1,6 +1,11 @@
|
|||||||
CHANGELOG
|
CHANGELOG
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
4.0.0
|
||||||
|
-----
|
||||||
|
|
||||||
|
* removed `LockHandler`
|
||||||
|
|
||||||
3.3.0
|
3.3.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
|
@ -1,115 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This file is part of the Symfony package.
|
|
||||||
*
|
|
||||||
* (c) Fabien Potencier <fabien@symfony.com>
|
|
||||||
*
|
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Symfony\Component\Filesystem;
|
|
||||||
|
|
||||||
use Symfony\Component\Filesystem\Exception\IOException;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* LockHandler class provides a simple abstraction to lock anything by means of
|
|
||||||
* a file lock.
|
|
||||||
*
|
|
||||||
* A locked file is created based on the lock name when calling lock(). Other
|
|
||||||
* lock handlers will not be able to lock the same name until it is released
|
|
||||||
* (explicitly by calling release() or implicitly when the instance holding the
|
|
||||||
* lock is destroyed).
|
|
||||||
*
|
|
||||||
* @author Grégoire Pineau <lyrixx@lyrixx.info>
|
|
||||||
* @author Romain Neutron <imprec@gmail.com>
|
|
||||||
* @author Nicolas Grekas <p@tchwork.com>
|
|
||||||
*/
|
|
||||||
class LockHandler
|
|
||||||
{
|
|
||||||
private $file;
|
|
||||||
private $handle;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param string $name The lock name
|
|
||||||
* @param string|null $lockPath The directory to store the lock. Default values will use temporary directory
|
|
||||||
*
|
|
||||||
* @throws IOException If the lock directory could not be created or is not writable
|
|
||||||
*/
|
|
||||||
public function __construct($name, $lockPath = null)
|
|
||||||
{
|
|
||||||
$lockPath = $lockPath ?: sys_get_temp_dir();
|
|
||||||
|
|
||||||
if (!is_dir($lockPath)) {
|
|
||||||
$fs = new Filesystem();
|
|
||||||
$fs->mkdir($lockPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!is_writable($lockPath)) {
|
|
||||||
throw new IOException(sprintf('The directory "%s" is not writable.', $lockPath), 0, null, $lockPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->file = sprintf('%s/sf.%s.%s.lock', $lockPath, preg_replace('/[^a-z0-9\._-]+/i', '-', $name), hash('sha256', $name));
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lock the resource.
|
|
||||||
*
|
|
||||||
* @param bool $blocking wait until the lock is released
|
|
||||||
*
|
|
||||||
* @return bool Returns true if the lock was acquired, false otherwise
|
|
||||||
*
|
|
||||||
* @throws IOException If the lock file could not be created or opened
|
|
||||||
*/
|
|
||||||
public function lock($blocking = false)
|
|
||||||
{
|
|
||||||
if ($this->handle) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
$error = null;
|
|
||||||
|
|
||||||
// Silence error reporting
|
|
||||||
set_error_handler(function ($errno, $msg) use (&$error) {
|
|
||||||
$error = $msg;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!$this->handle = fopen($this->file, 'r')) {
|
|
||||||
if ($this->handle = fopen($this->file, 'x')) {
|
|
||||||
chmod($this->file, 0444);
|
|
||||||
} elseif (!$this->handle = fopen($this->file, 'r')) {
|
|
||||||
usleep(100); // Give some time for chmod() to complete
|
|
||||||
$this->handle = fopen($this->file, 'r');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
restore_error_handler();
|
|
||||||
|
|
||||||
if (!$this->handle) {
|
|
||||||
throw new IOException($error, 0, null, $this->file);
|
|
||||||
}
|
|
||||||
|
|
||||||
// On Windows, even if PHP doc says the contrary, LOCK_NB works, see
|
|
||||||
// https://bugs.php.net/54129
|
|
||||||
if (!flock($this->handle, LOCK_EX | ($blocking ? 0 : LOCK_NB))) {
|
|
||||||
fclose($this->handle);
|
|
||||||
$this->handle = null;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Release the resource.
|
|
||||||
*/
|
|
||||||
public function release()
|
|
||||||
{
|
|
||||||
if ($this->handle) {
|
|
||||||
flock($this->handle, LOCK_UN | LOCK_NB);
|
|
||||||
fclose($this->handle);
|
|
||||||
$this->handle = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,141 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This file is part of the Symfony package.
|
|
||||||
*
|
|
||||||
* (c) Fabien Potencier <fabien@symfony.com>
|
|
||||||
*
|
|
||||||
* For the full copyright and license information, please view the LICENSE
|
|
||||||
* file that was distributed with this source code.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace Symfony\Component\Filesystem\Tests;
|
|
||||||
|
|
||||||
use PHPUnit\Framework\TestCase;
|
|
||||||
use Symfony\Component\Filesystem\Exception\IOException;
|
|
||||||
use Symfony\Component\Filesystem\Filesystem;
|
|
||||||
use Symfony\Component\Filesystem\LockHandler;
|
|
||||||
|
|
||||||
class LockHandlerTest extends TestCase
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* @expectedException \Symfony\Component\Filesystem\Exception\IOException
|
|
||||||
* @expectedExceptionMessage Failed to create "/a/b/c/d/e": mkdir(): Permission denied.
|
|
||||||
*/
|
|
||||||
public function testConstructWhenRepositoryDoesNotExist()
|
|
||||||
{
|
|
||||||
if (!getenv('USER') || 'root' === getenv('USER')) {
|
|
||||||
$this->markTestSkipped('This test will fail if run under superuser');
|
|
||||||
}
|
|
||||||
new LockHandler('lock', '/a/b/c/d/e');
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @expectedException \Symfony\Component\Filesystem\Exception\IOException
|
|
||||||
* @expectedExceptionMessage The directory "/" is not writable.
|
|
||||||
*/
|
|
||||||
public function testConstructWhenRepositoryIsNotWriteable()
|
|
||||||
{
|
|
||||||
if (!getenv('USER') || 'root' === getenv('USER')) {
|
|
||||||
$this->markTestSkipped('This test will fail if run under superuser');
|
|
||||||
}
|
|
||||||
new LockHandler('lock', '/');
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testErrorHandlingInLockIfLockPathBecomesUnwritable()
|
|
||||||
{
|
|
||||||
// skip test on Windows; PHP can't easily set file as unreadable on Windows
|
|
||||||
if ('\\' === DIRECTORY_SEPARATOR) {
|
|
||||||
$this->markTestSkipped('This test cannot run on Windows.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$lockPath = sys_get_temp_dir().'/'.uniqid('', true);
|
|
||||||
$e = null;
|
|
||||||
$wrongMessage = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
mkdir($lockPath);
|
|
||||||
|
|
||||||
$lockHandler = new LockHandler('lock', $lockPath);
|
|
||||||
|
|
||||||
chmod($lockPath, 0444);
|
|
||||||
|
|
||||||
$lockHandler->lock();
|
|
||||||
} catch (IOException $e) {
|
|
||||||
if (false === strpos($e->getMessage(), 'Permission denied')) {
|
|
||||||
$wrongMessage = $e->getMessage();
|
|
||||||
} else {
|
|
||||||
$this->addToAssertionCount(1);
|
|
||||||
}
|
|
||||||
} catch (\Exception $e) {
|
|
||||||
} catch (\Throwable $e) {
|
|
||||||
}
|
|
||||||
|
|
||||||
if (is_dir($lockPath)) {
|
|
||||||
$fs = new Filesystem();
|
|
||||||
$fs->remove($lockPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
$this->assertInstanceOf('Symfony\Component\Filesystem\Exception\IOException', $e, sprintf('Expected IOException to be thrown, got %s instead.', get_class($e)));
|
|
||||||
$this->assertNull($wrongMessage, sprintf('Expected exception message to contain "Permission denied", got "%s" instead.', $wrongMessage));
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testConstructSanitizeName()
|
|
||||||
{
|
|
||||||
$lock = new LockHandler('<?php echo "% hello word ! %" ?>');
|
|
||||||
|
|
||||||
$file = sprintf('%s/sf.-php-echo-hello-word-.4b3d9d0d27ddef3a78a64685dda3a963e478659a9e5240feaf7b4173a8f28d5f.lock', sys_get_temp_dir());
|
|
||||||
// ensure the file does not exist before the lock
|
|
||||||
@unlink($file);
|
|
||||||
|
|
||||||
$lock->lock();
|
|
||||||
|
|
||||||
$this->assertFileExists($file);
|
|
||||||
|
|
||||||
$lock->release();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testLockRelease()
|
|
||||||
{
|
|
||||||
$name = 'symfony-test-filesystem.lock';
|
|
||||||
|
|
||||||
$l1 = new LockHandler($name);
|
|
||||||
$l2 = new LockHandler($name);
|
|
||||||
|
|
||||||
$this->assertTrue($l1->lock());
|
|
||||||
$this->assertFalse($l2->lock());
|
|
||||||
|
|
||||||
$l1->release();
|
|
||||||
|
|
||||||
$this->assertTrue($l2->lock());
|
|
||||||
$l2->release();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testLockTwice()
|
|
||||||
{
|
|
||||||
$name = 'symfony-test-filesystem.lock';
|
|
||||||
|
|
||||||
$lockHandler = new LockHandler($name);
|
|
||||||
|
|
||||||
$this->assertTrue($lockHandler->lock());
|
|
||||||
$this->assertTrue($lockHandler->lock());
|
|
||||||
|
|
||||||
$lockHandler->release();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function testLockIsReleased()
|
|
||||||
{
|
|
||||||
$name = 'symfony-test-filesystem.lock';
|
|
||||||
|
|
||||||
$l1 = new LockHandler($name);
|
|
||||||
$l2 = new LockHandler($name);
|
|
||||||
|
|
||||||
$this->assertTrue($l1->lock());
|
|
||||||
$this->assertFalse($l2->lock());
|
|
||||||
|
|
||||||
$l1 = null;
|
|
||||||
|
|
||||||
$this->assertTrue($l2->lock());
|
|
||||||
$l2->release();
|
|
||||||
}
|
|
||||||
}
|
|
Reference in New Issue
Block a user