From b7e0e276469754b19d5068cc85d5ec46428abb73 Mon Sep 17 00:00:00 2001
From: Susan Turkel <107194029+sturkel89@users.noreply.github.com>
Date: Tue, 9 Jul 2024 13:03:13 -0400
Subject: [PATCH 1/7] Update composer.json

---
 composer.json | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 97dd0db..d50b4dc 100644
--- a/composer.json
+++ b/composer.json
@@ -33,12 +33,13 @@
         "vufind-org/vufindcode": "^1.2"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "3.51.0",
-        "pear/http_request2": "2.6.0",
-        "phpmd/phpmd": "2.15.0",
-        "phpstan/phpstan": "1.10.59",
-        "phpunit/phpunit": "10.5.11",
-        "phing/phing": "2.17.4",
-        "squizlabs/php_codesniffer": "3.9.0"
+         "friendsofphp/php-cs-fixer": "3.51.0",
+         "guzzlehttp/guzzle": "^7.8.1",
+         "pear/http_request2": "2.6.0",
+         "phpmd/phpmd": "2.15.0",
+         "phpstan/phpstan": "1.10.59",
+         "phpunit/phpunit": "10.5.11",
+         "phing/phing": "3.0",
+         "squizlabs/php_codesniffer": "3.9.0"
     }
 }

From 8d349400a83a5a24b771017a96dd176947c8c02f Mon Sep 17 00:00:00 2001
From: Susan Turkel <107194029+sturkel89@users.noreply.github.com>
Date: Tue, 9 Jul 2024 13:04:15 -0400
Subject: [PATCH 2/7] Update build.xml

---
 build.xml | 57 +++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 1c168e3..13fd8f5 100644
--- a/build.xml
+++ b/build.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="vufind-marc" 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="downloadsdir" value="${srcdir}/downloads" 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" /><!-- if you have issues with segfaults during code coverage generation, try adding -dzend.enable_gc=0 to this (but this fix was probably only needed in PHP 5) -->
@@ -41,39 +43,57 @@
 
   <!-- Report rule violations with PHPMD (mess detector) -->
   <target name="phpmd">
-    <exec command="${srcdir}/vendor/bin/phpmd ${srcdir}/src xml ${srcdir}/tests/phpmd.xml --exclude ${srcdir}/tests --reportfile ${builddir}/reports/phpmd.xml" />
+    <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 command="${srcdir}/vendor/bin/pdepend --jdepend-xml=${builddir}/reports/jdepend.xml --jdepend-chart=${builddir}/reports/dependencies.svg --overview-pyramid=${builddir}/reports/pdepend-pyramid.svg ${srcdir}/src" />
+    <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 command="${srcdir}/vendor/bin/phpcbf --standard=${srcdir}/tests/phpcs.xml" escape="false" passthru="true" checkreturn="true" />
+    <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 command="${srcdir}/vendor/bin/phpcs --standard=${srcdir}/tests/phpcs.xml --report=checkstyle &gt; ${builddir}/reports/checkstyle.xml" escape="false" />
+    <exec executable="${srcdir}/vendor/bin/phpcs"> 
+      <arg line="--standard=${srcdir}/tests/phpcs.xml --report=checkstyle &gt; ${builddir}/reports/checkstyle.xml" escape="false" />
+    </exec>
   </target>
   <target name="phpcs-console">
-    <exec command="${srcdir}/vendor/bin/phpcs --standard=${srcdir}/tests/phpcs.xml" escape="false" passthru="true" checkreturn="true" />
+    <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 command="${srcdir}/vendor/bin/phpstan --configuration=${srcdir}/tests/phpstan.neon --memory-limit=2G --error-format=checkstyle analyse &gt; ${builddir}/reports/phpstan-checkstyle.xml" escape="false" passthru="true" checkreturn="true" />
+    <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 command="${srcdir}/vendor/bin/phpstan --configuration=${srcdir}/tests/phpstan.neon --memory-limit=2G analyse" escape="false" passthru="true" checkreturn="true" />
+    <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 command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/vufind.php-cs-fixer.php --verbose" passthru="true" escape="false" />
+    <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 command="${srcdir}/vendor/bin/php-cs-fixer fix --config=${srcdir}/tests/vufind.php-cs-fixer.php --dry-run --verbose --diff" passthru="true" escape="false" checkreturn="true" />
+    <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 -->
@@ -97,30 +117,39 @@
       <then>
         <mkdir dir="${builddir}/apidocs" />
         <mkdir dir="${builddir}/docs_cache" />
-        <exec command="php ${srcdir}/vendor/bin/phpDocumentor-${phpdoc_version}.phar --cache-folder=${builddir}/docs_cache --title=&quot;VuFind-Marc API Documentation&quot; -t ${builddir}/apidocs -d ${srcdir}/src" passthru="true" />
+        <exec executable="php ${srcdir}/vendor/bin/phpDocumentor-${phpdoc_version}.phar" passthru="true">
+          <arg line="--cache-folder=${builddir}/docs_cache --title=&quot;VuFind-Marc API Documentation&quot; -t ${builddir}/apidocs -d ${srcdir}/src" />
+        </exec>
       </then>
     </if>
   </target>
 
   <!-- PHPUnit -->
   <target name="phpunit" description="Run tests">
-    <exec dir="${srcdir}/tests" command="${phpunit_command} --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" passthru="true" checkreturn="true" />
+    <exec dir="${srcdir}/tests" executable="${phpunit_command}" passthru="true" checkreturn="true">
+      <arg line="--log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" />
+    </exec>
   </target>
 
   <!-- PHPUnit without logging output -->
   <target name="phpunitfast" description="Run tests">
-    <exec dir="${srcdir}/tests" command="${phpunit_command}" passthru="true" checkreturn="true" />
+    <exec dir="${srcdir}/tests" executable="${phpunit_command}" passthru="true" checkreturn="true" />
+    </exec>
   </target>
 
   <!-- Set up dependencies -->
   <target name="startup" description="set up dependencies">
-    <exec command="composer install" />
+    <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 command="git reset --hard" />
+    <exec executable="git">
+      <arg line="reset --hard" />
+    </exec>  
   </target>
 </project>

From 32bf6f087a3bc8d3d4518b7ef5cfe1a4efd5d412 Mon Sep 17 00:00:00 2001
From: Susan Turkel <107194029+sturkel89@users.noreply.github.com>
Date: Tue, 9 Jul 2024 13:49:28 -0400
Subject: [PATCH 3/7] Update build.xml

Removed extra slash
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 13fd8f5..d4070e6 100644
--- a/build.xml
+++ b/build.xml
@@ -133,7 +133,7 @@
 
   <!-- PHPUnit without logging output -->
   <target name="phpunitfast" description="Run tests">
-    <exec dir="${srcdir}/tests" executable="${phpunit_command}" passthru="true" checkreturn="true" />
+    <exec dir="${srcdir}/tests" executable="${phpunit_command}" passthru="true" checkreturn="true">
     </exec>
   </target>
 

From b69d6461842da9c5ea471ee4734b7c112964bca4 Mon Sep 17 00:00:00 2001
From: Susan Turkel <107194029+sturkel89@users.noreply.github.com>
Date: Tue, 9 Jul 2024 14:05:30 -0400
Subject: [PATCH 4/7] Update build.xml

Replace phpunit_command with sh
---
 build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index d4070e6..2560b6d 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
   <property name="downloadsdir" value="${srcdir}/downloads" 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" /><!-- if you have issues with segfaults during code coverage generation, try adding -dzend.enable_gc=0 to this (but this fix was probably only needed in PHP 5) -->
+  <property name="phpunit_command" value="${srcdir}/vendor/bin/phpunit" />
 
   <!-- Main Target -->
   <target name="main" description="main target">
@@ -126,14 +126,14 @@
 
   <!-- PHPUnit -->
   <target name="phpunit" description="Run tests">
-    <exec dir="${srcdir}/tests" executable="${phpunit_command}" passthru="true" checkreturn="true">
+    <exec dir="${srcdir}/tests" executable="${sh}" passthru="true" checkreturn="true">
       <arg line="--log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" />
     </exec>
   </target>
 
   <!-- PHPUnit without logging output -->
   <target name="phpunitfast" description="Run tests">
-    <exec dir="${srcdir}/tests" executable="${phpunit_command}" passthru="true" checkreturn="true">
+    <exec dir="${srcdir}/tests" executable="${sh}" passthru="true" checkreturn="true">
     </exec>
   </target>
 

From 64d33dffedb25449414aeaab017a927044e668df Mon Sep 17 00:00:00 2001
From: Susan Turkel <sturkel@villanova.edu>
Date: Tue, 9 Jul 2024 14:40:57 -0400
Subject: [PATCH 5/7] Added apostrophe code to phpunit sections

---
 build.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 2560b6d..6d64a31 100644
--- a/build.xml
+++ b/build.xml
@@ -127,13 +127,14 @@
   <!-- PHPUnit -->
   <target name="phpunit" description="Run tests">
     <exec dir="${srcdir}/tests" executable="${sh}" passthru="true" checkreturn="true">
-      <arg line="--log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/" />
+      <arg line="-c &apos;${phpunit_command} --log-junit ${builddir}/reports/phpunit.xml --coverage-clover ${builddir}/reports/coverage/clover.xml --coverage-html ${builddir}/reports/coverage/&apos;" />
     </exec>
   </target>
 
   <!-- PHPUnit without logging output -->
   <target name="phpunitfast" description="Run tests">
     <exec dir="${srcdir}/tests" executable="${sh}" passthru="true" checkreturn="true">
+      <arg line="-c &apos;${phpunit_command} &apos;" />
     </exec>
   </target>
 

From 26dbc1fb79c17c6961f996d8514d7d072cb96b5f Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 9 Jul 2024 14:59:00 -0400
Subject: [PATCH 6/7] Adjust whitespace.

---
 composer.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index d50b4dc..dbb4fd0 100644
--- a/composer.json
+++ b/composer.json
@@ -33,13 +33,13 @@
         "vufind-org/vufindcode": "^1.2"
     },
     "require-dev": {
-         "friendsofphp/php-cs-fixer": "3.51.0",
-         "guzzlehttp/guzzle": "^7.8.1",
-         "pear/http_request2": "2.6.0",
-         "phpmd/phpmd": "2.15.0",
-         "phpstan/phpstan": "1.10.59",
-         "phpunit/phpunit": "10.5.11",
-         "phing/phing": "3.0",
-         "squizlabs/php_codesniffer": "3.9.0"
+        "friendsofphp/php-cs-fixer": "3.51.0",
+        "guzzlehttp/guzzle": "^7.8.1",
+        "pear/http_request2": "2.6.0",
+        "phpmd/phpmd": "2.15.0",
+        "phpstan/phpstan": "1.10.59",
+        "phpunit/phpunit": "10.5.11",
+        "phing/phing": "3.0",
+        "squizlabs/php_codesniffer": "3.9.0"
     }
 }

From 6fb32d6f763b8f2de3a6484e4e4a48cc2adcb678 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 9 Jul 2024 14:59:51 -0400
Subject: [PATCH 7/7] Remove unused property.

---
 build.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.xml b/build.xml
index 6d64a31..2decf30 100644
--- a/build.xml
+++ b/build.xml
@@ -5,7 +5,6 @@
   <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="downloadsdir" value="${srcdir}/downloads" 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" />