diff --git a/.gitignore b/.gitignore index e9a27c5d68a..a3e6f7872ca 100644 --- a/.gitignore +++ b/.gitignore @@ -45,7 +45,7 @@ !/apps/twofactor_backupcodes !/apps/user_status !/apps/weather_status -!/apps/webhooks +!/apps/webhook_listeners !/apps/workflowengine /apps/files_external/3rdparty/irodsphp/PHPUnitTest /apps/files_external/3rdparty/irodsphp/web diff --git a/apps/dav/composer/composer/autoload_static.php b/apps/dav/composer/composer/autoload_static.php index caa6cc8d5e6..94961e04837 100644 --- a/apps/dav/composer/composer/autoload_static.php +++ b/apps/dav/composer/composer/autoload_static.php @@ -150,13 +150,13 @@ class ComposerStaticInitDAV 'OCA\\DAV\\CardDAV\\MultiGetExportPlugin' => __DIR__ . '/..' . '/../lib/CardDAV/MultiGetExportPlugin.php', 'OCA\\DAV\\CardDAV\\PhotoCache' => __DIR__ . '/..' . '/../lib/CardDAV/PhotoCache.php', 'OCA\\DAV\\CardDAV\\Plugin' => __DIR__ . '/..' . '/../lib/CardDAV/Plugin.php', + 'OCA\\DAV\\CardDAV\\Security\\CardDavRateLimitingPlugin' => __DIR__ . '/..' . '/../lib/CardDAV/Security/CardDavRateLimitingPlugin.php', 'OCA\\DAV\\CardDAV\\Sharing\\Backend' => __DIR__ . '/..' . '/../lib/CardDAV/Sharing/Backend.php', 'OCA\\DAV\\CardDAV\\Sharing\\Service' => __DIR__ . '/..' . '/../lib/CardDAV/Sharing/Service.php', 'OCA\\DAV\\CardDAV\\SyncService' => __DIR__ . '/..' . '/../lib/CardDAV/SyncService.php', 'OCA\\DAV\\CardDAV\\SystemAddressbook' => __DIR__ . '/..' . '/../lib/CardDAV/SystemAddressbook.php', 'OCA\\DAV\\CardDAV\\UserAddressBooks' => __DIR__ . '/..' . '/../lib/CardDAV/UserAddressBooks.php', 'OCA\\DAV\\CardDAV\\Xml\\Groups' => __DIR__ . '/..' . '/../lib/CardDAV/Xml/Groups.php', - 'OCA\\DAV\\CardDAV\\Security\\CardDavRateLimitingPlugin' => __DIR__ . '/..' . '/../lib/CardDAV/Security/CardDavRateLimitingPlugin.php', 'OCA\\DAV\\Command\\CreateAddressBook' => __DIR__ . '/..' . '/../lib/Command/CreateAddressBook.php', 'OCA\\DAV\\Command\\CreateCalendar' => __DIR__ . '/..' . '/../lib/Command/CreateCalendar.php', 'OCA\\DAV\\Command\\DeleteCalendar' => __DIR__ . '/..' . '/../lib/Command/DeleteCalendar.php', diff --git a/apps/webhooks/appinfo/info.xml b/apps/webhook_listeners/appinfo/info.xml similarity index 81% rename from apps/webhooks/appinfo/info.xml rename to apps/webhook_listeners/appinfo/info.xml index 4bc0a999310..a8cec901ec3 100644 --- a/apps/webhooks/appinfo/info.xml +++ b/apps/webhook_listeners/appinfo/info.xml @@ -1,14 +1,14 @@ - webhooks + webhook_listeners Nextcloud webhook support Nextcloud webhook support Nextcloud webhook support 1.0.0-dev agpl Côme Chilliet - Webhooks + WebhookListeners @@ -24,10 +24,10 @@ - OCA\Webhooks\Command\ListWebhooks + OCA\WebhookListeners\Command\ListWebhooks - OCA\Webhooks\Settings\Admin + OCA\WebhookListeners\Settings\Admin diff --git a/apps/webhooks/composer/autoload.php b/apps/webhook_listeners/composer/autoload.php similarity index 92% rename from apps/webhooks/composer/autoload.php rename to apps/webhook_listeners/composer/autoload.php index 81ca3547149..fa45003779e 100644 --- a/apps/webhooks/composer/autoload.php +++ b/apps/webhook_listeners/composer/autoload.php @@ -22,4 +22,4 @@ if (PHP_VERSION_ID < 50600) { require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitWebhooks::getLoader(); +return ComposerAutoloaderInitWebhookListeners::getLoader(); diff --git a/apps/webhooks/composer/composer.json b/apps/webhook_listeners/composer/composer.json similarity index 65% rename from apps/webhooks/composer/composer.json rename to apps/webhook_listeners/composer/composer.json index 5511396d896..b9eb07e50ab 100644 --- a/apps/webhooks/composer/composer.json +++ b/apps/webhook_listeners/composer/composer.json @@ -3,11 +3,11 @@ "vendor-dir": ".", "optimize-autoloader": true, "classmap-authoritative": true, - "autoloader-suffix": "Webhooks" + "autoloader-suffix": "WebhookListeners" }, "autoload" : { "psr-4": { - "OCA\\Webhooks\\": "../lib/" + "OCA\\WebhookListeners\\": "../lib/" } } } diff --git a/apps/webhooks/composer/composer.lock b/apps/webhook_listeners/composer/composer.lock similarity index 100% rename from apps/webhooks/composer/composer.lock rename to apps/webhook_listeners/composer/composer.lock diff --git a/apps/webhooks/composer/composer/ClassLoader.php b/apps/webhook_listeners/composer/composer/ClassLoader.php similarity index 100% rename from apps/webhooks/composer/composer/ClassLoader.php rename to apps/webhook_listeners/composer/composer/ClassLoader.php diff --git a/apps/webhooks/composer/composer/InstalledVersions.php b/apps/webhook_listeners/composer/composer/InstalledVersions.php similarity index 100% rename from apps/webhooks/composer/composer/InstalledVersions.php rename to apps/webhook_listeners/composer/composer/InstalledVersions.php diff --git a/apps/webhooks/composer/composer/LICENSE b/apps/webhook_listeners/composer/composer/LICENSE similarity index 100% rename from apps/webhooks/composer/composer/LICENSE rename to apps/webhook_listeners/composer/composer/LICENSE diff --git a/apps/webhook_listeners/composer/composer/autoload_classmap.php b/apps/webhook_listeners/composer/composer/autoload_classmap.php new file mode 100644 index 00000000000..0501a86df2c --- /dev/null +++ b/apps/webhook_listeners/composer/composer/autoload_classmap.php @@ -0,0 +1,22 @@ + $vendorDir . '/composer/InstalledVersions.php', + 'OCA\\WebhookListeners\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', + 'OCA\\WebhookListeners\\BackgroundJobs\\WebhookCall' => $baseDir . '/../lib/BackgroundJobs/WebhookCall.php', + 'OCA\\WebhookListeners\\Command\\ListWebhooks' => $baseDir . '/../lib/Command/ListWebhooks.php', + 'OCA\\WebhookListeners\\Controller\\WebhooksController' => $baseDir . '/../lib/Controller/WebhooksController.php', + 'OCA\\WebhookListeners\\Db\\AuthMethod' => $baseDir . '/../lib/Db/AuthMethod.php', + 'OCA\\WebhookListeners\\Db\\WebhookListener' => $baseDir . '/../lib/Db/WebhookListener.php', + 'OCA\\WebhookListeners\\Db\\WebhookListenerMapper' => $baseDir . '/../lib/Db/WebhookListenerMapper.php', + 'OCA\\WebhookListeners\\Listener\\WebhooksEventListener' => $baseDir . '/../lib/Listener/WebhooksEventListener.php', + 'OCA\\WebhookListeners\\Migration\\Version1000Date20240527153425' => $baseDir . '/../lib/Migration/Version1000Date20240527153425.php', + 'OCA\\WebhookListeners\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php', + 'OCA\\WebhookListeners\\Service\\PHPMongoQuery' => $baseDir . '/../lib/Service/PHPMongoQuery.php', + 'OCA\\WebhookListeners\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php', +); diff --git a/apps/webhooks/composer/composer/autoload_namespaces.php b/apps/webhook_listeners/composer/composer/autoload_namespaces.php similarity index 100% rename from apps/webhooks/composer/composer/autoload_namespaces.php rename to apps/webhook_listeners/composer/composer/autoload_namespaces.php diff --git a/apps/webhooks/composer/composer/autoload_psr4.php b/apps/webhook_listeners/composer/composer/autoload_psr4.php similarity index 66% rename from apps/webhooks/composer/composer/autoload_psr4.php rename to apps/webhook_listeners/composer/composer/autoload_psr4.php index 987a95f989d..85f48c55bdd 100644 --- a/apps/webhooks/composer/composer/autoload_psr4.php +++ b/apps/webhook_listeners/composer/composer/autoload_psr4.php @@ -6,5 +6,5 @@ $vendorDir = dirname(__DIR__); $baseDir = $vendorDir; return array( - 'OCA\\Webhooks\\' => array($baseDir . '/../lib'), + 'OCA\\WebhookListeners\\' => array($baseDir . '/../lib'), ); diff --git a/apps/webhooks/composer/composer/autoload_real.php b/apps/webhook_listeners/composer/composer/autoload_real.php similarity index 84% rename from apps/webhooks/composer/composer/autoload_real.php rename to apps/webhook_listeners/composer/composer/autoload_real.php index 1b1742c422e..336058c2e24 100644 --- a/apps/webhooks/composer/composer/autoload_real.php +++ b/apps/webhook_listeners/composer/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitWebhooks +class ComposerAutoloaderInitWebhookListeners { private static $loader; @@ -22,12 +22,12 @@ class ComposerAutoloaderInitWebhooks return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitWebhooks', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInitWebhookListeners', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); - spl_autoload_unregister(array('ComposerAutoloaderInitWebhooks', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInitWebhookListeners', 'loadClassLoader')); require __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitWebhooks::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInitWebhookListeners::getInitializer($loader)); $loader->setClassMapAuthoritative(true); $loader->register(true); diff --git a/apps/webhook_listeners/composer/composer/autoload_static.php b/apps/webhook_listeners/composer/composer/autoload_static.php new file mode 100644 index 00000000000..43a9b4779d9 --- /dev/null +++ b/apps/webhook_listeners/composer/composer/autoload_static.php @@ -0,0 +1,48 @@ + + array ( + 'OCA\\WebhookListeners\\' => 21, + ), + ); + + public static $prefixDirsPsr4 = array ( + 'OCA\\WebhookListeners\\' => + array ( + 0 => __DIR__ . '/..' . '/../lib', + ), + ); + + public static $classMap = array ( + 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', + 'OCA\\WebhookListeners\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', + 'OCA\\WebhookListeners\\BackgroundJobs\\WebhookCall' => __DIR__ . '/..' . '/../lib/BackgroundJobs/WebhookCall.php', + 'OCA\\WebhookListeners\\Command\\ListWebhooks' => __DIR__ . '/..' . '/../lib/Command/ListWebhooks.php', + 'OCA\\WebhookListeners\\Controller\\WebhooksController' => __DIR__ . '/..' . '/../lib/Controller/WebhooksController.php', + 'OCA\\WebhookListeners\\Db\\AuthMethod' => __DIR__ . '/..' . '/../lib/Db/AuthMethod.php', + 'OCA\\WebhookListeners\\Db\\WebhookListener' => __DIR__ . '/..' . '/../lib/Db/WebhookListener.php', + 'OCA\\WebhookListeners\\Db\\WebhookListenerMapper' => __DIR__ . '/..' . '/../lib/Db/WebhookListenerMapper.php', + 'OCA\\WebhookListeners\\Listener\\WebhooksEventListener' => __DIR__ . '/..' . '/../lib/Listener/WebhooksEventListener.php', + 'OCA\\WebhookListeners\\Migration\\Version1000Date20240527153425' => __DIR__ . '/..' . '/../lib/Migration/Version1000Date20240527153425.php', + 'OCA\\WebhookListeners\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php', + 'OCA\\WebhookListeners\\Service\\PHPMongoQuery' => __DIR__ . '/..' . '/../lib/Service/PHPMongoQuery.php', + 'OCA\\WebhookListeners\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php', + ); + + public static function getInitializer(ClassLoader $loader) + { + return \Closure::bind(function () use ($loader) { + $loader->prefixLengthsPsr4 = ComposerStaticInitWebhookListeners::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInitWebhookListeners::$prefixDirsPsr4; + $loader->classMap = ComposerStaticInitWebhookListeners::$classMap; + + }, null, ClassLoader::class); + } +} diff --git a/apps/webhooks/composer/composer/installed.json b/apps/webhook_listeners/composer/composer/installed.json similarity index 100% rename from apps/webhooks/composer/composer/installed.json rename to apps/webhook_listeners/composer/composer/installed.json diff --git a/apps/webhooks/composer/composer/installed.php b/apps/webhook_listeners/composer/composer/installed.php similarity index 100% rename from apps/webhooks/composer/composer/installed.php rename to apps/webhook_listeners/composer/composer/installed.php diff --git a/apps/webhooks/img/app-dark.svg b/apps/webhook_listeners/img/app-dark.svg similarity index 100% rename from apps/webhooks/img/app-dark.svg rename to apps/webhook_listeners/img/app-dark.svg diff --git a/apps/webhooks/img/app.svg b/apps/webhook_listeners/img/app.svg similarity index 100% rename from apps/webhooks/img/app.svg rename to apps/webhook_listeners/img/app.svg diff --git a/apps/webhooks/lib/AppInfo/Application.php b/apps/webhook_listeners/lib/AppInfo/Application.php similarity index 87% rename from apps/webhooks/lib/AppInfo/Application.php rename to apps/webhook_listeners/lib/AppInfo/Application.php index 22abec74792..d1ffa5db49b 100644 --- a/apps/webhooks/lib/AppInfo/Application.php +++ b/apps/webhook_listeners/lib/AppInfo/Application.php @@ -7,10 +7,10 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\AppInfo; +namespace OCA\WebhookListeners\AppInfo; -use OCA\Webhooks\Db\WebhookListenerMapper; -use OCA\Webhooks\Listener\WebhooksEventListener; +use OCA\WebhookListeners\Db\WebhookListenerMapper; +use OCA\WebhookListeners\Listener\WebhooksEventListener; use OCP\AppFramework\App; use OCP\AppFramework\Bootstrap\IBootContext; use OCP\AppFramework\Bootstrap\IBootstrap; @@ -20,7 +20,7 @@ use Psr\Container\ContainerInterface; use Psr\Log\LoggerInterface; class Application extends App implements IBootstrap { - public const APP_ID = 'webhooks'; + public const APP_ID = 'webhook_listeners'; public function __construct() { parent::__construct(self::APP_ID); diff --git a/apps/webhooks/lib/BackgroundJobs/WebhookCall.php b/apps/webhook_listeners/lib/BackgroundJobs/WebhookCall.php similarity index 93% rename from apps/webhooks/lib/BackgroundJobs/WebhookCall.php rename to apps/webhook_listeners/lib/BackgroundJobs/WebhookCall.php index 4edc76fbea9..9689d4cb585 100644 --- a/apps/webhooks/lib/BackgroundJobs/WebhookCall.php +++ b/apps/webhook_listeners/lib/BackgroundJobs/WebhookCall.php @@ -7,10 +7,10 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\BackgroundJobs; +namespace OCA\WebhookListeners\BackgroundJobs; -use OCA\Webhooks\Db\AuthMethod; -use OCA\Webhooks\Db\WebhookListenerMapper; +use OCA\WebhookListeners\Db\AuthMethod; +use OCA\WebhookListeners\Db\WebhookListenerMapper; use OCP\AppFramework\Utility\ITimeFactory; use OCP\BackgroundJob\QueuedJob; use OCP\Http\Client\IClientService; diff --git a/apps/webhooks/lib/Command/ListWebhooks.php b/apps/webhook_listeners/lib/Command/ListWebhooks.php similarity index 80% rename from apps/webhooks/lib/Command/ListWebhooks.php rename to apps/webhook_listeners/lib/Command/ListWebhooks.php index c8cca6f8609..157097f3f15 100644 --- a/apps/webhooks/lib/Command/ListWebhooks.php +++ b/apps/webhook_listeners/lib/Command/ListWebhooks.php @@ -7,11 +7,11 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Command; +namespace OCA\WebhookListeners\Command; use OC\Core\Command\Base; -use OCA\Webhooks\Db\WebhookListener; -use OCA\Webhooks\Db\WebhookListenerMapper; +use OCA\WebhookListeners\Db\WebhookListener; +use OCA\WebhookListeners\Db\WebhookListenerMapper; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -25,8 +25,8 @@ class ListWebhooks extends Base { protected function configure(): void { parent::configure(); $this - ->setName('webhooks:list') - ->setDescription('Lists configured webhooks'); + ->setName('webhook_listeners:list') + ->setDescription('Lists configured webhook listeners'); } protected function execute(InputInterface $input, OutputInterface $output): int { diff --git a/apps/webhooks/lib/Controller/WebhooksController.php b/apps/webhook_listeners/lib/Controller/WebhooksController.php similarity index 92% rename from apps/webhooks/lib/Controller/WebhooksController.php rename to apps/webhook_listeners/lib/Controller/WebhooksController.php index e3df0897bbe..88a6e473d85 100644 --- a/apps/webhooks/lib/Controller/WebhooksController.php +++ b/apps/webhook_listeners/lib/Controller/WebhooksController.php @@ -7,11 +7,11 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Controller; +namespace OCA\WebhookListeners\Controller; -use OCA\Webhooks\Db\AuthMethod; -use OCA\Webhooks\Db\WebhookListenerMapper; -use OCA\Webhooks\ResponseDefinitions; +use OCA\WebhookListeners\Db\AuthMethod; +use OCA\WebhookListeners\Db\WebhookListenerMapper; +use OCA\WebhookListeners\ResponseDefinitions; use OCP\AppFramework\Http\Attribute\ApiRoute; use OCP\AppFramework\Http\Attribute\AuthorizedAdminSetting; use OCP\AppFramework\Http\Attribute\OpenAPI; @@ -48,7 +48,7 @@ class WebhooksController extends OCSController { * 200: Webhook registrations returned */ #[ApiRoute(verb: 'GET', url: '/api/v1/webhooks')] - #[AuthorizedAdminSetting(settings:'OCA\Webhooks\Settings\Admin')] + #[AuthorizedAdminSetting(settings:'OCA\WebhookListeners\Settings\Admin')] public function index(): DataResponse { $webhookListeners = $this->mapper->getAll(); @@ -65,7 +65,7 @@ class WebhooksController extends OCSController { * 200: Webhook registration returned */ #[ApiRoute(verb: 'GET', url: '/api/v1/webhooks/{id}')] - #[AuthorizedAdminSetting(settings:'OCA\Webhooks\Settings\Admin')] + #[AuthorizedAdminSetting(settings:'OCA\WebhookListeners\Settings\Admin')] public function show(int $id): DataResponse { return new DataResponse($this->mapper->getById($id)); } @@ -90,7 +90,7 @@ class WebhooksController extends OCSController { * @throws OCSException Other error */ #[ApiRoute(verb: 'POST', url: '/api/v1/webhooks')] - #[AuthorizedAdminSetting(settings:'OCA\Webhooks\Settings\Admin')] + #[AuthorizedAdminSetting(settings:'OCA\WebhookListeners\Settings\Admin')] public function create( string $httpMethod, string $uri, @@ -149,7 +149,7 @@ class WebhooksController extends OCSController { * @throws OCSException Other error */ #[ApiRoute(verb: 'POST', url: '/api/v1/webhooks/{id}')] - #[AuthorizedAdminSetting(settings:'OCA\Webhooks\Settings\Admin')] + #[AuthorizedAdminSetting(settings:'OCA\WebhookListeners\Settings\Admin')] public function update( int $id, string $httpMethod, @@ -203,7 +203,7 @@ class WebhooksController extends OCSController { * @throws OCSException Other error */ #[ApiRoute(verb: 'DELETE', url: '/api/v1/webhooks/{id}')] - #[AuthorizedAdminSetting(settings:'OCA\Webhooks\Settings\Admin')] + #[AuthorizedAdminSetting(settings:'OCA\WebhookListeners\Settings\Admin')] public function destroy(int $id): DataResponse { try { $deleted = $this->mapper->deleteById($id); diff --git a/apps/webhooks/lib/Db/AuthMethod.php b/apps/webhook_listeners/lib/Db/AuthMethod.php similarity index 87% rename from apps/webhooks/lib/Db/AuthMethod.php rename to apps/webhook_listeners/lib/Db/AuthMethod.php index 4fe06ef34fb..ab8bff76eb7 100644 --- a/apps/webhooks/lib/Db/AuthMethod.php +++ b/apps/webhook_listeners/lib/Db/AuthMethod.php @@ -7,7 +7,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Db; +namespace OCA\WebhookListeners\Db; enum AuthMethod: string { case None = 'none'; diff --git a/apps/webhooks/lib/Db/WebhookListener.php b/apps/webhook_listeners/lib/Db/WebhookListener.php similarity index 98% rename from apps/webhooks/lib/Db/WebhookListener.php rename to apps/webhook_listeners/lib/Db/WebhookListener.php index c4053b5ba7b..0d08082666f 100644 --- a/apps/webhooks/lib/Db/WebhookListener.php +++ b/apps/webhook_listeners/lib/Db/WebhookListener.php @@ -7,7 +7,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Db; +namespace OCA\WebhookListeners\Db; use OCP\AppFramework\Db\Entity; use OCP\Security\ICrypto; diff --git a/apps/webhooks/lib/Db/WebhookListenerMapper.php b/apps/webhook_listeners/lib/Db/WebhookListenerMapper.php similarity index 99% rename from apps/webhooks/lib/Db/WebhookListenerMapper.php rename to apps/webhook_listeners/lib/Db/WebhookListenerMapper.php index 4094b5e2679..97e01062f2f 100644 --- a/apps/webhooks/lib/Db/WebhookListenerMapper.php +++ b/apps/webhook_listeners/lib/Db/WebhookListenerMapper.php @@ -7,7 +7,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Db; +namespace OCA\WebhookListeners\Db; use OCP\AppFramework\Db\DoesNotExistException; use OCP\AppFramework\Db\MultipleObjectsReturnedException; diff --git a/apps/webhooks/lib/Listener/WebhooksEventListener.php b/apps/webhook_listeners/lib/Listener/WebhooksEventListener.php similarity index 89% rename from apps/webhooks/lib/Listener/WebhooksEventListener.php rename to apps/webhook_listeners/lib/Listener/WebhooksEventListener.php index 37d6863553a..72d48d790e1 100644 --- a/apps/webhooks/lib/Listener/WebhooksEventListener.php +++ b/apps/webhook_listeners/lib/Listener/WebhooksEventListener.php @@ -7,11 +7,11 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Listener; +namespace OCA\WebhookListeners\Listener; -use OCA\Webhooks\BackgroundJobs\WebhookCall; -use OCA\Webhooks\Db\WebhookListenerMapper; -use OCA\Webhooks\Service\PHPMongoQuery; +use OCA\WebhookListeners\BackgroundJobs\WebhookCall; +use OCA\WebhookListeners\Db\WebhookListenerMapper; +use OCA\WebhookListeners\Service\PHPMongoQuery; use OCP\BackgroundJob\IJobList; use OCP\EventDispatcher\Event; use OCP\EventDispatcher\IEventListener; diff --git a/apps/webhooks/lib/Migration/Version1000Date20240527153425.php b/apps/webhook_listeners/lib/Migration/Version1000Date20240527153425.php similarity index 94% rename from apps/webhooks/lib/Migration/Version1000Date20240527153425.php rename to apps/webhook_listeners/lib/Migration/Version1000Date20240527153425.php index a54702de6c0..44f2476dd44 100755 --- a/apps/webhooks/lib/Migration/Version1000Date20240527153425.php +++ b/apps/webhook_listeners/lib/Migration/Version1000Date20240527153425.php @@ -7,10 +7,10 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Migration; +namespace OCA\WebhookListeners\Migration; use Closure; -use OCA\Webhooks\Db\WebhookListenerMapper; +use OCA\WebhookListeners\Db\WebhookListenerMapper; use OCP\DB\ISchemaWrapper; use OCP\DB\Types; use OCP\Migration\IOutput; diff --git a/apps/webhooks/lib/ResponseDefinitions.php b/apps/webhook_listeners/lib/ResponseDefinitions.php similarity index 94% rename from apps/webhooks/lib/ResponseDefinitions.php rename to apps/webhook_listeners/lib/ResponseDefinitions.php index ea31de931ac..3b9965c20a3 100644 --- a/apps/webhooks/lib/ResponseDefinitions.php +++ b/apps/webhook_listeners/lib/ResponseDefinitions.php @@ -7,7 +7,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks; +namespace OCA\WebhookListeners; /** * @psalm-type WebhooksListenerInfo = array{ diff --git a/apps/webhooks/lib/Service/PHPMongoQuery.php b/apps/webhook_listeners/lib/Service/PHPMongoQuery.php similarity index 99% rename from apps/webhooks/lib/Service/PHPMongoQuery.php rename to apps/webhook_listeners/lib/Service/PHPMongoQuery.php index 65ba5775763..e8e52615008 100644 --- a/apps/webhooks/lib/Service/PHPMongoQuery.php +++ b/apps/webhook_listeners/lib/Service/PHPMongoQuery.php @@ -6,7 +6,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Service; +namespace OCA\WebhookListeners\Service; use Exception; diff --git a/apps/webhooks/lib/Settings/Admin.php b/apps/webhook_listeners/lib/Settings/Admin.php similarity index 96% rename from apps/webhooks/lib/Settings/Admin.php rename to apps/webhook_listeners/lib/Settings/Admin.php index 748b8536e4f..e5e0d00221c 100644 --- a/apps/webhooks/lib/Settings/Admin.php +++ b/apps/webhook_listeners/lib/Settings/Admin.php @@ -7,7 +7,7 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Settings; +namespace OCA\WebhookListeners\Settings; use OCP\AppFramework\Http\TemplateResponse; use OCP\IL10N; diff --git a/apps/webhooks/openapi.json b/apps/webhook_listeners/openapi.json similarity index 99% rename from apps/webhooks/openapi.json rename to apps/webhook_listeners/openapi.json index bdcc8007270..6d8a10fcdea 100644 --- a/apps/webhooks/openapi.json +++ b/apps/webhook_listeners/openapi.json @@ -736,4 +736,4 @@ } }, "tags": [] -} \ No newline at end of file +} diff --git a/apps/webhooks/tests/Db/WebhookListenerMapperTest.php b/apps/webhook_listeners/tests/Db/WebhookListenerMapperTest.php similarity index 94% rename from apps/webhooks/tests/Db/WebhookListenerMapperTest.php rename to apps/webhook_listeners/tests/Db/WebhookListenerMapperTest.php index 76e58f0d2b7..b385cff1228 100644 --- a/apps/webhooks/tests/Db/WebhookListenerMapperTest.php +++ b/apps/webhook_listeners/tests/Db/WebhookListenerMapperTest.php @@ -7,10 +7,10 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Tests\Db; +namespace OCA\WebhookListeners\Tests\Db; -use OCA\Webhooks\Db\AuthMethod; -use OCA\Webhooks\Db\WebhookListenerMapper; +use OCA\WebhookListeners\Db\AuthMethod; +use OCA\WebhookListeners\Db\WebhookListenerMapper; use OCP\Files\Events\Node\NodeWrittenEvent; use OCP\ICacheFactory; use OCP\IDBConnection; diff --git a/apps/webhooks/tests/Service/PHPMongoQueryTest.php b/apps/webhook_listeners/tests/Service/PHPMongoQueryTest.php similarity index 92% rename from apps/webhooks/tests/Service/PHPMongoQueryTest.php rename to apps/webhook_listeners/tests/Service/PHPMongoQueryTest.php index 51684bb8e34..071330a79e3 100644 --- a/apps/webhooks/tests/Service/PHPMongoQueryTest.php +++ b/apps/webhook_listeners/tests/Service/PHPMongoQueryTest.php @@ -7,9 +7,9 @@ declare(strict_types=1); * SPDX-License-Identifier: AGPL-3.0-or-later */ -namespace OCA\Webhooks\Tests\Service; +namespace OCA\WebhookListeners\Tests\Service; -use OCA\Webhooks\Service\PHPMongoQuery; +use OCA\WebhookListeners\Service\PHPMongoQuery; use OCP\Files\Events\Node\NodeWrittenEvent; use Test\TestCase; diff --git a/apps/webhooks/composer/composer/autoload_classmap.php b/apps/webhooks/composer/composer/autoload_classmap.php deleted file mode 100644 index bc6625e3c93..00000000000 --- a/apps/webhooks/composer/composer/autoload_classmap.php +++ /dev/null @@ -1,22 +0,0 @@ - $vendorDir . '/composer/InstalledVersions.php', - 'OCA\\Webhooks\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', - 'OCA\\Webhooks\\BackgroundJobs\\WebhookCall' => $baseDir . '/../lib/BackgroundJobs/WebhookCall.php', - 'OCA\\Webhooks\\Command\\ListWebhooks' => $baseDir . '/../lib/Command/ListWebhooks.php', - 'OCA\\Webhooks\\Controller\\WebhooksController' => $baseDir . '/../lib/Controller/WebhooksController.php', - 'OCA\\Webhooks\\Db\\AuthMethod' => $baseDir . '/../lib/Db/AuthMethod.php', - 'OCA\\Webhooks\\Db\\WebhookListener' => $baseDir . '/../lib/Db/WebhookListener.php', - 'OCA\\Webhooks\\Db\\WebhookListenerMapper' => $baseDir . '/../lib/Db/WebhookListenerMapper.php', - 'OCA\\Webhooks\\Listener\\WebhooksEventListener' => $baseDir . '/../lib/Listener/WebhooksEventListener.php', - 'OCA\\Webhooks\\Migration\\Version1000Date20240527153425' => $baseDir . '/../lib/Migration/Version1000Date20240527153425.php', - 'OCA\\Webhooks\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php', - 'OCA\\Webhooks\\Service\\PHPMongoQuery' => $baseDir . '/../lib/Service/PHPMongoQuery.php', - 'OCA\\Webhooks\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php', -); diff --git a/apps/webhooks/composer/composer/autoload_static.php b/apps/webhooks/composer/composer/autoload_static.php deleted file mode 100644 index d06810391ec..00000000000 --- a/apps/webhooks/composer/composer/autoload_static.php +++ /dev/null @@ -1,48 +0,0 @@ - - array ( - 'OCA\\Webhooks\\' => 13, - ), - ); - - public static $prefixDirsPsr4 = array ( - 'OCA\\Webhooks\\' => - array ( - 0 => __DIR__ . '/..' . '/../lib', - ), - ); - - public static $classMap = array ( - 'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php', - 'OCA\\Webhooks\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', - 'OCA\\Webhooks\\BackgroundJobs\\WebhookCall' => __DIR__ . '/..' . '/../lib/BackgroundJobs/WebhookCall.php', - 'OCA\\Webhooks\\Command\\ListWebhooks' => __DIR__ . '/..' . '/../lib/Command/ListWebhooks.php', - 'OCA\\Webhooks\\Controller\\WebhooksController' => __DIR__ . '/..' . '/../lib/Controller/WebhooksController.php', - 'OCA\\Webhooks\\Db\\AuthMethod' => __DIR__ . '/..' . '/../lib/Db/AuthMethod.php', - 'OCA\\Webhooks\\Db\\WebhookListener' => __DIR__ . '/..' . '/../lib/Db/WebhookListener.php', - 'OCA\\Webhooks\\Db\\WebhookListenerMapper' => __DIR__ . '/..' . '/../lib/Db/WebhookListenerMapper.php', - 'OCA\\Webhooks\\Listener\\WebhooksEventListener' => __DIR__ . '/..' . '/../lib/Listener/WebhooksEventListener.php', - 'OCA\\Webhooks\\Migration\\Version1000Date20240527153425' => __DIR__ . '/..' . '/../lib/Migration/Version1000Date20240527153425.php', - 'OCA\\Webhooks\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php', - 'OCA\\Webhooks\\Service\\PHPMongoQuery' => __DIR__ . '/..' . '/../lib/Service/PHPMongoQuery.php', - 'OCA\\Webhooks\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php', - ); - - public static function getInitializer(ClassLoader $loader) - { - return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitWebhooks::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitWebhooks::$prefixDirsPsr4; - $loader->classMap = ComposerStaticInitWebhooks::$classMap; - - }, null, ClassLoader::class); - } -} diff --git a/lib/composer/composer/autoload_psr4.php b/lib/composer/composer/autoload_psr4.php index 74e48cf69ae..7bf40f7a6b5 100644 --- a/lib/composer/composer/autoload_psr4.php +++ b/lib/composer/composer/autoload_psr4.php @@ -9,5 +9,6 @@ return array( 'OC\\Core\\' => array($baseDir . '/core'), 'OC\\' => array($baseDir . '/lib/private'), 'OCP\\' => array($baseDir . '/lib/public'), + 'Bamarni\\Composer\\Bin\\' => array($vendorDir . '/bamarni/composer-bin-plugin/src'), '' => array($baseDir . '/lib/private/legacy'), ); diff --git a/psalm.xml b/psalm.xml index 2f1e226b5cf..f2aed4b382b 100644 --- a/psalm.xml +++ b/psalm.xml @@ -45,6 +45,7 @@ + diff --git a/tests/enable_all.php b/tests/enable_all.php index 35217db079a..db01de6ec41 100644 --- a/tests/enable_all.php +++ b/tests/enable_all.php @@ -24,4 +24,4 @@ enableApp('provisioning_api'); enableApp('federation'); enableApp('federatedfilesharing'); enableApp('admin_audit'); -enableApp('webhooks'); +enableApp('webhook_listeners');