manuth/nuth.ch
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'release/v1.0' into dev

Browse source
This commit is contained in:
Manuel Thalmann 2019-04-15 13:23:42 +02:00
commit 60d2972bb2
11 changed files with 72 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpcs.xml.dist → .phpcs.xml
View file

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<ruleset name="SS3">
<description>Coding standard for SilverStripe 4.x</description>
<ruleset name="Custom">
<description>A custom coding standard</description>
<!-- Don't sniff third party libraries -->
<exclude-pattern>*/themes/simple/*</exclude-pattern>
@ -10,16 +10,24 @@
<!-- 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>

2
app/_config.php
View file

@ -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);

4
app/src/Page.php
View file

@ -10,6 +10,4 @@ namespace
private static $has_one = [];
}
}
?>
}

2
app/src/PageController.php
View file

@ -30,4 +30,4 @@ namespace {
// See: https://docs.silverstripe.org/en/developer_guides/templates/requirements/
}
}
}
}

1
Dockerfile → cms.Dockerfile
View file

@ -39,7 +39,6 @@ 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/

44
composer.json
View file

@ -1,8 +1,40 @@
{
"name": "manuth/nuth.ch",
"type": "silverstripe-recipe",
"description": "The source code of nuth.ch",
"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",
"require": {
"php": ">=5.6.0",
"silverstripe/recipe-plugin": "^1.2",
@ -13,9 +45,6 @@
"phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "*"
},
"scripts": {
"lint": "phpcs --report=csv ."
},
"extra": {
"project-files-installed": [
"app/.htaccess",
@ -31,10 +60,5 @@
"install.php",
"web.config"
]
},
"config": {
"process-timeout": 600
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}

26
composer.lock generated
View file

@ -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": "a4dcebfb359ae2174165b199f26c9ef2",
"content-hash": "61f2f934e1828cc882b4efaebc45fe21",
"packages": [
{
"name": "composer/ca-bundle",
@ -2739,20 +2739,20 @@
},
{
"name": "myclabs/deep-copy",
"version": "1.9.0",
"version": "1.9.1",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "78af75148f9fdd34ea727c8b529a9b4a8f7b740c"
"reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/78af75148f9fdd34ea727c8b529a9b4a8f7b740c",
"reference": "78af75148f9fdd34ea727c8b529a9b4a8f7b740c",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
"reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
"shasum": ""
},
"require": {
"php": "^7.2"
"php": "^7.1"
},
"replace": {
"myclabs/deep-copy": "self.version"
@ -2760,8 +2760,6 @@
"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",
@ -2785,7 +2783,7 @@
"object",
"object graph"
],
"time": "2018-10-30T00:14:44+00:00"
"time": "2019-04-07T13:18:21+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@ -3908,16 +3906,16 @@
},
{
"name": "squizlabs/php_codesniffer",
"version": "3.4.1",
"version": "3.4.2",
"source": {
"type": "git",
"url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
"reference": "5b4333b4010625d29580eb4a41f1e53251be6baa"
"reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/5b4333b4010625d29580eb4a41f1e53251be6baa",
"reference": "5b4333b4010625d29580eb4a41f1e53251be6baa",
"url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
"reference": "b8a7362af1cc1aadb5bd36c3defc4dda2cf5f0a8",
"shasum": ""
},
"require": {
@ -3955,7 +3953,7 @@
"phpcs",
"standards"
],
"time": "2019-03-19T03:22:27+00:00"
"time": "2019-04-10T23:49:02+00:00"
},
{
"name": "webmozart/assert",

1
db.Dockerfile Normal file
View file

@ -0,0 +1 @@
FROM mysql:5

6
docker-compose.yml
View file

@ -6,7 +6,7 @@ services:
cms:
build:
context: .
dockerfile: ./Dockerfile
dockerfile: ./cms.Dockerfile
networks:
- nuth
ports:
@ -14,7 +14,9 @@ services:
depends_on:
- db
db:
image: mysql:5
build:
context: .
dockerfile: ./db.Dockerfile
networks:
- nuth
ports:

2
public/index.php
View file

@ -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();

13
scripts/install.sh
View file

@ -1,16 +1,13 @@
#!/bin/bash
appDir=$(dirname $(dirname $0))
destinationDir=$(pwd)
tempDir=$(mktemp -d)
sourceDir="."
cd $(dirname $0)
cd ..
rsync -a --delete $sourceDir/ $tempDir
rsync -a --delete $appDir/ $tempDir
# Cleaning up the built website
find $tempDir \
-mindepth 1 -and \
-mindepth 1 -maxdepth 1 -and \
-name "*" -and \
-not \( \
\( \
@ -26,7 +23,7 @@ find $tempDir \
# Cleaning up the destination directory
find $destinationDir \
-mindepth 1 -and \
-mindepth 1 -maxdepth 1 -and \
-name "*" -and \
-not -name ".env" \
-exec rm -rf {} +
@ -37,4 +34,4 @@ rsync -a $tempDir/ $destinationDir
# Installing the website
cd $destinationDir
composer install
./vendor/bin/sake dev/build
composer exec -- sake dev/build