Merge pull request #43 from nextcloud/release-20.1.0

removing composer libs

Author: ArtificialOwl

CHANGELOG.md

@@ -1,8 +1,7 @@
 # Changelog
 
 
-
-### 21.0.0
+### 20.1.0
 
 - compat nc23
 

Makefile

@@ -10,7 +10,7 @@ cert_dir=$(HOME)/.nextcloud/certificates
 codecov_token_dir=$(HOME)/.nextcloud/codecov_token
 github_account=nextcloud
 branch=master
-version+=21.0.0
+version+=20.1.0
 
 all: appstore
 
@@ -40,18 +40,15 @@ clean:
 	rm -rf $(build_dir)
 	rm -rf node_modules
 
-composer:
-	composer install --prefer-dist
-
 test: SHELL:=/bin/bash
-test: composer
+test:
 	phpunit --coverage-clover=coverage.xml --configuration=tests/phpunit.xml tests
 	@if [ -f $(codecov_token_dir)/$(app_name) ]; then \
 		bash <(curl -s https://codecov.io/bash) -t @$(codecov_token_dir)/$(app_name) ; \
 	fi
 
 
-appstore: composer clean
+appstore: clean
 	mkdir -p $(sign_dir)
 	rsync -a \
 	--exclude=/build \
@@ -61,8 +58,6 @@ appstore: composer clean
 	--exclude=/tests \
 	--exclude=.git \
 	--exclude=/.github \
-	--exclude=/composer.json \
-	--exclude=/composer.lock \
 	--exclude=/l10n/l10n.pl \
 	--exclude=/CONTRIBUTING.md \
 	--exclude=/issue_template.md \
@@ -72,7 +67,6 @@ appstore: composer clean
 	--exclude=/.scrutinizer.yml \
 	--exclude=/.travis.yml \
 	--exclude=/Makefile \
-	--exclude=/vendor/picocms/pico/index.php \
 	$(project_dir)/ $(sign_dir)/$(app_name)
 	tar -czf $(build_dir)/$(app_name)-$(version).tar.gz \
 		-C $(sign_dir) $(app_name)

appinfo/info.xml

@@ -10,7 +10,7 @@ Allow your users to temporary lock their files to avoid conflicts while working
 
 ]]>
 	</description>
-	<version>21.0.0</version>
+	<version>20.1.0</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
 	<namespace>FilesLock</namespace>

composer.json

@@ -52,9 +52,6 @@
 use Throwable;
 
 
-require_once __DIR__ . '/../../vendor/autoload.php';
-
-
 /**
  * Class Application
  *
@@ -122,7 +119,7 @@ public function registerHooks(IServerContainer $container) {
 		$this->lockService = $container->get(LockService::class);
 
 		$eventDispatcher->addListener(
-			'OCA\DAV\Connector\Sabre::addPlugin', function(SabrePluginEvent $e) {
+			'OCA\DAV\Connector\Sabre::addPlugin', function (SabrePluginEvent $e) {
 			$server = $e->getServer();
 			$absolute = false;
 			switch (get_class($server->tree)) {
@@ -152,16 +149,16 @@ public function registerHooks(IServerContainer $container) {
 	 */
 	public function addStorageWrapper() {
 		Filesystem::addStorageWrapper(
-			'files_lock', function($mountPoint, $storage) {
+			'files_lock', function ($mountPoint, $storage) {
 			return new LockWrapper(
 				[
-					'storage'      => $storage,
+					'storage' => $storage,
 					'user_session' => $this->userSession,
 					'file_service' => $this->fileService,
 					'lock_service' => $this->lockService
 				]
 			);
-		}, 10
+		},  10
 		);
 	}
 

composer.lock

@@ -30,12 +30,13 @@
 namespace OCA\FilesLock\Controller;
 
 
-use daita\MySmallPhpTools\Traits\Nextcloud\TNCDataResponse;
 use Exception;
 use OCA\FilesLock\AppInfo\Application;
 use OCA\FilesLock\Service\FileService;
 use OCA\FilesLock\Service\LockService;
+use OCA\FilesLock\Tools\Traits\TLogger;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
 use OCP\IUserSession;
@@ -49,7 +50,7 @@
 class LockController extends Controller {
 
 
-	use TNCDataResponse;
+	use TLogger;
 
 
 	/** @var IUserSession */
@@ -95,7 +96,7 @@ public function locking(string $fileId): DataResponse {
 
 			$lock = $this->lockService->lockFile($file, $user);
 
-			return $this->directSuccess($lock);
+			return new DataResponse($lock, Http::STATUS_OK);
 		} catch (Exception $e) {
 			return $this->fail($e);
 		}
@@ -115,11 +116,41 @@ public function unlocking(string $fileId): DataResponse {
 			$user = $this->userSession->getUser();
 			$this->lockService->unlockFile((int)$fileId, $user->getUID());
 
-			return $this->success();
+			return new DataResponse();
 		} catch (Exception $e) {
 			return $this->fail($e);
 		}
 	}
 
-}
 
+	/**
+	 * @param Exception $e
+	 * @param array $more
+	 * @param int $status
+	 *
+	 * @param bool $log
+	 *
+	 * @return DataResponse
+	 */
+	protected function fail(
+		Exception $e,
+		array $more = [],
+		int $status = Http::STATUS_INTERNAL_SERVER_ERROR,
+		bool $log = true
+	): DataResponse {
+		$data = array_merge(
+			$more,
+			[
+				'status' => -1,
+				'exception' => get_class($e),
+				'message' => $e->getMessage()
+			]
+		);
+
+		if ($log) {
+			$this->log(2, $status . ' - ' . json_encode($data));
+		}
+
+		return new DataResponse($data, $status);
+	}
+}

lib/AppInfo/Application.php

@@ -30,39 +30,30 @@
 namespace OCA\FilesLock\Db;
 
 
-use daita\MySmallPhpTools\Db\ExtendedQueryBuilder;
-use daita\MySmallPhpTools\IExtendedQueryBuilder;
+use OCA\FilesLock\Tools\Db\ExtendedQueryBuilder;
 
 
 /**
- * Class LocksQueryBuilder
  *
- * @package OCA\FilesLock\Db
  */
-class LocksQueryBuilder extends ExtendedQueryBuilder {
+class CoreQueryBuilder extends ExtendedQueryBuilder {
 
 
 	/**
 	 * @param int $fileId
 	 *
-	 * @return IExtendedQueryBuilder
+	 * @return CoreQueryBuilder
 	 */
-	public function limitToFileId(int $fileId): IExtendedQueryBuilder {
-		$this->limitToDBFieldInt('file_id', $fileId);
-
-		return $this;
+	public function limitToFileId(int $fileId): void {
+		$this->limitInt('file_id', $fileId);
 	}
 
 
 	/**
 	 * @param array $ids
-	 *
-	 * @return IExtendedQueryBuilder
 	 */
-	public function limitToIds(array $ids): IExtendedQueryBuilder {
-		$this->limitToDBFieldArray('id', $ids);
-
-		return $this;
+	public function limitToIds(array $ids): void {
+		$this->limitArray('id', $ids);
 	}
 
 }