#35825【機関ストレージ】 最新バージョンへの対応

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - '7.4'
+  - '8.1'
 
 env:
   global:
@@ -19,7 +19,7 @@ before_script:
   - git clone https://github.com/nextcloud/server.git
   - mv server/ nextcloud
   - cd nextcloud
-  - git checkout origin/stable19 -b stable19
+  - git checkout origin/stable25 -b stable25
   - mkdir custom_apps
   - cp -pi ${TRAVIS_BUILD_DIR}/travis/apps.config.php config
   - cd 3rdparty

appinfo/app.php

@@ -4,5 +4,5 @@
 
 use OCA\ChecksumAPI\AppInfo\Application;
 
-$app = \OC::$server->query(Application::class);
+$app = \OC::$server->get(Application::class);
 $app->register();

appinfo/info.xml

@@ -16,6 +16,6 @@
     <category>tools</category>
     <bugs>https://github.com/RCOSDP/nextcloud-checksum_api/issues</bugs>
     <dependencies>
-        <nextcloud min-version="15" max-version="19" />
+        <nextcloud min-version="25" max-version="26" />
     </dependencies>
 </info>

lib/AppInfo/Application.php

@@ -17,13 +17,11 @@ public function __construct(array $urlParams = []) {
         /**
          * Controllers
          */
-        $container->registerService('UserHooks', function() {
-            $container = $this->getContainer();
-            $server = $container->getServer();
+        $container->registerService('UserHooks', function($c) {
             return new UserHooks(
-                $server->getLogger(),
-                $server->getRootFolder(),
-                $server->getDatabaseConnection()
+                $c->get('ServerContainer')->getLogger(),
+                $c->get('ServerContainer')->getRootFolder(),
+                $c->get('ServerContainer')->getDatabaseConnection(),
             );
         });
     }
@@ -34,6 +32,6 @@ public function register() {
 
     public function registerHooks() {
         $container = $this->getContainer();
-        $container->query('UserHooks')->register();
+        $container->get('UserHooks')->register();
     }
 }

lib/Controller/ChecksumAPIController.php

@@ -4,14 +4,12 @@
 
 namespace OCA\ChecksumAPI\Controller;
 
-use OC\Files\Filesystem;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
-use OCP\IDBConnection;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 use OCP\IRequest;
 use OCP\IUserSession;
 
@@ -32,7 +30,7 @@ public function __construct($appName,
                                 IRootFolder $rootFolder,
                                 IUserSession $userSession,
                                 HashMapper $mapper,
-                                ILogger $logger) {
+                                LoggerInterface $logger) {
         parent::__construct($appName, $request);
         $this->rootFolder = $rootFolder;
         $this->userSession = $userSession;
@@ -140,7 +138,7 @@ public function checksum($hash, $path, $revision) {
                 $this->logger->info('latest version matches');
             } else {
                 // check if version function is enabled
-                if (!\OCP\App::isEnabled($this->versionAppId)) {
+                if (!\OC_App::isEnabled($this->versionAppId)) {
                     $this->logger->error('version function is not enabled');
                     return new DataResponse(
                         'version function is not enabled',

lib/Hooks/UserHooks.php

@@ -7,9 +7,9 @@
 use OCP\Files\IRootFolder;
 use OCP\IDBConnection;
 use OCP\ILogger;
-use OC\Files\Filesystem;
 use OC\Files\Node\Node;
 
+use OC\Files\View;
 use OCA\ChecksumAPI\Db\HashMapper;
 
 class UserHooks {

lib/Migration/Version00001Date20201016095257.php

@@ -59,7 +59,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			]);
 			$table->addColumn('hash', 'string', [
 				'notnull' => true,
-				'length' => 64,
+				'length' => 128,
 				'default' => '',
 			]);
 			$table->setPrimaryKey(['id']);

tests/Controller/ChecksumAPIControllerTest.php

@@ -8,7 +8,7 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\Files\NotFoundException;
-use OCP\ILogger;
+use Psr\Log\LoggerInterface;
 use OCP\IRequest;
 use OCP\IUser;
 use OCP\IUserManager;
@@ -45,7 +45,7 @@ protected function setUp() :void {
 
         $this->mapper = $this->getMockBuilder(HashMapper::class)->disableOriginalConstructor()->getMock();
 
-        $this->logger = $this->getMockBuilder(ILogger::class)->getMock();
+        $this->logger = $this->getMockBuilder(LoggerInterface::class)->getMock();
 
         $this->file = $this->getMockBuilder('OCP\Files\File')->disableOriginalConstructor()->getMock();
         $this->file->method('getId')->willReturn(1);
@@ -168,7 +168,7 @@ public function testChecksumVersionAppIsDisabled() :void {
             $this->logger
         );
 
-        $status = \OCP\App::isEnabled($this->versionAppId);
+        $status = \OC_App::isEnabled($this->versionAppId);
         if ($status) {
             \OC::$server->getAppManager()->disableApp($this->versionAppId);
         }
@@ -201,7 +201,7 @@ public function testChecksumMatchesNoVersion() :void {
             $this->logger
         );
 
-        $status = \OCP\App::isEnabled($this->versionAppId);
+        $status = \OC::$server->getAppManager()->isEnabledForUser($this->versionAppId);
         if (!$status) {
             \OC::$server->getAppManager()->disableApp($this->versionAppId);
         }
@@ -246,7 +246,7 @@ public function testChecksumSucceedWithoutRevision() :void {
             $this->logger
         );
 
-        $status = \OCP\App::isEnabled($this->versionAppId);
+        $status = \OC::$server->getAppManager()->isEnabledForUser($this->versionAppId);
         if (!$status) {
             \OC::$server->getAppManager()->disableApp($this->versionAppId);
         }