Merge branch '2.3'

# Conflicts:
#	.travis.yml

.travis.yml

@@ -1,52 +1,4 @@
-language: php
+version: ~> 1.0
 
-dist: xenial
-
-services:
-  - mysql
-  - postgresql
-
-cache:
-  directories:
-    - $HOME/.composer/cache/files
-
-addons:
-  apt:
-    packages:
-      - tidy
-
-env:
-  global:
-    - COMPOSER_ROOT_VERSION=dev-master
-
-matrix:
-  include:
-    - php: 5.6
-      env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
-    - php: 7.1
-      env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 PHPUNIT_COVERAGE_TEST=1
-    - php: 7.2
-      env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
-    - php: 7.3
-      env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
-    - php: 7.4
-      env: DB=MYSQL RECIPE_VERSION=4.x-dev
-
-before_script:
-  # Init PHP
-  - phpenv rehash
-  - phpenv config-rm xdebug.ini || true
-
-  - composer require --no-update silverstripe/recipe-cms "$RECIPE_VERSION"
-  # Fix for running phpunit 5 on php 7.4+
-  - composer require --no-update sminnee/phpunit-mock-objects:^3
-  - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
-  - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
-
-script:
-  - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
-  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/; fi
-
-after_success:
-  - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml; fi
+import:
+  - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml

README.md

@@ -28,18 +28,19 @@ By default, the module will read your installed modules,
 and present them as a report in the CMS under `admin/reports`.
 
 In order to get information about potential updates to these modules,
-we recommend the installation of two additional modules.
+we recommend the installation of the following additional module:
 
 - [bringyourownideas/silverstripe-composer-update-checker](https://github.com/bringyourownideas/silverstripe-composer-update-checker) checks for available updates of dependencies
-- [bringyourownideas/silverstripe-composer-security-checker](https://github.com/bringyourownideas/silverstripe-composer-security-checker) checks for known security vulnerabilities
-
+
+The previously recommended silverstripe-composer-security-checker module [can't work anymore](https://github.com/bringyourownideas/silverstripe-composer-security-checker/issues/57) and isn't recommended to be used anymore.
+
 
 ### Installation 
 
-Option 1 (recommended): Install the maintenance package and suggested dependencies
+Option 1 (recommended): Install the maintenance package and suggested dependency
 
 ```
-composer require bringyourownideas/silverstripe-maintenance bringyourownideas/silverstripe-composer-security-checker bringyourownideas/silverstripe-composer-update-checker
+composer require bringyourownideas/silverstripe-maintenance bringyourownideas/silverstripe-composer-update-checker
 ```
 
 Option 2 (minimal): Install only the maintenance package without any update checks
@@ -49,6 +50,7 @@ composer require bringyourownideas/silverstripe-maintenance
 ```
 
 Build schema and queue an initial job to populate the database:
+
 ```
 sake dev/build
 ```
@@ -70,12 +72,7 @@ Run the update task (includes the [update-checker](https://github.com/bringyouro
 ```
 sake dev/tasks/UpdatePackageInfoTask
 ```
-
-Run the security update check task (requires the [security-checker](https://github.com/bringyourownideas/silverstripe-composer-security-checker))
 
-```
-sake dev/tasks/SecurityAlertCheckTask
-```   
 
 ## How your composer.json influences the report
 

composer.json

@@ -15,7 +15,7 @@
     "authors": [
         {
             "name": "Peter Thaleikis",
-            "homepage": "https://thaleikis.de"
+            "homepage": "https://releasecandidate.dev"
         }
     ],
     "require": {
@@ -25,8 +25,9 @@
         "guzzlehttp/guzzle": "^6.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
-        "squizlabs/php_codesniffer": "^3"
+        "sminnee/phpunit": "^5.7",
+        "squizlabs/php_codesniffer": "^3",
+        "symfony/thanks": "^1.0"
     },
     "autoload": {
         "psr-4": {
@@ -43,7 +44,6 @@
         ]
     },
     "suggest": {
-        "bringyourownideas/silverstripe-composer-security-checker": "Checks for known security vulnerabilities",
         "bringyourownideas/silverstripe-composer-update-checker": "Checks for available updates of dependencies"
     },
     "support": {

phpcs.xml.dist

@@ -2,6 +2,9 @@
 <ruleset name="SilverStripe">
     <description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
 
+    <file>src</file>
+    <file>tests</file>
+
     <!-- base rules are PSR-2 -->
     <rule ref="PSR2" >
         <!-- Current exclusions -->