flywithu/ocsms
1
0
Fork 0
mirror of https://github.com/nerzhul/ocsms.git synced 2025-06-08 00:16:24 +00:00
Code Issues Releases Wiki Activity

Fixed Nextcloud 12 compatibility (#181)

Browse Source
This commit is contained in:
Lorenz Brun 2017-05-06 08:12:41 +02:00 committed by Loïc Blot
parent 16064af6d5
commit db70056825
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appinfo/info.xml
View File

@ -13,7 +13,7 @@
<dependencies> <dependencies>
<php min-version="5.6" min-int-size="32"/> <php min-version="5.6" min-int-size="32"/>
<owncloud min-version="8.1" max-version="9.2" /> <owncloud min-version="8.1" max-version="9.2" />
<nextcloud min-version="9.0" max-version="11.0" /> <nextcloud min-version="9.0" max-version="12.0" />
</dependencies> </dependencies>
<ocsid>167289</ocsid> <ocsid>167289</ocsid>

6
appinfo/ocsmsapp.php
View File

@ -53,7 +53,7 @@ class OcSmsApp extends App {
*/ */
$container->registerService('ConfigMapper', function (IContainer $c) use ($server) { $container->registerService('ConfigMapper', function (IContainer $c) use ($server) {
return new ConfigMapper( return new ConfigMapper(
$server->getDb(), $server->getDatabaseConnection(),
$c->query('UserId'), $c->query('UserId'),
$server->getCrypto() $server->getCrypto()
); );
@ -64,12 +64,12 @@ class OcSmsApp extends App {
}); });
$container->registerService('ConversationStateMapper', function(IContainer $c) use ($server) { $container->registerService('ConversationStateMapper', function(IContainer $c) use ($server) {
return new ConversationStateMapper($server->getDb()); return new ConversationStateMapper($server->getDatabaseConnection());
}); });
$container->registerService('SmsMapper', function(IContainer $c) use ($server) { $container->registerService('SmsMapper', function(IContainer $c) use ($server) {
return new SmsMapper( return new SmsMapper(
$server->getDb(), $server->getDatabaseConnection(),
$c->query('ConversationStateMapper') $c->query('ConversationStateMapper')
); );
}); });

4
db/configmapper.php
View File

@ -11,7 +11,7 @@
namespace OCA\OcSms\Db; namespace OCA\OcSms\Db;
use \OCP\IDb; use \OCP\IDBConnection;
use \OCP\AppFramework\Db\Mapper; use \OCP\AppFramework\Db\Mapper;
use \OCP\AppFramework\Db\DoesNotExistException; use \OCP\AppFramework\Db\DoesNotExistException;
@ -28,7 +28,7 @@ class ConfigMapper extends Mapper {
*/ */
private $crypto; private $crypto;
public function __construct (IDb $db, $user, $crypto){ public function __construct (IDBConnection $db, $user, $crypto){
parent::__construct($db, 'ocsms_config'); parent::__construct($db, 'ocsms_config');
$this->user = $user; $this->user = $user;
$this->crypto = $crypto; $this->crypto = $crypto;

4
db/conversationstatemapper.php
View File

@ -11,7 +11,7 @@
namespace OCA\OcSms\Db; namespace OCA\OcSms\Db;
use \OCP\IDb; use \OCP\IDBConnection;
use \OCP\AppFramework\Db\Mapper; use \OCP\AppFramework\Db\Mapper;
@ -19,7 +19,7 @@ use \OCA\OcSms\AppInfo\OcSmsApp;
use \OCA\OcSms\Lib\PhoneNumberFormatter; use \OCA\OcSms\Lib\PhoneNumberFormatter;
class ConversationStateMapper extends Mapper { class ConversationStateMapper extends Mapper {
public function __construct (IDb $db) { public function __construct (IDBConnection $db) {
parent::__construct($db, 'ocsms_smsdatas'); parent::__construct($db, 'ocsms_smsdatas');
} }

4
db/smsmapper.php
View File

@ -11,7 +11,7 @@
namespace OCA\OcSms\Db; namespace OCA\OcSms\Db;
use \OCP\IDb; use \OCP\IDBConnection;
use \OCP\AppFramework\Db\Mapper; use \OCP\AppFramework\Db\Mapper;
@ -33,7 +33,7 @@ class SmsMapper extends Mapper {
); );
private $convStateMapper; private $convStateMapper;
public function __construct (IDb $db, ConversationStateMapper $cmapper) { public function __construct (IDBConnection $db, ConversationStateMapper $cmapper) {
parent::__construct($db, 'ocsms_smsdatas'); parent::__construct($db, 'ocsms_smsdatas');
$this->convStateMapper = $cmapper; $this->convStateMapper = $cmapper;
} }