Added composer with parsedown requirement

This commit is contained in:
Igor Scheller 2017-01-02 02:19:17 +01:00
parent bc91daedca
commit 94b5250414
7 changed files with 34 additions and 7 deletions

4
.gitignore vendored
View File

@ -20,3 +20,7 @@ _vimrc_local.vim
# Project files # Project files
/config/config.php /config/config.php
/test/coverage /test/coverage
# Composer files
/vendor/
/composer.lock

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "vendor/parsedown"]
path = vendor/parsedown
url = https://github.com/erusev/parsedown.git
[submodule "vendor/bootstrap"] [submodule "vendor/bootstrap"]
path = themes/assets/bootstrap path = themes/assets/bootstrap
url = https://github.com/twbs/bootstrap.git url = https://github.com/twbs/bootstrap.git

View File

@ -7,6 +7,8 @@
## Directions: ## Directions:
* Clone the master branch with the submodules: `git clone --recursive https://github.com/engelsystem/engelsystem.git` * Clone the master branch with the submodules: `git clone --recursive https://github.com/engelsystem/engelsystem.git`
* Install [Composer](https://getcomposer.org/download/)
* Install project dependencies: `composer install`
* Webserver must have write access to the 'import' directory and read access for all other directories * Webserver must have write access to the 'import' directory and read access for all other directories
* Webserver must be public. * Webserver must be public.

View File

@ -10,6 +10,8 @@
## Vorgehen: ## Vorgehen:
* Klonen des `master` inkl. submodules in lokales Verzeichnis: `git clone --recursive https://github.com/engelsystem/engelsystem.git` * Klonen des `master` inkl. submodules in lokales Verzeichnis: `git clone --recursive https://github.com/engelsystem/engelsystem.git`
* [Composer](https://getcomposer.org/download/) installieren
* Abhängigkeiten installieren: `composer install`
* Der Webserver muss Schreibrechte auf das Verzeichnis `import` bekommen, für alle anderen Dateien reichen Leserechte. * Der Webserver muss Schreibrechte auf das Verzeichnis `import` bekommen, für alle anderen Dateien reichen Leserechte.
* Der Webserver muss auf `public` als http-root zeigen. * Der Webserver muss auf `public` als http-root zeigen.

20
composer.json Normal file
View File

@ -0,0 +1,20 @@
{
"name": "engelsystem/engelsystem",
"description": "Shift planning system for chaos events",
"type": "project",
"license": "GPL-2.0",
"authors": [
{
"name": "msquare",
"email": "msquare@notrademark.de"
},
{
"name": "MyIgel",
"email": "igor.scheller@igorshp.de"
}
],
"require": {
"php": ">=5.4",
"erusev/parsedown": "1.6.*"
}
}

View File

@ -2,6 +2,11 @@
/** /**
* This file includes all needed functions, connects to the db etc. * This file includes all needed functions, connects to the db etc.
*/ */
if(!is_readable(__DIR__ . '/../vendor/autoload.php')){
die('Please run composer.phar install');
}
require __DIR__ . '/../vendor/autoload.php';
require_once realpath(__DIR__ . '/../includes/mysqli_provider.php'); require_once realpath(__DIR__ . '/../includes/mysqli_provider.php');
require_once realpath(__DIR__ . '/../includes/sys_auth.php'); require_once realpath(__DIR__ . '/../includes/sys_auth.php');
@ -91,8 +96,6 @@ require_once realpath(__DIR__ . '/../includes/pages/user_questions.php');
require_once realpath(__DIR__ . '/../includes/pages/user_settings.php'); require_once realpath(__DIR__ . '/../includes/pages/user_settings.php');
require_once realpath(__DIR__ . '/../includes/pages/user_shifts.php'); require_once realpath(__DIR__ . '/../includes/pages/user_shifts.php');
require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php');
session_start(); session_start();
gettext_init(); gettext_init();

1
vendor/parsedown vendored

@ -1 +0,0 @@
Subproject commit 3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7