diff options
author | Maxence Lange <maxence@artificial-owl.com> | 2021-12-17 01:17:49 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-17 01:17:49 +0300 |
commit | c960e2032609c2d0355702b20cb9c10982d99ff9 (patch) | |
tree | a8898bb6f8dbe7ae94217920fbd9ff85e2dc92e9 | |
parent | a0567cac9a2b64c37a528a7c19f7e13999ac3fc4 (diff) | |
parent | ad3d49aa35a2326a289f86840e8f20bd0917d788 (diff) |
Merge pull request #120 from nextcloud/release/1.0.31.0.3
1.0.3 - quickfix
-rw-r--r-- | CHANGELOG.md | 2 | ||||
-rw-r--r-- | Makefile | 4 | ||||
-rwxr-xr-x | appinfo/info.xml | 2 | ||||
-rwxr-xr-x | lib/Command/PointList.php | 14 | ||||
-rwxr-xr-x | lib/Controller/LocalController.php | 4 |
5 files changed, 14 insertions, 12 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f359f7f..75bd1e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -### 1.0.2 +### 1.0.3 - fixing a loop in DI @@ -9,8 +9,8 @@ cert_dir=$(HOME)/.nextcloud/certificates github_account=nextcloud release_account=nextcloud-releases branch=master -version=1.0.2 -since_tag=1.0.1 +version=1.0.3 +since_tag=1.0.2 all: appstore diff --git a/appinfo/info.xml b/appinfo/info.xml index fff425d..f8d2bf0 100755 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -18,7 +18,7 @@ - Restore single file or the entire instance. ]]> </description> - <version>1.0.2</version> + <version>1.0.3</version> <licence>agpl</licence> <author mail="maxence@artificial-owl.com">Maxence Lange</author> <namespace>Backup</namespace> diff --git a/lib/Command/PointList.php b/lib/Command/PointList.php index e1c9d1e..2182716 100755 --- a/lib/Command/PointList.php +++ b/lib/Command/PointList.php @@ -39,8 +39,8 @@ use OCA\Backup\Model\RemoteInstance; use OCA\Backup\Model\RestoringData; use OCA\Backup\Model\RestoringHealth; use OCA\Backup\Model\RestoringPoint; -use OCA\Backup\Service\CronService; use OCA\Backup\Service\OutputService; +use OCA\Backup\Service\PointService; use OCA\Backup\Service\RemoteStreamService; use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; @@ -57,8 +57,8 @@ class PointList extends Base { use TStringTools; - /** @var CronService */ - private $cronService; + /** @var PointService */ + private $pointService; /** @var OutputService */ private $outputService; @@ -71,16 +71,16 @@ class PointList extends Base { * PointList constructor. * * @param OutputService $outputService - * @param CronService $cronService + * @param PointService $pointService * @param RemoteStreamService $remoteStreamService */ public function __construct( OutputService $outputService, - CronService $cronService, + PointService $pointService, RemoteStreamService $remoteStreamService ) { $this->outputService = $outputService; - $this->cronService = $cronService; + $this->pointService = $pointService; $this->remoteStreamService = $remoteStreamService; parent::__construct(); @@ -116,7 +116,7 @@ class PointList extends Base { */ protected function execute(InputInterface $input, OutputInterface $output): int { $this->outputService->setOutput($output); - $rp = $this->cronService->getRPFromInstances( + $rp = $this->pointService->getRPFromInstances( $input->getOption('local'), $input->getOption('remote'), $input->getOption('external') diff --git a/lib/Controller/LocalController.php b/lib/Controller/LocalController.php index 7c02592..30c95c7 100755 --- a/lib/Controller/LocalController.php +++ b/lib/Controller/LocalController.php @@ -31,6 +31,7 @@ declare(strict_types=1); namespace OCA\Backup\Controller; +use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException; use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc23\TNC23Controller; use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc23\TNC23Deserialize; use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc23\TNC23Logger; @@ -176,9 +177,10 @@ class LocalController extends OcsController { /** * @return DataResponse + * @throws SignatureException */ public function getRestoringPoints(): DataResponse { - $points = $this->cronService->getRPFromInstances(); + $points = $this->pointService->getRPFromInstances(); return new DataResponse($points); } |