Merge remote-tracking branch 'origin/dev' into gamebooks.org

demiankatz · Dec 27, 2023 · e38c1ed · e38c1ed
2 parents 44d118c + 9de20e4
commit e38c1ed
Show file tree

Hide file tree

Showing 312 changed files with 4,686 additions and 2,225 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,52 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  run-tests:
+    name: Tests with PHP ${{ matrix.php-version }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: ['7.4', '8.0', '8.1']
+        include:
+          - php-version: 7.4
+            phing_tasks: "startup"
+          - php-version: 8.0
+            phing_tasks: "startup"
+          - php-version: 8.1
+            phing_tasks: "startup phpcs-console php-cs-fixer-dryrun"
+
+    steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: intl, xsl
+
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+
+      - name: Cache composer dependencies
+        uses: actions/cache@v3
+        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@v3
+        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: Install composer dependencies
+        run: composer install
+
+      - name: Run tests
+        run: vendor/bin/phing ${{ matrix.phing_tasks }}
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,63 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
-## 2.2.0 - currently in development
+## 2.4.1 - 2023-07-25
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Bootstrap was upgraded to release 3.4.1.
+- jQuery was upgraded to release 3.7.0.
+
+### Removed
+
+- HTML5Shiv library (no longer needed).
+
+### Fixed
+
+- Improved PHP 8 compatibility in templates.
+
+## 2.4.0 - 2023-03-24
+
+### Added
+
+- Improved navigation for tag editing.
+- Visible links to external identifiers for authors, publishers and subjects/tags.
+
+### Changed
+
+- Raised minimum PHP version to 7.4.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.3.0 - 2022-06-14
+
+### Added
+
+- Unspecified creator list on "check" page.
+
+### Changed
+
+- Updated dependencies (Laminas, etc.).
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
+## 2.2.0 - 2021-08-24
 
 ### Added
 
@@ -13,7 +69,7 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Changed
 
-- Nothing.
+- Raised minimum PHP version to 7.3.
 
 ### Removed
 
@@ -24,6 +80,7 @@ All notable changes to this project will be documented in this file, in reverse
 - Fixed bug #31: deal with session timeout more gracefully.
 - Fixed bug #90: Translation links do not display if the target item is not part of a series.
 - Fixed bug #93: alt titles from wrong items/series can be assigned to editions.
+- Fixed bug accidentally introduced by #75: could not save new edition attributes
 
 ## 2.1.1 - 2021-01-29
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.com/demiankatz/Geeby-Deeby.svg?branch=dev)](https://travis-ci.com/demiankatz/Geeby-Deeby)
+[![CI Status](https://github.com/demiankatz/Geeby-Deeby/actions/workflows/ci.yaml/badge.svg?branch=dev)](https://github.com/demiankatz/Geeby-Deeby/actions/workflows/ci.yaml)
 
 # Geeby-Deeby
 
@@ -57,7 +57,7 @@ select @@sql_mode;
 quit
 </pre>
 
-If the mode includes the `ONLY_FULL_GROUP_BY` setting, that will cause compatibility problems. You can disable this by defining a `sql_mode` line in your `my.conf` configuration file (or equivalent); simply copy and paste all of the remaining settings of the SQL mode; for example: `sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION`. You will need to restart MySQL after making this change for the setting to take effect.
+If the mode includes the `ONLY_FULL_GROUP_BY` setting, that will cause compatibility problems. You can disable this by defining a `sql_mode` line in your `my.cnf` configuration file (or equivalent); simply copy and paste all of the remaining settings of the SQL mode; for example: `sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION`. You will need to restart MySQL after making this change for the setting to take effect.
 
 Once back at the command line, run this to load the database structure you will need to use the software (again substituting appropriate credentials and database name where appropriate):
 

diff --git a/build.xml b/build.xml
@@ -44,12 +44,12 @@
 
   <!-- php-cs-fixer (first task applies fixes, second task simply checks if they are needed) -->
   <target name="php-cs-fixer">
-    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/gbdb.php_cs --verbose" passthru="true" escape="false" />
-    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/gbdb_templates.php_cs --verbose" passthru="true" escape="false" />
+    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/gbdb.php-cs-fixer.php --verbose" passthru="true" escape="false" />
+    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/gbdb_templates.php-cs-fixer.php --verbose" passthru="true" escape="false" />
   </target>
   <target name="php-cs-fixer-dryrun">
-    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/gbdb.php_cs --dry-run --verbose --diff" passthru="true" escape="false" checkreturn="true" />
-    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/gbdb_templates.php_cs --dry-run --verbose --diff" passthru="true" escape="false" checkreturn="true" />
+    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/gbdb.php-cs-fixer.php --dry-run --verbose --diff" passthru="true" escape="false" checkreturn="true" />
+    <exec command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/gbdb_templates.php-cs-fixer.php --dry-run --verbose --diff" passthru="true" escape="false" checkreturn="true" />
   </target>
 
   <!-- Set up dependencies -->

diff --git a/composer.json b/composer.json
@@ -10,33 +10,36 @@
     "license": "GPL-2.0",
     "config": {
         "platform": {
-            "php": "7.1.3"
+            "php": "7.4"
+        },
+        "allow-plugins": {
+            "laminas/laminas-dependency-plugin": true
         }
     },
     "require": {
-        "php": ">=7.1.3",
-        "easyrdf/easyrdf": "1.0.0",
-        "vufind-org/vufindcode": "1.2",
-        "laminas/laminas-authentication": "2.7.0",
-        "laminas/laminas-crypt": "3.3.1",
-        "laminas/laminas-db": "2.11.0",
-        "laminas/laminas-eventmanager": "3.2.1",
-        "laminas/laminas-i18n": "2.10.1",
-        "laminas/laminas-log": "2.12.0",
-        "laminas/laminas-mail": "2.12.3",
-        "laminas/laminas-modulemanager": "2.8.4",
-        "laminas/laminas-mvc": "3.1.1",
-        "laminas/laminas-paginator": "2.8.4",
-        "laminas/laminas-serializer": "2.9.1",
-        "laminas/laminas-servicemanager": "3.4.0",
-        "laminas/laminas-session": "2.9.1",
-        "laminas/laminas-view": "2.11.4",
-        "laminas/laminas-dependency-plugin": "^1.0",
-        "symfony/console": "4.4.11"
+        "php": ">=7.4",
+        "easyrdf/easyrdf": "^1.1.1",
+        "vufind-org/vufindcode": "^1.2",
+        "laminas/laminas-authentication": "^2.10.1",
+        "laminas/laminas-crypt": "^3.6.0",
+        "laminas/laminas-db": "^2.15.0",
+        "laminas/laminas-eventmanager": "^3.4.0",
+        "laminas/laminas-i18n": "^2.13.0",
+        "laminas/laminas-log": "^2.14.0",
+        "laminas/laminas-mail": "^2.16.0",
+        "laminas/laminas-modulemanager": "^2.11.0",
+        "laminas/laminas-mvc": "^3.3.3",
+        "laminas/laminas-paginator": "^2.11.0",
+        "laminas/laminas-serializer": "^2.12.0",
+        "laminas/laminas-servicemanager": "^3.7.0",
+        "laminas/laminas-session": "^2.12.1",
+        "laminas/laminas-view": "^2.16.0",
+        "laminas/laminas-dependency-plugin": "^2.0",
+        "symfony/console": "^5.4.9"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "2.16.4",
-        "phing/phing": "2.16.3",
-        "squizlabs/php_codesniffer": "3.5.6"
+        "friendsofphp/php-cs-fixer": "3.15.1",
+        "phing/phing": "^2.17.3",
+        "squizlabs/php_codesniffer": "^3.7.0"
     }
 }