Merge pull request drupalauth#94 from drupalauth/v2-dev

Author: RoSk0

Diff for: .editorconfig

@@ -0,0 +1,17 @@
+# Editor configuration normalization
+# @see http://editorconfig.org/
+
+# This is the top-most .editorconfig file; do not search in parent directories.
+root = true
+
+# All files.
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{*.yml,*yaml}]
+indent_size = 2

Diff for: .gitignore

@@ -1,3 +1,5 @@
 composer.phar
 /vendor/
 composer.lock
+.bash_history
+/.phpunit.result.cache

Diff for: .lando.env

@@ -0,0 +1,10 @@
+# Lando specific - uses user home directory to store Composer cache and other stuff
+# Helps to re-use Composer cache between projects.
+COMPOSER_HOME=/user/.composer
+# https://xdebug.org/docs/step_debug
+# https://xdebug.org/docs/step_debug#client_host
+# https://docs.lando.dev/config/php.html#configuration
+PHP_IDE_CONFIG=serverName=drupalauth.lndo.site
+# Ignore commands starting with space and duplicates.
+HISTCONTROL=ignoreboth
+HOME=/app

Diff for: .lando.yml

@@ -0,0 +1,53 @@
+name: drupalauth
+
+services:
+  php80:
+    type: php:8.0
+    via: cli
+    xdebug: "off"
+    composer_version: 2
+  php81:
+    type: php:8.1
+    via: cli
+    xdebug: "off"
+    composer_version: 2
+  php82:
+    type: php:8.2
+    via: cli
+    xdebug: "off"
+    composer_version: 2
+
+
+
+
+env_file:
+  - .lando.env
+
+tooling:
+  style-lint:
+    cmd: ./scripts/style-lint.sh
+    service: :service
+    options:
+      service:
+        default: php80
+        describe: Run phpcs in different service
+        alias:
+          - s
+  style-fix:
+    cmd: ./scripts/style-fix.sh
+    service: :service
+    options:
+      service:
+        default: php80
+        describe: Run phpcs in different service
+        alias:
+          - s
+  phpunit:
+    cmd: ./scripts/phpunit.sh
+    service: :service
+    options:
+      service:
+        default: php80
+        describe: Run phpunit in different service
+        alias:
+          - s

Diff for: .travis.yml

@@ -1,10 +1,13 @@
+os: linux
 language: php
-php:
-   - '7.1'
-   - '7.2'
-   - '7.3'
-   - '7.4'
-   - '8.0'
+jobs:
+  include:
+    - php: '8.0'
+      dist: focal
+    - php: '8.1'
+      dist: jammy
+    - php: '8.2'
+      dist: jammy
 
 before_script: composer install
 script:

Diff for: composer.json

@@ -21,16 +21,16 @@
     }
   ],
   "require": {
-    "php": "^5.6.0|^7.0|^8.0",
-    "simplesamlphp/simplesamlphp": "~2.0",
+    "php": "^8.0",
+    "simplesamlphp/simplesamlphp": "^2.1",
     "simplesamlphp/composer-module-installer": "~1.0"
   },
   "require-dev": {
-    "phpunit/phpunit": "^5|^6|^7|^8|^9",
-    "squizlabs/php_codesniffer": "^2.0.0|^3.0.0"
+    "phpunit/phpunit": "^9.0 | ^10.0",
+    "squizlabs/php_codesniffer": "^3.0"
   },
   "autoload-dev": {
-    "classmap": ["lib/", "tests/lib/"]
+    "classmap": ["src/", "tests/"]
   },
   "extra": {
     "branch-alias": {

Diff for: default-enable

@@ -2,7 +2,7 @@
 <ruleset name="drupalauth">
     <description>The coding standard for drupalauth.</description>
 
-    <rule ref="PSR2" />
-    <file>./lib</file>
-    <file>./www</file>
+    <rule ref="PSR12" />
+    <file>./src</file>
+    <file>./public</file>
 </ruleset>

Diff for: lib/ConfigHelper.php

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+php -v
+rm -rf ./vendor composer.lock
+composer install
+
+./vendor/bin/phpunit

Diff for: phpcs.xml

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+rm -rf ./vendor composer.lock
+composer install
+
+./vendor/bin/phpcbf

Diff for: www/resume.php renamed to public/resume.php

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+rm -rf ./vendor composer.lock
+composer install
+
+./vendor/bin/phpcs
+
+#lando phpunit -s php80
+#lando style-lint -s php80
+#lando phpunit -s php81
+#lando style-lint -s php81
+#lando phpunit -s php82
+#lando style-lint -s php82