11 changed files with 45 additions and 72 deletions
--- a/cms.Dockerfile
+++ b/cms.Dockerfile
@ -39,6 +39,7 @@ RUN mv composer.phar /usr/local/bin/composer
 COPY --chown=www-data:www-data ./composer.* ./
 RUN sudo -u www-data mkdir public
 RUN sudo -u www-data composer install
+RUN ./vendor/bin/sake installsake

 COPY .docker/xdebug.ini $PHP_INI_DIR/conf.d/
 COPY .docker/date.ini $PHP_INI_DIR/conf.d/
--- a/app/_config.php
+++ b/app/_config.php
@ -6,4 +6,4 @@ use SilverStripe\Security\Member;
 // remove PasswordValidator for SilverStripe 5.0
 $validator = PasswordValidator::create();
 // Settings are registered via Injector configuration - see passwords.yml in framework
-Member::set_password_validator($validator);
+Member::set_password_validator($validator);
--- a/app/src/Page.php
+++ b/app/src/Page.php
@ -10,4 +10,6 @@ namespace

        private static $has_one = [];
    }
-}
+}
+
+?>
--- a/app/src/PageController.php
+++ b/app/src/PageController.php
@ -30,4 +30,4 @@ namespace {
            // See: https://docs.silverstripe.org/en/developer_guides/templates/requirements/
        }
    }
-}
+}
--- a/composer.json
+++ b/composer.json
@ -1,40 +1,8 @@
 {
    "name": "manuth/nuth.ch",
    "type": "silverstripe-recipe",
-    "version": "1.0",
    "description": "The source code of nuth.ch",
-    "authors": [
-        {
-            "name": "Manuel Thalmann",
-            "email": "m@nuth.ch",
-            "homepage": "https://nuth.ch/"
-        }
-    ],
-    "license": "MIT",
-    "keywords": [
-        "Homepage",
-        "Website",
-        "m@nuth",
-        "SilverStripe"
-    ],
-    "repositories": [
-        {
-            "type": "git",
-            "url": "https://git.nuth.ch/manuth/nuth.ch.git"
-        }
-    ],
-    "support": {
-        "issues": "https://git.nuth.ch/manuth/nuth.ch/issues"
-    },
-    "homepage": "https://nuth.ch/",
-    "scripts": {
-        "lint": "phpcs --report=csv ."
-    },
-    "config": {
-        "process-timeout": 600
-    },
-    "prefer-stable": true,
-    "minimum-stability": "dev",
+    "version": "1.0",
    "require": {
        "php": ">=5.6.0",
        "silverstripe/recipe-plugin": "^1.2",
@ -45,6 +13,9 @@
        "phpunit/phpunit": "^5.7",
        "squizlabs/php_codesniffer": "*"
    },
+    "scripts": {
+        "lint": "phpcs --report=csv ."
+    },
    "extra": {
        "project-files-installed": [
            "app/.htaccess",
@ -60,5 +31,10 @@
            "install.php",
            "web.config"
        ]
-    }
+    },
+    "config": {
+        "process-timeout": 600
+    },
+    "prefer-stable": true,
+    "minimum-stability": "dev"
 }
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "61f2f934e1828cc882b4efaebc45fe21",
+    "content-hash": "a4dcebfb359ae2174165b199f26c9ef2",
    "packages": [
        {
            "name": "composer/ca-bundle",
@ -2739,20 +2739,20 @@
        },
        {
            "name": "myclabs/deep-copy",
-            "version": "1.9.1",
+            "version": "1.9.0",
            "source": {
                "type": "git",
                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
+                "reference": "78af75148f9fdd34ea727c8b529a9b4a8f7b740c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
-                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/78af75148f9fdd34ea727c8b529a9b4a8f7b740c",
+                "reference": "78af75148f9fdd34ea727c8b529a9b4a8f7b740c",
                "shasum": ""
            },
            "require": {
-                "php": "^7.1"
+                "php": "^7.2"
            },
            "replace": {
                "myclabs/deep-copy": "self.version"
@ -2760,6 +2760,8 @@
            "require-dev": {
                "doctrine/collections": "^1.0",
                "doctrine/common": "^2.6",
+                "phpstan/phpstan": "^0.9.2",
+                "phpstan/phpstan-phpunit": "^0.9.4",
                "phpunit/phpunit": "^7.1"
            },
            "type": "library",
@ -2783,7 +2785,7 @@
                "object",
                "object graph"
            ],
-            "time": "2019-04-07T13:18:21+00:00"
+            "time": "2018-10-30T00:14:44+00:00"
        },
        {
            "name": "phpdocumentor/reflection-common",
@ -3906,16 +3908,16 @@
        },
        {
            "name": "squizlabs/php_codesniffer",
-            "version": "3.4.2",
+            "version": "3.4.1",
            "source": {
                "type": "git",
                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8"
+                "reference": "5b4333b4010625d29580eb4a41f1e53251be6baa"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
-                "reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5b4333b4010625d29580eb4a41f1e53251be6baa",
+                "reference": "5b4333b4010625d29580eb4a41f1e53251be6baa",
                "shasum": ""
            },
            "require": {
@ -3953,7 +3955,7 @@
                "phpcs",
                "standards"
            ],
-            "time": "2019-04-10T23:49:02+00:00"
+            "time": "2019-03-19T03:22:27+00:00"
        },
        {
            "name": "webmozart/assert",
--- a/db.Dockerfile
+++ b/db.Dockerfile
@ -1 +0,0 @@
-FROM mysql:5
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,7 +6,7 @@ services:
  cms:
    build:
      context: .
-      dockerfile: ./cms.Dockerfile
+      dockerfile: ./Dockerfile
    networks:
      - nuth
    ports:
@ -14,9 +14,7 @@ services:
    depends_on: 
      - db
  db:
-    build:
-      context: .
-      dockerfile: ./db.Dockerfile
+    image: mysql:5
    networks:
      - nuth
    ports:
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@ -1,6 +1,6 @@
 <?xml version="1.0"?>
-<ruleset name="Custom">
-    <description>A custom coding standard</description>
+<ruleset name="SS3">
+    <description>Coding standard for SilverStripe 4.x</description>

    <!-- Don't sniff third party libraries -->
    <exclude-pattern>*/themes/simple/*</exclude-pattern>
@ -10,24 +10,16 @@
    <!-- Show progress and output sniff names on violation, and add colours -->
    <arg value="sp"/>
    <arg name="colors"/>
-    <arg name="report" value="csv"/>
-    <arg name="extensions" value="php/php,inc/php"/>

    <!-- Use PSR-2 as a base standard -->
    <rule ref="PSR2">
-        <!-- Allow Windows-like EOL-characters -->
-        <exclude name="Generic.Files.LineEndings.InvalidEOLChar"/>
        <!-- Allow classes to not declare a namespace -->
        <exclude name="PSR1.Classes.ClassDeclaration.MissingNamespace"/>
-        <!-- Allow namespaces without a following EOL-character -->
-        <exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
-        <!-- Allow files to have no EOL-character at the end of the file -->
-        <exclude name="PSR2.Files.EndFileNewline.NoneFound"/>
+
        <!-- Allow underscores in class names -->
        <exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
+
        <!-- Allow non camel cased method names -->
        <exclude name="PSR1.Methods.CamelCapsMethodName.NotCamelCaps"/>
    </rule>
-    <!-- Force files to have no EOL-character at the end of file -->
-    <rule ref="Generic.Files.EndFileNoNewline.Found"/>
 </ruleset>
--- a/public/index.php
+++ b/public/index.php
@ -16,4 +16,4 @@ $kernel = new CoreKernel(BASE_PATH);
 $app = new HTTPApplication($kernel);
 $app->addMiddleware(new ErrorControlChainMiddleware($app));
 $response = $app->handle($request);
-$response->output();
+$response->output();
--- a/scripts/install.sh
+++ b/scripts/install.sh
@ -1,13 +1,16 @@
 #!/bin/bash
-appDir=$(dirname $(dirname $0))
 destinationDir=$(pwd)
 tempDir=$(mktemp -d)
+sourceDir="."

-rsync -a --delete $appDir/ $tempDir
+cd $(dirname $0)
+cd ..
+
+rsync -a --delete $sourceDir/ $tempDir

 # Cleaning up the built website
 find $tempDir \
-    -mindepth 1 -maxdepth 1 -and \
+    -mindepth 1 -and \
    -name "*" -and \
    -not \( \
        \( \
@ -23,7 +26,7 @@ find $tempDir \

 # Cleaning up the destination directory
 find $destinationDir \
-    -mindepth 1 -maxdepth 1 -and \
+    -mindepth 1 -and \
    -name "*" -and \
    -not -name ".env" \
    -exec rm -rf {} +
@ -34,4 +37,4 @@ rsync -a $tempDir/ $destinationDir
 # Installing the website
 cd $destinationDir
 composer install
-composer exec -- sake dev/build
+./vendor/bin/sake dev/build