Merge branch 'master' of github.com:Amsterdam/fixxx-schuldhulp

Schulddossier · Feb 26, 2018 · e0449e5 · e0449e5
2 parents 3c79f18 + ad82dcd
commit e0449e5
Show file tree

Hide file tree

Showing 20 changed files with 2,426 additions and 566 deletions.
diff --git a/.env.dist b/.env.dist
@@ -8,3 +8,10 @@ APP_SECRET=2f3e64e890898f416ab7980ef97fede2
 #TRUSTED_PROXIES=127.0.0.1,127.0.0.2
 #TRUSTED_HOSTS=localhost,example.com
 ###< symfony/framework-bundle ###
+
+###> doctrine/doctrine-bundle ###
+# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
+# Configure your db driver and server_version in config/packages/doctrine.yaml
+DATABASE_URL=mysql://db_user:[email protected]:3306/db_name
+###< doctrine/doctrine-bundle ###
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,17 @@
 
+# IDE
+.buildpath
+.project
+.settings/
+
+# OS
+.DS_Store
+Thumbs.db
+__MACOSX
+
+# Composer
+composer.phar
+
 ###> symfony/framework-bundle ###
 .env
 /public/bundles/

diff --git a/bin/console b/bin/console
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-use App\Kernel;
+use GemeenteAmsterdam\FixxxSchuldhulp\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
 use Symfony\Component\Debug\Debug;

diff --git a/composer.json b/composer.json
@@ -1,13 +1,18 @@
 {
     "type": "project",
-    "license": "proprietary",
+    "license": "MPLv2",
     "require": {
         "php": "^7.1.3",
         "ext-iconv": "*",
+        "sensio/framework-extra-bundle": "^5.1",
         "symfony/console": "^4.0",
         "symfony/flex": "^1.0",
         "symfony/framework-bundle": "^4.0",
         "symfony/lts": "^4@dev",
+        "symfony/maker-bundle": "^1.1",
+        "symfony/orm-pack": "^1.0",
+        "symfony/templating": "^4.0",
+        "symfony/validator": "^4.0",
         "symfony/yaml": "^4.0"
     },
     "require-dev": {
@@ -22,12 +27,12 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "src/"
+            "GemeenteAmsterdam\\FixxxSchuldhulp\\": "src/"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\Tests\\": "tests/"
+            "GemeenteAmsterdam\\FixxxSchuldhulp\\Tests\\": "tests/"
         }
     },
     "replace": {