Skip to content

[stable25] polishing 'n cleaning code #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 4 commits into from
Oct 24, 2022
Merged

[stable25] polishing 'n cleaning code #118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e28beeb
cleaning code
ArtificialOwl Oct 21, 2022
8e7ec17
switch to OCP/Server
ArtificialOwl Oct 21, 2022
2a899b1
fix comment
ArtificialOwl Oct 24, 2022
aaeb34d
fix ancien_1y value
ArtificialOwl Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
switch to OCP/Server 
Signed-off-by: Maxence Lange <[email protected]>
  • Loading branch information
@ArtificialOwl @backportbot-nextcloud
ArtificialOwl authored and backportbot-nextcloud[bot] committed Oct 24, 2022
commit 8e7ec1733d8316f96ff7fbf4c0b8dc4d418b310f
2 changes: 1 addition & 1 deletion composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion lib/Command/Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\IUserManager;
use OCP\Server;
use Psr\Container\ContainerExceptionInterface;
use Symfony\Component\Console\Exception\InvalidArgumentException;
use Symfony\Component\Console\Helper\Table;
Expand Down Expand Up @@ -120,7 +121,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int

try {
/** @var CirclesManager $circleManager */
$circleManager = \OC::$server->get(CirclesManager::class);
$circleManager = Server::get(CirclesManager::class);
} catch (ContainerExceptionInterface $e) {
throw new Exception('Circles needs to be enabled');
}
Expand Down
4 changes: 2 additions & 2 deletions lib/Controller/ApiController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
namespace OCA\RelatedResources\Controller;

use Exception;
use OC;
use OCA\Circles\CirclesManager;
use OCA\RelatedResources\Model\RelatedResource;
use OCA\RelatedResources\Service\ConfigService;
Expand All @@ -44,6 +43,7 @@
use OCP\AppFramework\OCSController;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\Server;
use Psr\Container\ContainerExceptionInterface;
use Psr\Log\LoggerInterface;

Expand Down Expand Up @@ -72,7 +72,7 @@ public function __construct(
$this->relatedService = $relatedService;
$this->configService = $configService;
try {
$this->circlesManager = OC::$server->get(CirclesManager::class);
$this->circlesManager = Server::get(CirclesManager::class);
} catch (ContainerExceptionInterface $e) {
}
}
Expand Down
53 changes: 0 additions & 53 deletions lib/Db/CoreQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@

namespace OCA\RelatedResources\Db;

use OC\DB\Connection;
use OC\DB\SchemaWrapper;
use OCA\RelatedResources\AppInfo\Application;
use OCA\RelatedResources\Service\ConfigService;

/**
Expand All @@ -53,11 +50,7 @@ class CoreQueryBuilder {
public const TABLE_CAL_OBJECTS = 'calendarobjects';
public const TABLE_CAL_OBJ_PROPS = 'calendarobjects_props';


protected ConfigService $configService;
private array $tables = [
];


public static array $externalTables = [
self::TABLE_FILES_SHARE => [
Expand Down Expand Up @@ -122,50 +115,4 @@ public function __construct(ConfigService $configService) {
public function getQueryBuilder(): CoreRequestBuilder {
return new CoreRequestBuilder();
}


/**
*
*/
public function cleanDatabase(): void {
foreach ($this->tables as $table) {
$qb = $this->getQueryBuilder();
$qb->delete($table);
$qb->execute();
}
}

/**
*
*/
public function uninstall(): void {
$this->uninstallAppTables();
$this->uninstallFromMigrations();
$this->configService->unsetAppConfig();
}

/**
* this just empty all tables from the app.
*/
public function uninstallAppTables(): void {
$dbConn = \OC::$server->get(Connection::class);
$schema = new SchemaWrapper($dbConn);

foreach ($this->tables as $table) {
if ($schema->hasTable($table)) {
$schema->dropTable($table);
}
}

$schema->performDropTableCalls();
}


public function uninstallFromMigrations(): void {
$qb = $this->getQueryBuilder();
$qb->delete('migrations');
$qb->limit('app', Application::APP_ID);

$qb->execute();
}
}
4 changes: 2 additions & 2 deletions lib/RelatedResourceProviders/CalendarRelatedResourceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
namespace OCA\RelatedResources\RelatedResourceProviders;

use Exception;
use OC;
use OCA\Circles\CirclesManager;
use OCA\Circles\Model\FederatedUser;
use OCA\Circles\Model\Member;
Expand All @@ -46,6 +45,7 @@
use OCA\RelatedResources\Tools\Traits\TArrayTools;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Server;
use Psr\Container\ContainerExceptionInterface;

class CalendarRelatedResourceProvider implements IRelatedResourceProvider {
Expand All @@ -67,7 +67,7 @@ public function __construct(
$this->l10n = $l10n;
$this->calendarShareRequest = $calendarShareRequest;
try {
$this->circlesManager = OC::$server->get(CirclesManager::class);
$this->circlesManager = Server::get(CirclesManager::class);
} catch (ContainerExceptionInterface $e) {
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/RelatedResourceProviders/DeckRelatedResourceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
namespace OCA\RelatedResources\RelatedResourceProviders;

use Exception;
use OC;
use OCA\Circles\CirclesManager;
use OCA\Circles\Model\FederatedUser;
use OCA\Circles\Model\Member;
Expand All @@ -46,6 +45,7 @@
use OCA\RelatedResources\Tools\Traits\TArrayTools;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Server;
use OCP\Share\IShare;
use Psr\Container\ContainerExceptionInterface;

Expand All @@ -70,7 +70,7 @@ public function __construct(
$this->l10n = $l10n;
$this->deckSharesRequest = $deckSharesRequest;
try {
$this->circlesManager = OC::$server->get(CirclesManager::class);
$this->circlesManager = Server::get(CirclesManager::class);
} catch (ContainerExceptionInterface $e) {
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/RelatedResourceProviders/FilesRelatedResourceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
namespace OCA\RelatedResources\RelatedResourceProviders;

use Exception;
use OC;
use OC\User\NoUserException;
use OCA\Circles\CirclesManager;
use OCA\Circles\Model\FederatedUser;
Expand All @@ -49,6 +48,7 @@
use OCP\Files\NotPermittedException;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Server;
use OCP\Share\IShare;
use Psr\Container\ContainerExceptionInterface;

Expand Down Expand Up @@ -76,7 +76,7 @@ public function __construct(
$this->l10n = $l10n;
$this->filesShareRequest = $filesShareRequest;
try {
$this->circlesManager = OC::$server->get(CirclesManager::class);
$this->circlesManager = Server::get(CirclesManager::class);
} catch (ContainerExceptionInterface $e) {
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/RelatedResourceProviders/TalkRelatedResourceProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
namespace OCA\RelatedResources\RelatedResourceProviders;

use Exception;
use OC;
use OCA\Circles\CirclesManager;
use OCA\Circles\Model\FederatedUser;
use OCA\Circles\Model\Member;
Expand All @@ -46,6 +45,7 @@
use OCA\RelatedResources\Tools\Traits\TArrayTools;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Server;
use Psr\Container\ContainerExceptionInterface;

class TalkRelatedResourceProvider implements IRelatedResourceProvider {
Expand All @@ -69,7 +69,7 @@ public function __construct(
$this->l10n = $l10n;
$this->talkRoomRequest = $talkRoomRequest;
try {
$this->circlesManager = OC::$server->get(CirclesManager::class);
$this->circlesManager = Server::get(CirclesManager::class);
} catch (ContainerExceptionInterface $e) {
}
}
Expand Down
14 changes: 7 additions & 7 deletions lib/Service/RelatedService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
namespace OCA\RelatedResources\Service;

use Exception;
use OC;
use OCA\Circles\CirclesManager;
use OCA\Circles\Model\FederatedUser;
use OCA\Circles\Model\Member;
Expand All @@ -54,6 +53,7 @@
use OCP\App\IAppManager;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\Server;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Psr\Log\LoggerInterface;
Expand Down Expand Up @@ -95,7 +95,7 @@ public function __construct(
$this->configService = $configService;

try {
$this->circlesManager = OC::$server->get(CirclesManager::class);
$this->circlesManager = Server::get(CirclesManager::class);
} catch (ContainerExceptionInterface $e) {
$this->logger->notice($e->getMessage());
}
Expand Down Expand Up @@ -483,7 +483,7 @@ private function getWeightCalculators(): array {
);
}

$this->weightCalculators[] = OC::$server->get($class);
$this->weightCalculators[] = Server::get($class);
} catch (NotFoundExceptionInterface | ContainerExceptionInterface | ReflectionException $e) {
$this->logger->notice($e->getMessage());
}
Expand All @@ -501,31 +501,31 @@ private function getRelatedResourceProviders(): array {
$providers = [];

try {
$providers[] = OC::$server->get(FilesRelatedResourceProvider::class);
$providers[] = Server::get(FilesRelatedResourceProvider::class);
} catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
$this->logger->notice($e->getMessage());
}


if ($this->appManager->isInstalled('deck')) {
try {
$providers[] = OC::$server->get(DeckRelatedResourceProvider::class);
$providers[] = Server::get(DeckRelatedResourceProvider::class);
} catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
$this->logger->notice($e->getMessage());
}
}

if ($this->appManager->isInstalled('calendar')) {
try {
$providers[] = OC::$server->get(CalendarRelatedResourceProvider::class);
$providers[] = Server::get(CalendarRelatedResourceProvider::class);
} catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
$this->logger->notice($e->getMessage());
}
}

if ($this->appManager->isInstalled('spreed')) {
try {
$providers[] = OC::$server->get(TalkRelatedResourceProvider::class);
$providers[] = Server::get(TalkRelatedResourceProvider::class);
} catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
$this->logger->notice($e->getMessage());
}
Expand Down
10 changes: 5 additions & 5 deletions lib/Tools/Db/ExtendedQueryBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
use DateTime;
use Doctrine\DBAL\Query\QueryBuilder as DBALQueryBuilder;
use Exception;
use OC;
use OC\DB\ConnectionAdapter;
use OC\DB\QueryBuilder\QueryBuilder;
use OC\SystemConfig;
use OCA\RelatedResources\Tools\Exceptions\DateTimeException;
Expand All @@ -44,7 +44,7 @@
use OCA\RelatedResources\Tools\Traits\TArrayTools;
use OCP\DB\QueryBuilder\ICompositeExpression;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\IDBConnection;
use OCP\Server;
use Psr\Log\LoggerInterface;

class ExtendedQueryBuilder extends QueryBuilder {
Expand All @@ -56,9 +56,9 @@ class ExtendedQueryBuilder extends QueryBuilder {

public function __construct() {
parent::__construct(
OC::$server->get(IDBConnection::class),
OC::$server->get(SystemConfig::class),
OC::$server->get(LoggerInterface::class)
Server::get(ConnectionAdapter::class),
Server::get(SystemConfig::class),
Server::get(LoggerInterface::class)
);
}

Expand Down
2 changes: 2 additions & 0 deletions tests/stub.phpstub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,8 @@ namespace Doctrine\DBAL\Query {
}

namespace OC\DB\QueryBuilder {
use OC\DB\ConnectionAdapter;
use OC\SystemConfig;
use OCP\DB\IResult;
use OCP\DB\QueryBuilder\ICompositeExpression;
use OCP\DB\QueryBuilder\ILiteral;
Expand Down