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>
85 lines
2.1 KiB
PHP
85 lines
2.1 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;
|
|
|
|
use Exception;
|
|
use Predis\Connection\NodeConnectionInterface;
|
|
|
|
/**
|
|
* Base exception class for network-related errors.
|
|
*/
|
|
abstract class CommunicationException extends PredisException
|
|
{
|
|
private $connection;
|
|
|
|
/**
|
|
* @param NodeConnectionInterface $connection Connection that generated the exception.
|
|
* @param string $message Error message.
|
|
* @param int $code Error code.
|
|
* @param Exception|null $innerException Inner exception for wrapping the original error.
|
|
*/
|
|
public function __construct(
|
|
NodeConnectionInterface $connection,
|
|
$message = '',
|
|
$code = 0,
|
|
Exception $innerException = null
|
|
) {
|
|
parent::__construct(
|
|
is_null($message) ? '' : $message,
|
|
is_null($code) ? 0 : $code,
|
|
$innerException
|
|
);
|
|
|
|
$this->connection = $connection;
|
|
}
|
|
|
|
/**
|
|
* Gets the connection that generated the exception.
|
|
*
|
|
* @return NodeConnectionInterface
|
|
*/
|
|
public function getConnection()
|
|
{
|
|
return $this->connection;
|
|
}
|
|
|
|
/**
|
|
* Indicates if the receiver should reset the underlying connection.
|
|
*
|
|
* @return bool
|
|
*/
|
|
public function shouldResetConnection()
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Helper method to handle exceptions generated by a connection object.
|
|
*
|
|
* @param CommunicationException $exception Exception.
|
|
*
|
|
* @throws CommunicationException
|
|
*/
|
|
public static function handle(CommunicationException $exception)
|
|
{
|
|
if ($exception->shouldResetConnection()) {
|
|
$connection = $exception->getConnection();
|
|
|
|
if ($connection->isConnected()) {
|
|
$connection->disconnect();
|
|
}
|
|
}
|
|
|
|
throw $exception;
|
|
}
|
|
}
|