Merge pull request #446: move deployment to Composer, update SwiftMailer/markdown libs

Author: iansltx

.gitignore

@@ -9,4 +9,5 @@ src/database.php
 vendor/.git
 .idea
 node_modules
+vendor
 diff.txt

.travis.yml

@@ -7,12 +7,10 @@ cache:
 matrix:
   include:
     - php: 5.6
+    - php: 7.3
   fast_finish: true
 before_script:
-  - composer global require squizlabs/php_codesniffer 
-  - composer global require phpunit/phpunit
-  - composer global require jakub-onderka/php-parallel-lint
   - composer install
   - cp src/config.php.dist src/config.php
 script:
-- PATH=$HOME/.composer/vendor/bin:$PATH ./build.sh
+- ./build.sh

build.sh

@@ -1,17 +1,19 @@
 #!/bin/bash
 set -e
 
-parallel-lint --exclude vendor .
+vendor/bin/parallel-lint --exclude vendor .
 git diff origin/master... > diff.txt
 
-phpcs \
+vendor/bin/phpcs \
     --standard=tools/codesniffer/JoindInPSR2/ruleset.xml \
     --ignore=**/config.php,**/database.php,vendor,tools,tests/bootstrap.php \
     --extensions=php \
     --runtime-set ignore_warnings_on_exit true \
     -p \
     .
 
-cd tests
-phpunit
-./diffFilter.phar --phpunit ../diff.txt build/logs/clover.xml 80
+
+php vendor/bin/security-checker security:check composer.lock
+
+vendor/bin/phpunit
+vendor/bin/diffFilter --phpunit diff.txt build/logs/clover.xml 80

composer.json

@@ -1,9 +1,62 @@
 {
-    "preferred-install": "dist",
+    "name" : "joindin/joindin-api",
+    "description" : "The API-backend that powers joind.in",
+    "keywords" : ["joind.in", "events", "talks", "speaking", "feedback"],
+    "homepage" : "https://api.joind.in",
+    "license" : "BSD-3-Clause",
+    "support" : {
+        "issues" : "https://github.com/joindin/joindin-api/issues",
+        "irc" : "irc://freenet/#joindin",
+        "source" : "https://github.com/joindin/joindin-api"
+    },
     "require" : {
-        "swiftmailer/swiftmailer": "v5.0.3",
-        "michelf/php-markdown": "1.4.0",
+        "ext-pdo": "*",
+        "ext-json": "*",
+        "swiftmailer/swiftmailer": "^v5.4.9",
+        "michelf/php-markdown": "^1.8",
         "guzzlehttp/guzzle": "^4.2.4",
         "guzzlehttp/oauth-subscriber": "0.1.*"
+    },
+    "require-dev": {
+        "exussum12/coverage-checker": "^0.11.0",
+        "jakub-onderka/php-parallel-lint": "^1.0",
+        "phpunit/dbunit": "^2.0",
+        "phpunit/phpunit": "^5.7",
+        "roave/security-advisories": "dev-master",
+        "squizlabs/php_codesniffer": "^3.4",
+        "sensiolabs/security-checker": "^5.0"
+    },
+    "autoload" : {
+        "psr-4" : {
+            "Joindin\\Modifier\\" : "src/Modifier/"
+        },
+        "classmap" : [
+            "src/controllers",
+            "src/inc",
+            "src/models",
+            "src/routers",
+            "src/services",
+            "src/views"
+        ]
+    },
+    "autoload-dev" : {
+        "psr-4" : {
+            "JoindinTest\\" : "tests/"
+        },
+        "classmap" : [
+            "tests/controllers",
+            "tests/inc",
+            "tests/models",
+            "tests/routers",
+            "tests/views"
+        ]
+    },
+    "config" : {
+        "preferred-install": "dist",
+        "platform" : {
+            "php": "5.6.6"
+        },
+        "sort-packages" : true,
+        "optimize-autoloader" : true
     }
 }