danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Daniil Gentili 2018-02-20 11:25:25 +00:00 committed by StyleCI Bot
parent 38e5b6151a
commit e58e99a37a
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makephar.php
View File

@ -12,17 +12,18 @@ If not, see <http://www.gnu.org/licenses/>.
*/ */
require 'vendor/autoload.php'; require 'vendor/autoload.php';
use \Spatie\Php7to5\DirectoryConverter; use Spatie\Php7to5\DirectoryConverter;
function rimraf($dir) { function rimraf($dir)
{
if (is_dir($dir)) { if (is_dir($dir)) {
$objects = scandir($dir); $objects = scandir($dir);
foreach ($objects as $object) { foreach ($objects as $object) {
if ($object != "." && $object != "..") { if ($object != '.' && $object != '..') {
if (is_dir($dir."/".$object)) { if (is_dir($dir.'/'.$object)) {
rimraf($dir."/".$object); rimraf($dir.'/'.$object);
} else { } else {
unlink($dir."/".$object); unlink($dir.'/'.$object);
} }
} }
} }

1
src/danog/MadelineProto/API.php
View File

@ -34,6 +34,7 @@ class API extends APIFactory
$realpaths['lockfile'] = fopen($realpaths['lockfile'], 'r'); $realpaths['lockfile'] = fopen($realpaths['lockfile'], 'r');
\danog\MadelineProto\Logger::log(['Waiting for shared lock of serialization lockfile...']); \danog\MadelineProto\Logger::log(['Waiting for shared lock of serialization lockfile...']);
flock($realpaths['lockfile'], LOCK_SH); flock($realpaths['lockfile'], LOCK_SH);
try { try {
$unserialized = file_get_contents($realpaths['file']); $unserialized = file_get_contents($realpaths['file']);
} finally { } finally {

4
src/danog/MadelineProto/Connection.php
View File

@ -161,7 +161,9 @@ class Connection
if ($this->parsed['host'][0] === '[') { if ($this->parsed['host'][0] === '[') {
$this->parsed['host'] = substr($this->parsed['host'], 1, -1); $this->parsed['host'] = substr($this->parsed['host'], 1, -1);
} }
if ($this->protocol === 'https' && $proxy === '\Socket') $proxy = '\FSocket'; if ($this->protocol === 'https' && $proxy === '\Socket') {
$proxy = '\FSocket';
}
$this->sock = new $proxy($ipv6 ? \AF_INET6 : \AF_INET, \SOCK_STREAM, $this->protocol === 'https' ? PHP_INT_MAX : getprotobyname('tcp')); $this->sock = new $proxy($ipv6 ? \AF_INET6 : \AF_INET, \SOCK_STREAM, $this->protocol === 'https' ? PHP_INT_MAX : getprotobyname('tcp'));
if ($has_proxy && $this->extra !== []) { if ($has_proxy && $this->extra !== []) {
$this->sock->setExtra($this->extra); $this->sock->setExtra($this->extra);

5
src/danog/MadelineProto/Serialization.php
View File

@ -31,10 +31,12 @@ class Serialization
} }
} }
public static function realpaths($file) { public static function realpaths($file)
{
if ($file[0] !== '/') { if ($file[0] !== '/') {
$file = getcwd().'/'.$file; $file = getcwd().'/'.$file;
} }
return ['file' => $file, 'lockfile' => $file.'.lock', 'tempfile' => $file.'.temp.session']; return ['file' => $file, 'lockfile' => $file.'.lock', 'tempfile' => $file.'.temp.session'];
} }
@ -95,6 +97,7 @@ class Serialization
\danog\MadelineProto\Logger::log(['Waiting for shared lock of serialization lockfile...']); \danog\MadelineProto\Logger::log(['Waiting for shared lock of serialization lockfile...']);
flock($realpaths['lockfile'], LOCK_SH); flock($realpaths['lockfile'], LOCK_SH);
try { try {
$unserialized = file_get_contents($realpaths['file']); $unserialized = file_get_contents($realpaths['file']);
} finally { } finally {