Merge commit 'c28c6eb3693f427cbe7f18a4782be21d1ec27455' from vufind-o…

…rg/dev.

.github/workflows/ci.yaml

@@ -0,0 +1,76 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  run-tests:
+    name: Tests with PHP ${{ matrix.php-version }}
+    runs-on: ubuntu-latest
+    env:
+      VUFIND_HOME: $GITHUB_WORKSPACE
+      VUFIND_LOCAL_DIR: $GITHUB_WORKSPACE/local
+    strategy:
+      matrix:
+        php-version: ['7.3', '7.4', '8.0']
+        include:
+          - php-version: 7.3
+            phing_tasks: "phpunitfast"
+          - php-version: 7.4
+            phing_tasks: "eslint jshint phpunitfast phpcs-console php-cs-fixer-dryrun checkLessToSass phpstan-console"
+          - php-version: 8.0
+            phing_tasks: "phpunitfast"
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: intl, xsl
+
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14'
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Disable Solr installation
+        run: touch solr/.disableAutomaticInstall
+
+      - name: Install node dependencies
+        run: |
+          npm install -g eslint@"<5.0.0"
+          npm install -g jshint@"2.9.6"
+          npm install
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+
+      - name: Cache php-cs-fixer data
+        uses: actions/cache@v2
+        with:
+          path: .php_cs_cache
+          key: "php-${{ matrix.php-version }}-php-cs-fixer-${{ github.sha }}"
+          restore-keys: "php-${{ matrix.php-version }}-php-cs-fixer-"
+
+      - name: Cache phpstan data
+        uses: actions/cache@v2
+        with:
+          path: .phpstan_cache
+          key: "php-${{ matrix.php-version }}-phpstan-${{ github.sha }}"
+          restore-keys: "php-${{ matrix.php-version }}-phpstan-"
+
+      - name: Install composer dependencies
+        run: composer install
+
+      - name: Run tests
+        run: vendor/bin/phing ${{ matrix.phing_tasks }}

CODE_OF_CONDUCT.md

@@ -3,7 +3,7 @@
 ## Our Pledge
 
 In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
+Contributors, Committers, Managers, and Administrators pledge to making participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
 size, disability, ethnicity, sex characteristics, gender identity and expression,
 level of experience, education, socio-economic status, nationality, personal
@@ -33,16 +33,18 @@ Examples of unacceptable behavior by participants include:
 
 ## Our Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
+Committers, Managers, and Administrators are responsible for clarifying the standards of acceptable
 behavior and are expected to take appropriate and fair corrective action in
 response to any instances of unacceptable behavior.
 
-Project maintainers have the right and responsibility to remove, edit, or
+Project Managers and Administrators have the right and responsibility to remove, edit, or
 reject comments, commits, code, wiki edits, issues, and other contributions
 that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
+permanently any Contributor for other behaviors that they deem inappropriate,
 threatening, offensive, or harmful.
 
+For more information on the various roles and responsibilities, see our [governance document](https://github.com/vufind-org/vufind/blob/dev/GOVERNANCE.md) or [visit our wiki](https://vufind.org/wiki/community:roles_and_responsibilities).
+
 ## Scope
 
 This Code of Conduct applies both within project spaces and in public spaces
@@ -55,7 +57,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected].
+reported by contacting the current [VuFind Community Manager](https://vufind.org/wiki/community:roles_and_responsibilities#critical_administrative_roles) or the project team at [email protected].
 All complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/vufind-org/vufind.svg?branch=dev)](https://travis-ci.com/vufind-org/vufind)
+[![CI Status](https://github.com/vufind-org/vufind/actions/workflows/ci.yaml/badge.svg?branch=dev)](https://github.com/vufind-org/vufind/actions/workflows/ci.yaml)
 VuFind
 ======
 

composer.json

@@ -62,11 +62,11 @@
         "pear/http_request2": "2.4.2",
         "pear/validate_ispn": "dev-master",
         "phing/phing": "2.16.4",
-        "ppito/laminas-whoops": "2.0.0",
+        "ppito/laminas-whoops": "2.1.0",
         "scssphp/scssphp": "1.4.1",
         "serialssolutions/summon": "1.3.0",
         "slm/locale": "0.5.0",
-        "symfony/console": "4.4.18",
+        "symfony/console": "4.4.22",
         "symfony/yaml": "4.4.18",
         "swagger-api/swagger-ui": "3.40.0",
         "vufind-org/vufindcode": "1.2",
@@ -81,14 +81,14 @@
     "require-dev": {
         "behat/mink": "1.8.1",
         "behat/mink-selenium2-driver": "1.4.0",
-        "dmore/chrome-mink-driver": "^2.7",
-        "friendsofphp/php-cs-fixer": "2.18.2",
+        "dmore/chrome-mink-driver": "2.8.0",
+        "friendsofphp/php-cs-fixer": "2.19.0",
         "phploc/phploc": "7.0.2",
-        "phpmd/phpmd": "2.9.1",
-        "phpstan/phpstan": "0.12.82",
-        "phpunit/phpunit": "9.5.2",
+        "phpmd/phpmd": "2.10.0",
+        "phpstan/phpstan": "0.12.85",
+        "phpunit/phpunit": "9.5.4",
         "sebastian/phpcpd": "6.0.3",
-        "squizlabs/php_codesniffer": "3.5.8"
+        "squizlabs/php_codesniffer": "3.6.0"
     },
     "extra": {
         "merge-plugin": {