Modernize test-suite

Author: tvdijen

.travis.yml

@@ -1,35 +1,129 @@
-sudo: required
-
 language: php
 
+# Stage order
+stages:
+  - pre-conditions
+  - test
+  - quality
+
+
+################
+#  Test stage  #
+################
+
 php:
   - 7.2
   - 7.3
+  - 7.4snapshot
 
-matrix:
-  allow_failures:
-  - php: 7.3
 env:
-  - SIMPLESAMLPHP_VERSION=dev-master
+  - COMMAND="composer install"
+  - COMMAND="composer update"
 
 before_script:
   - export SIMPLESAMLPHP_CONFIG_DIR=`pwd`/tests/config/
   - mkdir tests/ticketcache
-  - composer require "simplesamlphp/simplesamlphp:${SIMPLESAMLPHP_VERSION}" --no-update
-  - composer update --no-interaction
-  # Link this branch/pr/etc of simplesamlphp-module-casserver into SSP's vendor directory
-  - php tests/bootstrap.php
+  - ${COMMAND}
 
 script:
-  - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-php.sh
-  - vendor/simplesamlphp/simplesamlphp-test-framework/bin/check-syntax-json.sh
-  - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then php vendor/phpunit/phpunit/phpunit; else php vendor/phpunit/phpunit/phpunit --no-coverage; fi
-  - if [[ "$TRAVIS_PHP_VERSION" == "7.3" ]]; then vendor/bin/psalm; fi
-
-after_success:
-  # Codecov, need to edit bash uploader for incorrect TRAVIS_PYTHON_VERSION environment variable matching, at least until codecov/codecov-bash#133 is resolved
-  - curl -s https://codecov.io/bash > .codecov
-  - sed -i -e 's/TRAVIS_.*_VERSION/^TRAVIS_.*_VERSION=/' .codecov
-  - chmod +x .codecov
-  - if [[ $TRAVIS_PHP_VERSION == "5.6" ]]; then ./.codecov -X gcov; fi
-# - if [[ "$TRAVIS_PHP_VERSION" == "5.6" ]]; then bash <(curl -s https://codecov.io/bash); fi
+  - php vendor/bin/phpunit --no-coverage
+
+jobs:
+  fast_finish: true
+  allow_failures:
+    - php: 7.3
+      env: Psalm
+    - php: 7.3
+      env: Security check (composer install)
+    - php: 7.3
+      env: Security check (composer update)
+    - php: 7.3
+      env: PHP Codesniffer
+
+  include:
+
+    ##########################
+    #  Pre-conditions stage  #
+    ##########################
+
+    - stage: pre-conditions
+      php: 7.2
+      env: Syntax check PHP
+      before_script:
+        - composer install
+      script:
+        - vendor/bin/check-syntax-php.sh
+
+    - stage: pre-conditions
+      php: 7.3
+      env: Syntax check PHP
+      before_script:
+        - composer install
+      script:
+        - vendor/bin/check-syntax-php.sh
+
+    - stage: pre-conditions
+      php: 7.3
+      env: Syntax check YAML / XML / JSON
+      before_script:
+        - composer update
+      script:
+        - vendor/bin/check-syntax-yaml.sh
+        - vendor/bin/check-syntax-xml.sh
+        - vendor/bin/check-syntax-json.sh
+
+
+    ###################
+    #  Quality stage  #
+    ###################
+
+    - stage: quality
+      php: 7.3
+      env: Security check (composer install)
+      before_script:
+        - composer install
+      script:
+        - vendor/bin/security-checker security:check
+
+    - stage: quality
+      php: 7.3
+      env: Security check (composer update)
+      before_script:
+        - composer update
+      script:
+        - vendor/bin/security-checker security:check
+
+    - stage: quality
+      php: 7.3
+      env: Codecov
+      before_script:
+        - composer update
+        - php vendor/bin/phpunit
+      script:
+        # Codecov, need to edit bash uploader for incorrect TRAVIS_PYTHON_VERSION environment variable matching, at least until codecov/codecov-bash#133 is resolved
+        - curl -s https://codecov.io/bash > .codecov
+        - sed -i -e 's/TRAVIS_.*_VERSION/^TRAVIS_.*_VERSION=/' .codecov
+        - chmod +x .codecov
+        - ./.codecov -X gcov
+        # - <(curl -s https://codecov.io/bash)
+
+    - stage: quality
+      php: 7.3
+      env: Psalm
+      before_script:
+        - composer update
+      script:
+        - vendor/bin/psalm
+
+    - stage: quality
+      php: 7.3
+      env: PHP Codesniffer
+      before_script:
+        - composer update
+      script:
+        - vendor/bin/phpcs
+
+notifications:
+  slack:
+    secure: h5YiO7tAk5bzAQBkUZ3crnOFAOBkNqHp0nc2cxvGauogVfCLE9K8bME512uTeu9QWMht2D30uyTOHFKQ7sPEW4omHNF4qYl4p9L037oQFfEwZPBzJFo9QUzviT3mvKHTN4HSQOkq/08ZoMhh1i3p/OhyFS56J28IDJWDqGZkEUE=
+

composer.json

@@ -22,8 +22,8 @@
         }
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp": "^1.17.7",
-        "simplesamlphp/simplesamlphp-test-framework": "~0.0.15"
+        "simplesamlphp/simplesamlphp": "^1.18@RC",
+        "simplesamlphp/simplesamlphp-test-framework": "~0.1.0"
     },
     "support": {
         "issues": "https://github.com/simplesamlphp/simplesamlphp-module-casserver/issues",

phpcs.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<ruleset name="SimpleSAMLphp ruleset">
+    <config name="ignore_warnings_on_exit" value="1"/>
+
+    <description>
+        By default it is less stringent about long lines than other coding standards
+    </description>
+
+    <directory>config-templates</directory>
+    <directory>lib</directory>
+    <directory>templates</directory>
+    <directory>tests</directory>
+    <directory>www</directory>
+
+    <!-- Exclude old PHP templates (and related); they are removed in SSP 2.0 -->
+    <exclude-pattern>templates/*.tpl.php</exclude-pattern>
+
+    <!-- This is the rule we inherit from. If you want to exlude some specific rules, see the docs on how to do that -->
+    <rule ref="PSR12"/>
+</ruleset>
+
+

phpunit.xml

@@ -2,7 +2,7 @@
 <phpunit bootstrap="./tests/bootstrap.php">
     <testsuites>
         <testsuite name="The project's test suite">
-            <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/tests/</directory>
+            <directory>./vendor/simplesamlphp/simplesamlphp-test-framework/src</directory>
             <directory>./tests</directory>
         </testsuite>
     </testsuites>