Nextcloud 32/33 Compatibility: Remove deprecated API usage

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>
This commit is contained in:
google-labs-jules[bot] 2026-02-03 16:04:29 +00:00
parent 36ea69ca00
commit d22f8d521d
29 changed files with 422 additions and 359 deletions

View file

@ -52,7 +52,7 @@ class PredisCluster implements ClusterInterface, IteratorAggregate, Countable
/**
* @param StrategyInterface $strategy Optional cluster strategy.
*/
public function __construct(?StrategyInterface $strategy = null)
public function __construct(StrategyInterface $strategy = null)
{
$this->strategy = $strategy ?: new PredisStrategy();
$this->distributor = $this->strategy->getDistributor();

View file

@ -70,7 +70,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
*/
public function __construct(
FactoryInterface $connections,
?StrategyInterface $strategy = null
StrategyInterface $strategy = null
) {
$this->connections = $connections;
$this->strategy = $strategy ?: new RedisClusterStrategy();
@ -273,7 +273,7 @@ class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
*
* @param NodeConnectionInterface $connection Optional connection instance.
*/
public function askSlotMap(?NodeConnectionInterface $connection = null)
public function askSlotMap(NodeConnectionInterface $connection = null)
{
if (!$connection && !$connection = $this->getRandomConnection()) {
return;

View file

@ -31,7 +31,7 @@ class CompositeStreamConnection extends StreamConnection implements CompositeCon
*/
public function __construct(
ParametersInterface $parameters,
?ProtocolProcessorInterface $protocol = null
ProtocolProcessorInterface $protocol = null
) {
$this->parameters = $this->assertParameters($parameters);
$this->protocol = $protocol ?: new TextProtocolProcessor();

View file

@ -32,7 +32,7 @@ trait RelayMethods
* @param string $pattern
* @return bool
*/
public function onInvalidated(?callable $callback, ?string $pattern = null)
public function onInvalidated(?callable $callback, string $pattern = null)
{
return $this->client->onInvalidated($callback, $pattern);
}
@ -129,7 +129,7 @@ trait RelayMethods
* @param ?int $db
* @return bool
*/
public function flushMemory(?string $endpointId = null, ?int $db = null)
public function flushMemory(string $endpointId = null, int $db = null)
{
return $this->client->flushMemory($endpointId, $db);
}

View file

@ -72,7 +72,7 @@ class MasterSlaveReplication implements ReplicationInterface
/**
* {@inheritdoc}
*/
public function __construct(?ReplicationStrategy $strategy = null)
public function __construct(ReplicationStrategy $strategy = null)
{
$this->strategy = $strategy ?: new ReplicationStrategy();
}

View file

@ -123,7 +123,7 @@ class SentinelReplication implements ReplicationInterface
$service,
array $sentinels,
ConnectionFactoryInterface $connectionFactory,
?ReplicationStrategy $strategy = null
ReplicationStrategy $strategy = null
) {
$this->sentinels = $sentinels;
$this->service = $service;