mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-25 10:09:20 +03:00
This commit updates the SnappyMail integration app for Nextcloud to support version 32 and the upcoming version 33. Key changes: - Updated `info.xml` to allow `max-version="33"`. - Refactored `AdminSettings`, `Application`, `FetchController`, `PageController`, `Settings` (command), and `InstallStep` to use Dependency Injection instead of the deprecated `\OC::$server` service container. - Replaced deprecated `OC_User`, `OC_Util` (e.g. `addScript`), and `OC_App` calls with their `OCP` (public API) counterparts or modern equivalents. - Updated `SnappyMailHelper` to use `\OCP\Server::get()` for static context access where DI is not possible. - Moved script and style registration from Controllers (using deprecated `Util::addScript`) to templates using `script()` and `style()` helpers. - Updated `Settings` console command to extend `Symfony\Component\Console\Command\Command` instead of deprecated `OC\Core\Command\Base`. - Addressed PHP 8.4+ compatibility by adding explicit property types and nullable types where necessary in the integration code. Co-authored-by: nextgen-networks <21206978+nextgen-networks@users.noreply.github.com>
125 lines
2.9 KiB
PHP
125 lines
2.9 KiB
PHP
<?php
|
|
|
|
/*
|
|
* This file is part of the Predis package.
|
|
*
|
|
* (c) 2009-2020 Daniele Alessandri
|
|
* (c) 2021-2023 Till Krüss
|
|
*
|
|
* For the full copyright and license information, please view the LICENSE
|
|
* file that was distributed with this source code.
|
|
*/
|
|
|
|
namespace Predis\Connection;
|
|
|
|
use InvalidArgumentException;
|
|
use Predis\Command\CommandInterface;
|
|
use Predis\Protocol\ProtocolProcessorInterface;
|
|
use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
|
|
|
|
/**
|
|
* Connection abstraction to Redis servers based on PHP's stream that uses an
|
|
* external protocol processor defining the protocol used for the communication.
|
|
*/
|
|
class CompositeStreamConnection extends StreamConnection implements CompositeConnectionInterface
|
|
{
|
|
protected $protocol;
|
|
|
|
/**
|
|
* @param ParametersInterface $parameters Initialization parameters for the connection.
|
|
* @param ProtocolProcessorInterface $protocol Protocol processor.
|
|
*/
|
|
public function __construct(
|
|
ParametersInterface $parameters,
|
|
ProtocolProcessorInterface $protocol = null
|
|
) {
|
|
$this->parameters = $this->assertParameters($parameters);
|
|
$this->protocol = $protocol ?: new TextProtocolProcessor();
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function getProtocol()
|
|
{
|
|
return $this->protocol;
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function writeBuffer($buffer)
|
|
{
|
|
$this->write($buffer);
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function readBuffer($length)
|
|
{
|
|
if ($length <= 0) {
|
|
throw new InvalidArgumentException('Length parameter must be greater than 0.');
|
|
}
|
|
|
|
$value = '';
|
|
$socket = $this->getResource();
|
|
|
|
do {
|
|
$chunk = fread($socket, $length);
|
|
|
|
if ($chunk === false || $chunk === '') {
|
|
$this->onConnectionError('Error while reading bytes from the server.');
|
|
}
|
|
|
|
$value .= $chunk;
|
|
} while (($length -= strlen($chunk)) > 0);
|
|
|
|
return $value;
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function readLine()
|
|
{
|
|
$value = '';
|
|
$socket = $this->getResource();
|
|
|
|
do {
|
|
$chunk = fgets($socket);
|
|
|
|
if ($chunk === false || $chunk === '') {
|
|
$this->onConnectionError('Error while reading line from the server.');
|
|
}
|
|
|
|
$value .= $chunk;
|
|
} while (substr($value, -2) !== "\r\n");
|
|
|
|
return substr($value, 0, -2);
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function writeRequest(CommandInterface $command)
|
|
{
|
|
$this->protocol->write($this, $command);
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function read()
|
|
{
|
|
return $this->protocol->read($this);
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function __sleep()
|
|
{
|
|
return array_merge(parent::__sleep(), ['protocol']);
|
|
}
|
|
}
|