mirror of
https://github.com/the-djmaze/snappymail.git
synced 2026-08-25 18:19:22 +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>
52 lines
1.5 KiB
PHP
52 lines
1.5 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\Command\Strategy;
|
|
|
|
use InvalidArgumentException;
|
|
|
|
class SubcommandStrategyResolver implements StrategyResolverInterface
|
|
{
|
|
private const CONTAINER_COMMANDS_NAMESPACE = 'Predis\Command\Strategy\ContainerCommands';
|
|
|
|
/**
|
|
* @var ?string
|
|
*/
|
|
private $separator;
|
|
|
|
public function __construct(string $separator = null)
|
|
{
|
|
$this->separator = $separator;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*/
|
|
public function resolve(string $commandId, string $subcommandId): SubcommandStrategyInterface
|
|
{
|
|
$subcommandStrategyClass = ucwords($subcommandId) . 'Strategy';
|
|
$commandDirectoryName = ucwords($commandId);
|
|
|
|
if (!is_null($this->separator)) {
|
|
$subcommandStrategyClass = str_replace($this->separator, '', $subcommandStrategyClass);
|
|
$commandDirectoryName = str_replace($this->separator, '', $commandDirectoryName);
|
|
}
|
|
|
|
if (class_exists(
|
|
$containerCommandClass = self::CONTAINER_COMMANDS_NAMESPACE . '\\' . $commandDirectoryName . '\\' . $subcommandStrategyClass
|
|
)) {
|
|
return new $containerCommandClass();
|
|
}
|
|
|
|
throw new InvalidArgumentException('Non-existing container command given');
|
|
}
|
|
}
|