Use composer directory for autoloading

Signed-off-by: Julius Härtl <jus@bitgrid.net>

Makefile

@@ -23,12 +23,15 @@ install-deps: install-deps-js
 install-deps-nodev: install-deps-js
 	composer install --no-dev
 
+autoloader:
+	composer dump-autoload
+
 install-deps-js:
 	npm ci
 
 build: clean-dist install-deps build-js
 
-release: clean-dist install-deps-nodev build-js
+release: clean-dist install-deps-nodev autoloader build-js
 
 build-js: install-deps-js
 	npm run build

appinfo/autoload.php

@@ -1,29 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016 Julius Härtl <jus@bitgrid.net>
- *
- * @author Julius Härtl <jus@bitgrid.net>
- *
- * @license GNU AGPL version 3 or any later version
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- *  published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Affero General Public License for more details.
- *
- *  You should have received a copy of the GNU Affero General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-namespace OCA\Deck\AppInfo;
-
-/**
- * Additional autoloader registration, e.g. registering composer autoloaders
- */
-require_once __DIR__ . '/../vendor/autoload.php';

composer.json

@@ -21,7 +21,14 @@
 	},
 	"config": {
 		"optimize-autoloader": true,
-        "classmap-authoritative": true
+		"classmap-authoritative": true,
+		"vendor-dir": "composer",
+		"autoloader-suffix": "Deck"
+	},
+	"autoload" : {
+		"psr-4": {
+			"OCA\\Deck\\": "lib/"
+		}
 	},
 	"scripts": {
 		"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",