mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-25 10:09:20 +03:00
d22f8d521d
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>
116 lines
2.9 KiB
PHP
116 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\Configuration;
|
|
|
|
/**
|
|
* Default client options container for Predis\Client.
|
|
*
|
|
* Pre-defined options have their specialized handlers that can filter, convert
|
|
* an lazily initialize values in a mini-DI container approach.
|
|
*
|
|
* {@inheritdoc}
|
|
*/
|
|
class Options implements OptionsInterface
|
|
{
|
|
/** @var array */
|
|
protected $handlers = [
|
|
'aggregate' => Option\Aggregate::class,
|
|
'cluster' => Option\Cluster::class,
|
|
'replication' => Option\Replication::class,
|
|
'connections' => Option\Connections::class,
|
|
'commands' => Option\Commands::class,
|
|
'exceptions' => Option\Exceptions::class,
|
|
'prefix' => Option\Prefix::class,
|
|
'crc16' => Option\CRC16::class,
|
|
];
|
|
|
|
/** @var array */
|
|
protected $options = [];
|
|
|
|
/** @var array */
|
|
protected $input;
|
|
|
|
/**
|
|
* @param array $options Named array of client options
|
|
*/
|
|
public function __construct(array $options = null)
|
|
{
|
|
$this->input = $options ?? [];
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function getDefault($option)
|
|
{
|
|
if (isset($this->handlers[$option])) {
|
|
$handler = $this->handlers[$option];
|
|
$handler = new $handler();
|
|
|
|
return $handler->getDefault($this);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function defined($option)
|
|
{
|
|
return
|
|
array_key_exists($option, $this->options)
|
|
|| array_key_exists($option, $this->input)
|
|
;
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function __isset($option)
|
|
{
|
|
return (
|
|
array_key_exists($option, $this->options)
|
|
|| array_key_exists($option, $this->input)
|
|
) && $this->__get($option) !== null;
|
|
}
|
|
|
|
/**
|
|
* {@inheritdoc}
|
|
*/
|
|
public function __get($option)
|
|
{
|
|
if (isset($this->options[$option]) || array_key_exists($option, $this->options)) {
|
|
return $this->options[$option];
|
|
}
|
|
|
|
if (isset($this->input[$option]) || array_key_exists($option, $this->input)) {
|
|
$value = $this->input[$option];
|
|
unset($this->input[$option]);
|
|
|
|
if (isset($this->handlers[$option])) {
|
|
$handler = $this->handlers[$option];
|
|
$handler = new $handler();
|
|
$value = $handler->filter($this, $value);
|
|
} elseif (is_object($value) && method_exists($value, '__invoke')) {
|
|
$value = $value($this);
|
|
}
|
|
|
|
return $this->options[$option] = $value;
|
|
}
|
|
|
|
if (isset($this->handlers[$option])) {
|
|
return $this->options[$option] = $this->getDefault($option);
|
|
}
|
|
|
|
return;
|
|
}
|
|
}
|