Travis

5 files changed, 119 insertions, 19 deletions

diff --git a/.travis.yml b/.travis.yml
index 98be84f843..c4f279bd13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,11 +23,16 @@ before_script:
   - travis_retry composer config github-oauth.github.com "${GITHUB_OAUTH_TOKEN}"
 
 script:
-  - # Check for deprecated functions and non-built-in libraries
-  - composer require wapmorgan/php-code-fixer dev-master
-  - vendor/bin/phpca
   - mkdir -p build/logs
   - vendor/bin/phpunit -c phpunit.xml.dist --coverage-clover tests/clover.xml
+  -
+  - composer require wata727/pahout
+  - vendor/bin/pahout --php-version 7.1.3 --ignore-paths=data .
+  - composer remove wata727/pahout
+  -
+  - composer require wapmorgan/php-code-fixer
+  - vendor/bin/phpcf --target=7.1 --exclude=vendor .
+  - composer remove wapmorgan/php-code-fixer
 
 after_script:
   - travis_retry php vendor/bin/php-coveralls -v
diff --git a/composer.json b/composer.json
index adcef74b4b..86386c8830 100644
--- a/composer.json
+++ b/composer.json
@@ -67,8 +67,9 @@
         "ext-pdo_sqlite": "*",
         "maximebf/debugbar": "*",
         "mockery/mockery": "*",
+        "php-coveralls/php-coveralls": "*",
         "phpunit/phpunit": "*",
-        "php-coveralls/php-coveralls": "*"
+        "wapmorgan/php-code-fixer": "dev-master"
     },
     "scripts": {
        "webtrees:build": [
@@ -80,12 +81,6 @@
            "zip --quiet --recurse-paths --move -9 webtrees.zip webtrees"
        ],
        "webtrees:check": [
-            "### PHP-CODE-FIXER",
-            "phpcf app/",
-            "### PAHOUT",
-            "pahout --php-version 7.1.3 --ignore-paths=data .",
-            "### PHP-PARALLEL-LINT",
-            "parallel-lint --no-progress --exclude vendor .",
             "### PHP-CODE-SNIFFER",
             "phpcs --standard=PSR12 -s --exclude=Generic.Files.LineLength,PSR2.ControlStructures.ControlStructureSpacing app routes",
             "### PHAN",
@@ -96,14 +91,8 @@
             "psalm"
         ],
         "webtrees:tools": [
-            "### PAHOUT",
-            "@composer global require wata727/pahout=*",
             "### PHAN",
             "@composer global require phan/phan=*",
-            "### PHP-CODE-FIXER",
-            "@composer global require wapmorgan/php-code-fixer=*",
-            "### PHP-PARALLEL-LINT",
-            "@composer global require jakub-onderka/php-parallel-lint=*",
             "### PSALM",
             "@composer global require vimeo/psalm=*"
         ],
diff --git a/composer.lock b/composer.lock
index 356ecebef2..74ada26cd3 100644
--- 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": "c1a15a67b9ec0614b1fc92e757ceb5b5",
+    "content-hash": "a8a9f1221f982a23e33db23e051e524a",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -2970,6 +2970,52 @@
     ],
     "packages-dev": [
         {
+            "name": "docopt/docopt",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/docopt/docopt.php.git",
+                "reference": "d2ee65c2fe4be78f945a48edd02be45843b39423"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/docopt/docopt.php/zipball/d2ee65c2fe4be78f945a48edd02be45843b39423",
+                "reference": "d2ee65c2fe4be78f945a48edd02be45843b39423",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.1.*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/docopt.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Blake Williams",
+                    "email": "code@shabbyrobe.org",
+                    "homepage": "http://docopt.org/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Port of Python's docopt for PHP 5.3",
+            "homepage": "http://github.com/docopt/docopt.php",
+            "keywords": [
+                "cli",
+                "docs"
+            ],
+            "time": "2015-10-30T03:21:23+00:00"
+        },
+        {
             "name": "doctrine/instantiator",
             "version": "1.1.0",
             "source": {
@@ -4952,6 +4998,60 @@
             "time": "2017-04-07T12:08:54+00:00"
         },
         {
+            "name": "wapmorgan/php-code-fixer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/wapmorgan/PhpCodeFixer.git",
+                "reference": "80123e5f142a222fa837db57a938d6edf58a6b7c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/wapmorgan/PhpCodeFixer/zipball/80123e5f142a222fa837db57a938d6edf58a6b7c",
+                "reference": "80123e5f142a222fa837db57a938d6edf58a6b7c",
+                "shasum": ""
+            },
+            "require": {
+                "docopt/docopt": "~1.0",
+                "ext-tokenizer": "*",
+                "php": ">=5.4"
+            },
+            "bin": [
+                "bin/phpcf"
+            ],
+            "type": "package",
+            "extra": {
+                "phar-builder": {
+                    "compression": "BZip2",
+                    "name": "phpcf-dev.phar",
+                    "output-dir": "./",
+                    "entry-point": "bin/phpcf",
+                    "include": [
+                        "bin",
+                        "data"
+                    ],
+                    "events": {
+                        "command.package.start": "git describe --tags > bin/version.txt",
+                        "command.package.end": "cp phpcf-dev.phar phpcf-`cat bin/version.txt`.phar && chmod +x phpcf.phar && rm bin/version.txt"
+                    }
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "wapmorgan\\PhpCodeFixer\\": "src/"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "A scanner that checks compatibility of your code with new interpreter versions.",
+            "time": "2019-01-16T18:52:43+00:00"
+        },
+        {
             "name": "webmozart/assert",
             "version": "1.4.0",
             "source": {
@@ -5005,7 +5105,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "wapmorgan/php-code-fixer": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
diff --git a/data/index.php b/data/index.php
index 63e1b937d7..8726dfa327 100644
--- a/data/index.php
+++ b/data/index.php
@@ -1 +1,4 @@
-<?php header('Location: ../index.php');
+<?php
+declare(strict_types=1);
+
+header('Location: ../index.php');
diff --git a/modules_v4/historic-events.example/module.php b/modules_v4/historic-events.example/module.php
index 695c95e945..da3607fbf0 100644
--- a/modules_v4/historic-events.example/module.php
+++ b/modules_v4/historic-events.example/module.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 use Fisharebest\Webtrees\Module\AbstractModule;
 use Fisharebest\Webtrees\Module\ModuleCustomInterface;