From 2db56eb9c8aa2b3b35ca1e2e95867344d2fb3f47 Mon Sep 17 00:00:00 2001
From: Sambhav Pokharel <sambhav.pokharel@gmail.com>
Date: Mon, 17 Nov 2025 14:58:14 -0500
Subject: [PATCH 1/4] Simplify Github actions to use QA tasks

---
 .github/workflows/ci.yaml | 10 +++++-----
 build.xml                 | 17 +++++++++++++++++
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 414cddb..f215c88 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,14 +11,14 @@ jobs:
       VUFIND_LOCAL_DIR: $GITHUB_WORKSPACE/local
     strategy:
       matrix:
-        php-version: ['8.1', '8.2', '8.3']
+        php-version: ['8.2', '8.3', '8.4']
         include:
-          - php-version: 8.1
-            phing_tasks: "phpunitfast"
           - php-version: 8.2
-            phing_tasks: "phpunitfast"
+            phing_tasks: "qa-console"
           - php-version: 8.3
-            phing_tasks: "phpunitfast phpcs-console php-cs-fixer-dryrun phpstan-console rector-console"
+            phing_tasks: "phpunitfast"
+          - php-version: 8.4
+            phing_tasks: "phpunitfast"
 
     steps:
       - name: Setup PHP
diff --git a/build.xml b/build.xml
index 161e43f..21d487c 100644
--- a/build.xml
+++ b/build.xml
@@ -41,6 +41,23 @@
     <phingcall target="rector-console"/>
   </target>
 
+  <!-- Quality Assurance PHP Tasks -->
+  <target name="qa-console" description="quality assurance php tasks">
+    <phingcall target="phpunitfast"/>
+    <phingcall target="phpcs-console"/>
+    <phingcall target="php-cs-fixer-dryrun"/>
+    <phingcall target="phpstan-console"/>
+    <phingcall target="rector-console"/>
+  </target>
+
+  <!-- Fix PHP Tasks -->
+  <target name="fix-php" description="quality assurance php tasks">
+    <!-- Rector may introduce style issues, so run it first -->
+    <phingcall target="rector"/>
+    <phingcall target="php-cs-fixer"/>
+    <phingcall target="phpcbf"/>
+  </target>
+
   <!-- Report rule violations with PHPMD (mess detector) -->
   <target name="phpmd">
     <exec executable="${srcdir}/vendor/bin/phpmd">

From 0154d8213535b486c0febf346c68c74ad10dc421 Mon Sep 17 00:00:00 2001
From: Sambhav Pokharel <sambhav.pokharel@gmail.com>
Date: Tue, 18 Nov 2025 10:05:03 -0500
Subject: [PATCH 2/4] Add qa tasks

---
 build.xml | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 177 insertions(+)

diff --git a/build.xml b/build.xml
index 21d487c..ceb431e 100644
--- a/build.xml
+++ b/build.xml
@@ -9,6 +9,29 @@
   <property name="phpdoc_version" value="3.3.1" />
   <property name="phpunit_command" value="${srcdir}/vendor/bin/phpunit" />
 
+  <!-- Main Target -->
+  <target name="main" description="main target">
+    <trycatch property="exceptionmsg">
+      <try>
+        <phingcall target="startup" />
+        <phingcall target="ci-tasks" />
+        <phingcall target="shutdown" />
+      </try>
+      <catch>
+        <phingcall target="shutdown" />
+        <fail>Unexpected error during continuous integration tasks -- ${exceptionmsg}</fail>
+      </catch>
+    </trycatch><?xml version="1.0" encoding="UTF-8"?>
+<project name="vufindhttp" basedir="." default="main">
+  <property name="sh" value="/bin/sh" />
+  <property name="tmp" value="/tmp" />
+  <property name="package"  value="${phing.project.name}" override="true" />
+  <property name="builddir" value="${tmp}/build/${phing.project.name}" override="true" />
+  <property name="srcdir"   value="${project.basedir}" override="true" />
+  <property name="skip_phpdoc" value="false" />
+  <property name="phpdoc_version" value="3.3.1" />
+  <property name="phpunit_command" value="${srcdir}/vendor/bin/phpunit" />
+
   <!-- Main Target -->
   <target name="main" description="main target">
     <trycatch property="exceptionmsg">
@@ -41,6 +64,160 @@
     <phingcall target="rector-console"/>
   </target>
 
+  <!-- Report rule violations with PHPMD (mess detector) -->
+  <target name="phpmd">
+    <exec executable="${srcdir}/vendor/bin/phpmd">
+      <arg line="${srcdir}/src xml ${srcdir}/tests/phpmd.xml --exclude ${srcdir}/tests --reportfile ${builddir}/reports/phpmd.xml" />
+    </exec>  
+  </target>
+
+  <!-- PHP_Depend code analysis -->
+  <target name="pdepend">
+    <exec executable="${srcdir}/vendor/bin/pdepend">
+      <arg line="--jdepend-xml=${builddir}/reports/jdepend.xml --jdepend-chart=${builddir}/reports/dependencies.svg --overview-pyramid=${builddir}/reports/pdepend-pyramid.svg ${srcdir}/src" />
+    </exec>  
+  </target>
+
+  <!-- PHP CodeSniffer -->
+  <target name="phpcbf">
+    <exec executable="${srcdir}/vendor/bin/phpcbf" escape="false" passthru="true" checkreturn="true">
+      <arg line="--standard=${srcdir}/tests/phpcs.xml" />
+    </exec>
+  </target>
+  <target name="phpcs">
+    <exec executable="${srcdir}/vendor/bin/phpcs" escape="false">
+      <arg line="--standard=${srcdir}/tests/phpcs.xml --report=checkstyle &gt; ${builddir}/reports/checkstyle.xml" />
+    </exec>  
+  </target>
+  <target name="phpcs-console">
+    <exec executable="${srcdir}/vendor/bin/phpcs" escape="false" passthru="true" checkreturn="true"> 
+      <arg line="--standard=${srcdir}/tests/phpcs.xml" />
+    </exec>  
+  </target>
+
+  <!-- Phpstan -->
+  <target name="phpstan-checkstyle">
+    <exec executable="${srcdir}/vendor/bin/phpstan" escape="false" passthru="true" checkreturn="true">
+      <arg line="--configuration=${srcdir}/tests/phpstan.neon --memory-limit=2G --error-format=checkstyle analyse &gt; ${builddir}/reports/phpstan-checkstyle.xml" />
+    </exec>  
+  </target>
+  <target name="phpstan-console">
+    <exec executable="${srcdir}/vendor/bin/phpstan" escape="false" passthru="true" checkreturn="true">
+      <arg line="--configuration=${srcdir}/tests/phpstan.neon --memory-limit=2G analyse" />
+    </exec>  
+  </target>
+
+  <!-- php-cs-fixer (first task applies fixes, second task simply checks if they are needed) -->
+  <target name="php-cs-fixer">
+    <exec executable="${srcdir}/vendor/bin/php-cs-fixer" passthru="true" escape="false">
+      <arg line="fix --config=${srcdir}/tests/vufind.php-cs-fixer.php --verbose" />
+    </exec>  
+  </target>
+  <target name="php-cs-fixer-dryrun">
+    <exec executable="${srcdir}/vendor/bin/php-cs-fixer" passthru="true" escape="false" checkreturn="true">
+      <arg line="fix --config=${srcdir}/tests/vufind.php-cs-fixer.php --dry-run --verbose --diff" />
+    </exec>  
+  </target>
+
+  <!-- PHP API Documentation -->
+  <target name="phpdoc">
+    <!-- GET phpDocumentor.phar -->
+    <if>
+      <not><available file="${srcdir}/vendor/bin/phpDocumentor-${phpdoc_version}.phar" /></not>
+      <then>
+        <httpget followRedirects="true" url="https://github.com/phpDocumentor/phpDocumentor2/releases/download/v${phpdoc_version}/phpDocumentor.phar" dir="${srcdir}/vendor/bin" filename="phpDocumentor-${phpdoc_version}.phar" />
+        <chmod mode="0755">
+          <fileset dir="${srcdir}/vendor/bin">
+            <include name="phpDocumentor-${phpdoc_version}.phar" />
+          </fileset>
+        </chmod>
+      </then>
+    </if>
+    <!-- Run phpdoc -->
+    <!-- Skip the whole phpdoc task when disabled -->
+    <if>
+      <not><istrue value="${skip_phpdoc}" /></not>
+      <then>
+        <mkdir dir="${builddir}/apidocs" />
+        <mkdir dir="${builddir}/docs_cache" />
+        <!-- Old embedded version; no longer works correctly...
+        <phpdoc2 title="VuFindHttp API Documentation"
+          pharlocation="${srcdir}/vendor/bin/phpDocumentor-${phpdoc_version}.phar"
+          destdir="${builddir}/apidocs">
+          <fileset dir=".">
+            <include name="src/**/*.php" />
+          </fileset>
+        </phpdoc2>
+        -->
+        <exec executable="php" passthru="true">
+          <arg line="${srcdir}/vendor/bin/phpDocumentor-${phpdoc_version}.phar --cache-folder=${builddir}/docs_cache --title=&quot;VuFindHttp API Documentation&quot; -t ${builddir}/apidocs -d ${srcdir}/src" />
+        </exec>  
+      </then>
+    </if>
+  </target>
+
+  <!-- PHPUnit -->
+  <target name="phpunit" description="Run tests">
+    <exec dir="${srcdir}" executable="${sh}" passthru="true" checkreturn="true">
+      <arg line="-c &apos;${phpunit_command} -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/&apos;" />
+    </exec>  
+  </target>
+
+  <!-- Rector -->
+  <target name="rector-console">
+    <exec executable="${srcdir}/vendor/bin/rector" escape="false" passthru="true" checkreturn="true">
+      <arg line="--config=${srcdir}/tests/rector.php --dry-run" />
+    </exec>
+  </target>
+  <target name="rector">
+    <exec executable="${srcdir}/vendor/bin/rector" escape="false" passthru="true" checkreturn="true">
+      <arg line="--config=${srcdir}/tests/rector.php" />
+    </exec>
+  </target>
+
+  <!-- PHPUnit without logging output -->
+  <target name="phpunitfast" description="Run tests">
+    <exec dir="${srcdir}" executable="${sh}" passthru="true" checkreturn="true">
+      <arg line="-c &apos;${phpunit_command} -dzend.enable_gc=0&apos;" />
+    </exec>  
+  </target>
+
+  <!-- Set up dependencies -->
+  <target name="startup" description="set up dependencies">
+    <exec executable="composer"> 
+      <arg line="install" />
+    </exec>  
+  </target>
+
+  <!-- Clean up -->
+  <target name="shutdown" description="clean up file system">
+    <delete dir="${srcdir}/vendor" includeemptydirs="true" failonerror="true" />
+    <delete file="${srcdir}/composer.lock" failonerror="true" />
+    <exec executable="git">
+      <arg line="reset --hard" />
+    </exec>  
+  </target>
+</project>
+
+  </target>
+
+  <!-- Continuous Integration Tasks -->
+  <target name="ci-tasks" description="continuous integration tasks">
+
+    <!-- Create dirs -->
+    <mkdir dir="${builddir}/reports"/>
+    <mkdir dir="${builddir}/reports/coverage"/>
+
+    <!-- Call standard tasks -->
+    <phingcall target="phpcs"/>
+    <phingcall target="phpunit"/>
+    <phingcall target="phpdoc"/>
+    <phingcall target="phpmd"/>
+    <phingcall target="pdepend"/>
+    <phingcall target="phpstan-checkstyle"/>
+    <phingcall target="rector-console"/>
+  </target>
+
   <!-- Quality Assurance PHP Tasks -->
   <target name="qa-console" description="quality assurance php tasks">
     <phingcall target="phpunitfast"/>

From 81a5a3f735b5e5bd01ed775a7ca2e5bb781bfa82 Mon Sep 17 00:00:00 2001
From: Sambhav Pokharel <sambhav.pokharel@gmail.com>
Date: Tue, 18 Nov 2025 10:06:05 -0500
Subject: [PATCH 3/4] Remove Duplicate

---
 build.xml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/build.xml b/build.xml
index ceb431e..8e0b29b 100644
--- a/build.xml
+++ b/build.xml
@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="vufindhttp" basedir="." default="main">
-  <property name="sh" value="/bin/sh" />
-  <property name="tmp" value="/tmp" />
-  <property name="package"  value="${phing.project.name}" override="true" />
-  <property name="builddir" value="${tmp}/build/${phing.project.name}" override="true" />
-  <property name="srcdir"   value="${project.basedir}" override="true" />
-  <property name="skip_phpdoc" value="false" />
-  <property name="phpdoc_version" value="3.3.1" />
-  <property name="phpunit_command" value="${srcdir}/vendor/bin/phpunit" />
-
-  <!-- Main Target -->
-  <target name="main" description="main target">
     <trycatch property="exceptionmsg">
       <try>
         <phingcall target="startup" />

From 2d1308bd15e31d2b397394d7edcbc4256f303866 Mon Sep 17 00:00:00 2001
From: Sambhav Pokharel <sambhav.pokharel@gmail.com>
Date: Tue, 18 Nov 2025 10:10:47 -0500
Subject: [PATCH 4/4] Fix build.xml errors

---
 build.xml | 166 ------------------------------------------------------
 1 file changed, 166 deletions(-)

diff --git a/build.xml b/build.xml
index 8e0b29b..59e9685 100644
--- a/build.xml
+++ b/build.xml
@@ -1,15 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-    <trycatch property="exceptionmsg">
-      <try>
-        <phingcall target="startup" />
-        <phingcall target="ci-tasks" />
-        <phingcall target="shutdown" />
-      </try>
-      <catch>
-        <phingcall target="shutdown" />
-        <fail>Unexpected error during continuous integration tasks -- ${exceptionmsg}</fail>
-      </catch>
-    </trycatch><?xml version="1.0" encoding="UTF-8"?>
 <project name="vufindhttp" basedir="." default="main">
   <property name="sh" value="/bin/sh" />
   <property name="tmp" value="/tmp" />
@@ -52,160 +41,6 @@
     <phingcall target="rector-console"/>
   </target>
 
-  <!-- Report rule violations with PHPMD (mess detector) -->
-  <target name="phpmd">
-    <exec executable="${srcdir}/vendor/bin/phpmd">
-      <arg line="${srcdir}/src xml ${srcdir}/tests/phpmd.xml --exclude ${srcdir}/tests --reportfile ${builddir}/reports/phpmd.xml" />
-    </exec>  
-  </target>
-
-  <!-- PHP_Depend code analysis -->
-  <target name="pdepend">
-    <exec executable="${srcdir}/vendor/bin/pdepend">
-      <arg line="--jdepend-xml=${builddir}/reports/jdepend.xml --jdepend-chart=${builddir}/reports/dependencies.svg --overview-pyramid=${builddir}/reports/pdepend-pyramid.svg ${srcdir}/src" />
-    </exec>  
-  </target>
-
-  <!-- PHP CodeSniffer -->
-  <target name="phpcbf">
-    <exec executable="${srcdir}/vendor/bin/phpcbf" escape="false" passthru="true" checkreturn="true">
-      <arg line="--standard=${srcdir}/tests/phpcs.xml" />
-    </exec>
-  </target>
-  <target name="phpcs">
-    <exec executable="${srcdir}/vendor/bin/phpcs" escape="false">
-      <arg line="--standard=${srcdir}/tests/phpcs.xml --report=checkstyle &gt; ${builddir}/reports/checkstyle.xml" />
-    </exec>  
-  </target>
-  <target name="phpcs-console">
-    <exec executable="${srcdir}/vendor/bin/phpcs" escape="false" passthru="true" checkreturn="true"> 
-      <arg line="--standard=${srcdir}/tests/phpcs.xml" />
-    </exec>  
-  </target>
-
-  <!-- Phpstan -->
-  <target name="phpstan-checkstyle">
-    <exec executable="${srcdir}/vendor/bin/phpstan" escape="false" passthru="true" checkreturn="true">
-      <arg line="--configuration=${srcdir}/tests/phpstan.neon --memory-limit=2G --error-format=checkstyle analyse &gt; ${builddir}/reports/phpstan-checkstyle.xml" />
-    </exec>  
-  </target>
-  <target name="phpstan-console">
-    <exec executable="${srcdir}/vendor/bin/phpstan" escape="false" passthru="true" checkreturn="true">
-      <arg line="--configuration=${srcdir}/tests/phpstan.neon --memory-limit=2G analyse" />
-    </exec>  
-  </target>
-
-  <!-- php-cs-fixer (first task applies fixes, second task simply checks if they are needed) -->
-  <target name="php-cs-fixer">
-    <exec executable="${srcdir}/vendor/bin/php-cs-fixer" passthru="true" escape="false">
-      <arg line="fix --config=${srcdir}/tests/vufind.php-cs-fixer.php --verbose" />
-    </exec>  
-  </target>
-  <target name="php-cs-fixer-dryrun">
-    <exec executable="${srcdir}/vendor/bin/php-cs-fixer" passthru="true" escape="false" checkreturn="true">
-      <arg line="fix --config=${srcdir}/tests/vufind.php-cs-fixer.php --dry-run --verbose --diff" />
-    </exec>  
-  </target>
-
-  <!-- PHP API Documentation -->
-  <target name="phpdoc">
-    <!-- GET phpDocumentor.phar -->
-    <if>
-      <not><available file="${srcdir}/vendor/bin/phpDocumentor-${phpdoc_version}.phar" /></not>
-      <then>
-        <httpget followRedirects="true" url="https://github.com/phpDocumentor/phpDocumentor2/releases/download/v${phpdoc_version}/phpDocumentor.phar" dir="${srcdir}/vendor/bin" filename="phpDocumentor-${phpdoc_version}.phar" />
-        <chmod mode="0755">
-          <fileset dir="${srcdir}/vendor/bin">
-            <include name="phpDocumentor-${phpdoc_version}.phar" />
-          </fileset>
-        </chmod>
-      </then>
-    </if>
-    <!-- Run phpdoc -->
-    <!-- Skip the whole phpdoc task when disabled -->
-    <if>
-      <not><istrue value="${skip_phpdoc}" /></not>
-      <then>
-        <mkdir dir="${builddir}/apidocs" />
-        <mkdir dir="${builddir}/docs_cache" />
-        <!-- Old embedded version; no longer works correctly...
-        <phpdoc2 title="VuFindHttp API Documentation"
-          pharlocation="${srcdir}/vendor/bin/phpDocumentor-${phpdoc_version}.phar"
-          destdir="${builddir}/apidocs">
-          <fileset dir=".">
-            <include name="src/**/*.php" />
-          </fileset>
-        </phpdoc2>
-        -->
-        <exec executable="php" passthru="true">
-          <arg line="${srcdir}/vendor/bin/phpDocumentor-${phpdoc_version}.phar --cache-folder=${builddir}/docs_cache --title=&quot;VuFindHttp API Documentation&quot; -t ${builddir}/apidocs -d ${srcdir}/src" />
-        </exec>  
-      </then>
-    </if>
-  </target>
-
-  <!-- PHPUnit -->
-  <target name="phpunit" description="Run tests">
-    <exec dir="${srcdir}" executable="${sh}" passthru="true" checkreturn="true">
-      <arg line="-c &apos;${phpunit_command} -dzend.enable_gc=0 --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/&apos;" />
-    </exec>  
-  </target>
-
-  <!-- Rector -->
-  <target name="rector-console">
-    <exec executable="${srcdir}/vendor/bin/rector" escape="false" passthru="true" checkreturn="true">
-      <arg line="--config=${srcdir}/tests/rector.php --dry-run" />
-    </exec>
-  </target>
-  <target name="rector">
-    <exec executable="${srcdir}/vendor/bin/rector" escape="false" passthru="true" checkreturn="true">
-      <arg line="--config=${srcdir}/tests/rector.php" />
-    </exec>
-  </target>
-
-  <!-- PHPUnit without logging output -->
-  <target name="phpunitfast" description="Run tests">
-    <exec dir="${srcdir}" executable="${sh}" passthru="true" checkreturn="true">
-      <arg line="-c &apos;${phpunit_command} -dzend.enable_gc=0&apos;" />
-    </exec>  
-  </target>
-
-  <!-- Set up dependencies -->
-  <target name="startup" description="set up dependencies">
-    <exec executable="composer"> 
-      <arg line="install" />
-    </exec>  
-  </target>
-
-  <!-- Clean up -->
-  <target name="shutdown" description="clean up file system">
-    <delete dir="${srcdir}/vendor" includeemptydirs="true" failonerror="true" />
-    <delete file="${srcdir}/composer.lock" failonerror="true" />
-    <exec executable="git">
-      <arg line="reset --hard" />
-    </exec>  
-  </target>
-</project>
-
-  </target>
-
-  <!-- Continuous Integration Tasks -->
-  <target name="ci-tasks" description="continuous integration tasks">
-
-    <!-- Create dirs -->
-    <mkdir dir="${builddir}/reports"/>
-    <mkdir dir="${builddir}/reports/coverage"/>
-
-    <!-- Call standard tasks -->
-    <phingcall target="phpcs"/>
-    <phingcall target="phpunit"/>
-    <phingcall target="phpdoc"/>
-    <phingcall target="phpmd"/>
-    <phingcall target="pdepend"/>
-    <phingcall target="phpstan-checkstyle"/>
-    <phingcall target="rector-console"/>
-  </target>
-
   <!-- Quality Assurance PHP Tasks -->
   <target name="qa-console" description="quality assurance php tasks">
     <phingcall target="phpunitfast"/>
@@ -217,7 +52,6 @@
 
   <!-- Fix PHP Tasks -->
   <target name="fix-php" description="quality assurance php tasks">
-    <!-- Rector may introduce style issues, so run it first -->
     <phingcall target="rector"/>
     <phingcall target="php-cs-fixer"/>
     <phingcall target="phpcbf"/>