Update code to use library-constants for errors

Author: tvdijen

public/proxy.php

@@ -98,18 +98,18 @@
 
     \SimpleSAML\Logger::debug('casserver:' . $message);
 
-    echo $protocol->getProxyFailureResponse('INVALID_REQUEST', $message);
+    echo $protocol->getProxyFailureResponse(C::ERR_INVALID_REQUEST, $message);
 } elseif (!checkServiceURL(sanitize($_GET['targetService']), $legal_target_service_urls)) {
     $message = 'Target service parameter not listed as a legal service: [targetService] = ' .
         var_export($_GET['targetService'], true);
 
     \SimpleSAML\Logger::debug('casserver:' . $message);
 
-    echo $protocol->getProxyFailureResponse('INVALID_REQUEST', $message);
+    echo $protocol->getProxyFailureResponse(C::ERR_INVALID_REQUEST, $message);
 } else {
     $message = 'Missing proxy granting ticket parameter: [pgt]';
 
     \SimpleSAML\Logger::debug('casserver:' . $message);
 
-    echo $protocol->getProxyFailureResponse('INVALID_REQUEST', $message);
+    echo $protocol->getProxyFailureResponse(C::ERR_INVALID_REQUEST, $message);
 }

tests/src/TicketValidatorTest.php

@@ -54,7 +54,7 @@ public function testNonExistantTicket(): void
             $this->ticketValidator->validateAndDeleteTicket($id, 'efg');
             $this->fail('exception expected');
         } catch (CasException $e) {
-            $this->assertEquals('INVALID_TICKET', $e->getCasCode());
+            $this->assertEquals(C::ERR_INVALID_TICKET, $e->getCasCode());
             $this->assertEquals('Ticket \'' . $id . '\' not recognized', $e->getMessage());
         }
     }
@@ -77,7 +77,7 @@ public function testValidTicket(): void
             $this->ticketValidator->validateAndDeleteTicket($id, $serviceUrl);
             $this->fail('exception expected');
         } catch (CasException $e) {
-            $this->assertEquals('INVALID_TICKET', $e->getCasCode());
+            $this->assertEquals(C::ERR_INVALID_TICKET, $e->getCasCode());
             $this->assertEquals('Ticket \'' . $id . '\' not recognized', $e->getMessage());
         }
     }
@@ -95,7 +95,7 @@ public function testWrongServiceUrlTicket(): void
             $this->ticketValidator->validateAndDeleteTicket($id, $serviceUrl);
             $this->fail('exception expected');
         } catch (CasException $e) {
-            $this->assertEquals('INVALID_SERVICE', $e->getCasCode());
+            $this->assertEquals(C::ERR_INVALID_SERVICE, $e->getCasCode());
             $this->assertEquals(
                 "Mismatching service parameters: expected 'http://otherurl.com' but was: 'http://efh.com?a=b&'",
                 $e->getMessage()
@@ -118,7 +118,7 @@ public function testExpiredTicket(): void
             $this->ticketValidator->validateAndDeleteTicket($id, $serviceUrl);
             $this->fail('exception expected');
         } catch (CasException $e) {
-            $this->assertEquals('INVALID_TICKET', $e->getCasCode());
+            $this->assertEquals(C::ERR_INVALID_TICKET, $e->getCasCode());
             $this->assertEquals('Ticket \'' . $id . '\' has expired', $e->getMessage());
         }
         // ensure ticket deleted after validation