diff --git a/inc/lock.php b/inc/lock.php index 5a83562a..9b1522c4 100644 --- a/inc/lock.php +++ b/inc/lock.php @@ -1,84 +1,76 @@ f = $fd; + } - function __construct($fd) { - $this->f = $fd; - } + public function get(bool $nonblock = false) { + $wouldblock = false; + flock($this->f, LOCK_SH | ($nonblock ? LOCK_NB : 0), $wouldblock); + if ($nonblock && $wouldblock) { + return false; + } + return $this; + } - public function get(bool $nonblock = false): Lock|false { - $wouldblock = false; - flock($this->f, LOCK_SH | ($nonblock ? LOCK_NB : 0), $wouldblock); - if ($nonblock && $wouldblock) { - return false; - } - return $this; - } + public function get_ex(bool $nonblock = false) { + $wouldblock = false; + flock($this->f, LOCK_EX | ($nonblock ? LOCK_NB : 0), $wouldblock); + if ($nonblock && $wouldblock) { + return false; + } + return $this; + } - public function get_ex(bool $nonblock = false): Lock|false { - $wouldblock = false; - flock($this->f, LOCK_EX | ($nonblock ? LOCK_NB : 0), $wouldblock); - if ($nonblock && $wouldblock) { - return false; - } - return $this; - } + public function free() { + flock($this->f, LOCK_UN); + return $this; + } + }; + } - public function free(): Lock { - flock($this->f, LOCK_UN); - return $this; - } - }; - } + public static function none() { + return new class() implements Lock { + public function get(bool $nonblock = false) { + return $this; + } - /** - * No-op. Can be used for mocking. - */ - public static function none(): Lock|false { - return new class() implements Lock { - public function get(bool $nonblock = false): Lock|false { - return $this; - } + public function get_ex(bool $nonblock = false) { + return $this; + } - public function get_ex(bool $nonblock = false): Lock|false { - return $this; - } + public function free() { + return $this; + } + }; + } - public function free(): Lock { - return $this; - } - }; - } - - public static function get_lock(array $config, string $key): Lock|false { - if ($config['lock']['enabled'] == 'fs') { - return self::filesystem($key); - } else { - return self::none(); - } - } + public static function get_lock(array $config, string $key) { + if ($config['lock']['enabled'] == 'fs') { + return self::filesystem($key); + } else { + return self::none(); + } + } } interface Lock { - // Get a shared lock - public function get(bool $nonblock = false): Lock|false; + public function get(bool $nonblock = false); - // Get an exclusive lock - public function get_ex(bool $nonblock = false): Lock|false; + public function get_ex(bool $nonblock = false); - // Free a lock - public function free(): Lock; + public function free(); }