From 117c6b9083b1a352d1b9fe808f571ed106783796 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Tue, 20 Jun 2023 11:18:12 -0500
Subject: [PATCH 01/18] Mark methods for deprecation

---
 src/ImsStorage/ImsCache.php  | 3 +++
 src/ImsStorage/ImsCookie.php | 3 +++
 src/JwksEndpoint.php         | 5 +++++
 src/LtiDeepLink.php          | 5 +++++
 src/Redirect.php             | 5 +++++
 5 files changed, 21 insertions(+)

diff --git a/src/ImsStorage/ImsCache.php b/src/ImsStorage/ImsCache.php
index ed38bb44..a0be843c 100644
--- a/src/ImsStorage/ImsCache.php
+++ b/src/ImsStorage/ImsCache.php
@@ -4,6 +4,9 @@
 
 use Packback\Lti1p3\Interfaces\ICache;
 
+/**
+ * @deprecated
+ */
 class ImsCache implements ICache
 {
     private $cache;
diff --git a/src/ImsStorage/ImsCookie.php b/src/ImsStorage/ImsCookie.php
index a98175e2..3e3b552c 100644
--- a/src/ImsStorage/ImsCookie.php
+++ b/src/ImsStorage/ImsCookie.php
@@ -4,6 +4,9 @@
 
 use Packback\Lti1p3\Interfaces\ICookie;
 
+/**
+ * @deprecated
+ */
 class ImsCookie implements ICookie
 {
     public function getCookie(string $name): ?string
diff --git a/src/JwksEndpoint.php b/src/JwksEndpoint.php
index ac9ccee7..158b61cf 100644
--- a/src/JwksEndpoint.php
+++ b/src/JwksEndpoint.php
@@ -48,8 +48,13 @@ public function getPublicJwks()
         return ['keys' => $jwks];
     }
 
+    /**
+     * @deprecated
+     */
     public function outputJwks()
     {
+        trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
         echo json_encode($this->getPublicJwks());
     }
 }
diff --git a/src/LtiDeepLink.php b/src/LtiDeepLink.php
index 4ee8d7da..5cfac9be 100644
--- a/src/LtiDeepLink.php
+++ b/src/LtiDeepLink.php
@@ -43,8 +43,13 @@ public function getResponseJwt($resources)
         return JWT::encode($message_jwt, $this->registration->getToolPrivateKey(), 'RS256', $this->registration->getKid());
     }
 
+    /**
+     * @deprecated
+     */
     public function outputResponseForm($resources)
     {
+        trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
         $jwt = $this->getResponseJwt($resources);
         /*
          * @todo Fix this
diff --git a/src/Redirect.php b/src/Redirect.php
index a87ed5f1..1ee82705 100644
--- a/src/Redirect.php
+++ b/src/Redirect.php
@@ -36,8 +36,13 @@ public function getRedirectUrl()
         return $this->location;
     }
 
+    /**
+     * @deprecated
+     */
     public function doJsRedirect()
     {
+        trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+
         ?>
         <a id="try-again" target="_blank">If you are not automatically redirected, click here to continue</a>
         <script>

From 40e7eda95051c45893b7a0a7c1d5d309f826b529 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Tue, 20 Jun 2023 15:13:10 -0500
Subject: [PATCH 02/18] lint

---
 src/JwksEndpoint.php | 2 +-
 src/LtiDeepLink.php  | 2 +-
 src/Redirect.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/JwksEndpoint.php b/src/JwksEndpoint.php
index 158b61cf..2145ea4e 100644
--- a/src/JwksEndpoint.php
+++ b/src/JwksEndpoint.php
@@ -53,7 +53,7 @@ public function getPublicJwks()
      */
     public function outputJwks()
     {
-        trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+        trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
 
         echo json_encode($this->getPublicJwks());
     }
diff --git a/src/LtiDeepLink.php b/src/LtiDeepLink.php
index 5cfac9be..096fad51 100644
--- a/src/LtiDeepLink.php
+++ b/src/LtiDeepLink.php
@@ -48,7 +48,7 @@ public function getResponseJwt($resources)
      */
     public function outputResponseForm($resources)
     {
-        trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+        trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
 
         $jwt = $this->getResponseJwt($resources);
         /*
diff --git a/src/Redirect.php b/src/Redirect.php
index 1ee82705..75a47410 100644
--- a/src/Redirect.php
+++ b/src/Redirect.php
@@ -41,7 +41,7 @@ public function getRedirectUrl()
      */
     public function doJsRedirect()
     {
-        trigger_error('Method ' . __METHOD__ . ' is deprecated', E_USER_DEPRECATED);
+        trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
 
         ?>
         <a id="try-again" target="_blank">If you are not automatically redirected, click here to continue</a>

From 7f0f19542f2585459f641b3d537439fef40213ea Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Tue, 3 Oct 2023 22:32:46 -0500
Subject: [PATCH 03/18] add a few todos

---
 src/LtiMessageLaunch.php | 2 ++
 src/LtiOidcLogin.php     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/LtiMessageLaunch.php b/src/LtiMessageLaunch.php
index e5e0fcb4..29efba40 100644
--- a/src/LtiMessageLaunch.php
+++ b/src/LtiMessageLaunch.php
@@ -132,6 +132,7 @@ public static function fromCache(
      */
     public function validate(array $request = null)
     {
+        // @todo remove this in v6.0
         if ($request === null) {
             $request = $_POST;
         }
@@ -144,6 +145,7 @@ public function validate(array $request = null)
             ->validateJwtSignature()
             ->validateDeployment()
             ->validateMessage()
+            // @todo remove this in v6.0
             ->cacheLaunchData();
     }
 
diff --git a/src/LtiOidcLogin.php b/src/LtiOidcLogin.php
index 7d12c7a5..31ac4bcf 100644
--- a/src/LtiOidcLogin.php
+++ b/src/LtiOidcLogin.php
@@ -47,6 +47,7 @@ public static function new(IDatabase $database, ICache $cache = null, ICookie $c
      */
     public function doOidcLoginRedirect($launch_url, array $request = null)
     {
+        // @todo remove this in v6.0
         if ($request === null) {
             $request = $_REQUEST;
         }

From 512232c37b2eef9ee89eae4a1efc873a8e4e0fe4 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 6 Oct 2023 09:40:15 -0500
Subject: [PATCH 04/18] A few other to-dos

---
 src/LtiGrade.php         | 2 ++
 src/LtiMessageLaunch.php | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/LtiGrade.php b/src/LtiGrade.php
index c5b9826e..3efb6260 100644
--- a/src/LtiGrade.php
+++ b/src/LtiGrade.php
@@ -162,6 +162,8 @@ public function getCanvasExtension()
      *             is unexpected data. And, the type of LMS cannot simply be inferred by their URL.
      *
      * @see https://documentation.instructure.com/doc/api/score.html
+     * 
+     * @todo: Deprecate this in the next major version
      */
     public function setCanvasExtension($value)
     {
diff --git a/src/LtiMessageLaunch.php b/src/LtiMessageLaunch.php
index 29efba40..bc63c402 100644
--- a/src/LtiMessageLaunch.php
+++ b/src/LtiMessageLaunch.php
@@ -45,6 +45,8 @@ class LtiMessageLaunch
     public const ERR_INVALID_MESSAGE = 'Message validation failed.';
     public const ERR_INVALID_ALG = 'Invalid alg was specified in the JWT header.';
     public const ERR_MISMATCHED_ALG_KEY = 'The alg specified in the JWT header is incompatible with the JWK key type.';
+
+    // @todo: type these on the next major release
     private $db;
     private $cache;
     private $cookie;
@@ -115,6 +117,7 @@ public static function fromCache(
         ICache $cache = null,
         ILtiServiceConnector $serviceConnector = null
     ) {
+        // @todo: Fix the null here on the next major version
         $new = new LtiMessageLaunch($database, $cache, null, $serviceConnector);
         $new->launch_id = $launch_id;
         $new->jwt = ['body' => $new->cache->getLaunchData($launch_id)];

From 2d801e967aff4f65176818c24fda3e6966edeb1c Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 6 Oct 2023 09:40:43 -0500
Subject: [PATCH 05/18] Lint

---
 src/LtiGrade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/LtiGrade.php b/src/LtiGrade.php
index 3efb6260..bca75be8 100644
--- a/src/LtiGrade.php
+++ b/src/LtiGrade.php
@@ -162,7 +162,7 @@ public function getCanvasExtension()
      *             is unexpected data. And, the type of LMS cannot simply be inferred by their URL.
      *
      * @see https://documentation.instructure.com/doc/api/score.html
-     * 
+     *
      * @todo: Deprecate this in the next major version
      */
     public function setCanvasExtension($value)

From 0f0f04683acb7fe3e680ec13d5b20b8b1c5f7417 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 6 Oct 2023 14:03:55 -0500
Subject: [PATCH 06/18] Add todo around versions

---
 src/JwksEndpoint.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/JwksEndpoint.php b/src/JwksEndpoint.php
index 2145ea4e..92197f17 100644
--- a/src/JwksEndpoint.php
+++ b/src/JwksEndpoint.php
@@ -6,6 +6,9 @@
 use Packback\Lti1p3\Interfaces\ILtiRegistration;
 use phpseclib3\Crypt\RSA;
 
+/**
+ * @todo Pin versions to v6.6 and php 8
+ */
 class JwksEndpoint
 {
     private $keys;

From dc08a1b373fc5e404da786ea6d2f6422dfc538cc Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 1 Dec 2023 13:51:51 -0600
Subject: [PATCH 07/18] Lint

---
 src/LtiMessageLaunch.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/LtiMessageLaunch.php b/src/LtiMessageLaunch.php
index f4b80a57..2f15c69e 100644
--- a/src/LtiMessageLaunch.php
+++ b/src/LtiMessageLaunch.php
@@ -48,7 +48,6 @@ class LtiMessageLaunch
     public const ERR_MISMATCHED_ALG_KEY = 'The alg specified in the JWT header is incompatible with the JWK key type.';
     public const ERR_OAUTH_KEY_SIGN_NOT_VERIFIED = 'Unable to upgrade from LTI 1.1 to 1.3. No OAuth Consumer Key matched this signature.';
     public const ERR_OAUTH_KEY_SIGN_MISSING = 'Unable to upgrade from LTI 1.1 to 1.3. The oauth_consumer_key_sign was not provided.';
-
     private IDatabase $db;
     private ICache $cache;
 

From 046c247033dea304912a03b2bdb61d172993c4d2 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 1 Dec 2023 14:43:04 -0600
Subject: [PATCH 08/18] Add githook

---
 .githooks/pre-commit | 134 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100755 .githooks/pre-commit

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
new file mode 100755
index 00000000..82e5ceb4
--- /dev/null
+++ b/.githooks/pre-commit
@@ -0,0 +1,134 @@
+#!/bin/bash
+
+set -o pipefail
+
+GIT_ROOT=$(git rev-parse --show-toplevel) # ".../questions"
+
+# So we avoid the "Not a git repository" error when performing git commands in a subdir
+unset GIT_DIR
+
+# Get changed files to be committed, excluding deleted files (since we can't grep them)
+CHANGED_FILES=$(git diff --cached --name-only --diff-filter=d)
+
+STARTING_DIR=$(pwd)
+APP_API_DIR="$GIT_ROOT/backend/app-api"
+FRONTEND_DIR="$GIT_ROOT/frontend"
+E2E_DIR="$GIT_ROOT/e2e-tests"
+
+NO_FORMAT="\e[0m"
+F_BOLD="\e[1m"
+C_RED="\e[31m"
+C_YELLOW="\e[93m"
+C_CYAN="\e[36m"
+C_LIME="\e[92m"
+
+function on_script_finish_cleanup {
+  # Whether it passed or failed, undo any stateful changes.
+  cd "$STARTING_DIR"
+}
+
+# Rather than doing `return 1`, we fail fast.
+function fail {
+  echo -e "${C_RED}${F_BOLD}Pre-commit hook failed! Fix the above errors before committing.${NO_FORMAT}"
+  exit 1
+}
+
+function file_ends_with_newline {
+  file_path=$1
+
+  # NOTE: Empty files technically end with a newline.
+    [[ $(wc -l < "$file_path") -eq 0 ]] || [[ $(tail -c1 "$file_path" | wc -l) -gt 0 ]]
+}
+
+function is_executable_installed {
+  executable_name=$1
+
+  which "$executable_name" >/dev/null
+}
+
+# Returns a 0 status code if the given feature is enabled, 1 otherwise.
+# Feature names are arbitrarily defined in the optional file `.skipped-checks`
+# in order to give more control to developers to-as what gets executed.
+function feature_is_enabled {
+  feature_name=$1
+
+  # We redirect output so that it doesn't emit warnings if the file doesn't exist.
+  ! grep "$feature_name" "$GIT_ROOT/.githooks/.skipped-checks" &> /dev/null
+}
+
+function feature_is_disabled {
+  feature_name=$1
+
+  ! feature_is_enabled "$feature_name"
+}
+
+function skip_if_no_changes {
+  if [[ -z "$CHANGED_FILES" ]]; then
+    echo "No changes were detected while running the pre-commit hook." && exit 0
+  fi
+}
+
+function skip_if_merge_in_progress {
+  if [ -f ".git/MERGE_HEAD" ]; then
+    echo "Detected merge in progress, skipping pre-commit hook." && exit 0
+  fi
+}
+
+function fail_if_on_master_branch {
+  # Make sure we're not making a commit directly on master
+  branch=$(git rev-parse --abbrev-ref HEAD)
+
+  if [[ "$branch" == "master" ]]; then
+    echo -e "${C_RED}Disallowing commit directly to branch $branch, please commit to a feature branch ${NO_FORMAT}" && fail
+  fi
+}
+
+function fail_if_unresolved_merge_conflict {
+  # Check the files to prevent merge markers from being committed.
+  if echo "$CHANGED_FILES" | xargs --no-run-if-empty egrep '[><]{7}' -H -I --line-number; then
+    echo -e "${C_RED}You have merge markers (conflicts) in the above files, lines. Fix them before committing.${NO_FORMAT}" && fail
+  fi
+}
+
+function lint_eof_newlines {
+  if feature_is_disabled "pre-commit-auto-newlines"; then
+    return 0
+  fi
+
+  text_files=$(echo "$CHANGED_FILES" | grep -E '\.(css|docker|Dockerfile|dockerignore|ejs|env|example|gitignore|html|js|json|php|py|rb|scss|sh|svg|toml|trivyignore|ts|txt|yaml|yml)$')
+  for f in $text_files; do
+    # Add a linebreak to the file if it doesn't have one
+    if ! file_ends_with_newline "$f"; then
+      echo >>"$f"
+      git add "$f"
+    fi
+  done
+}
+
+function lint_php {
+
+  php_files=$(echo "$CHANGED_FILES" | grep '\.php')
+  if [[ -z "$php_files" ]]; then
+    return 0 # There's nothing to lint.
+  fi
+
+  if ! [ -x "composer" ]; then
+    echo -e "${C_RED}Composer is not installed. Install it, then run \`composer install\`.${NO_FORMAT}" && return 1
+  fi
+
+  composer lint-fix || return 1
+}
+
+echo -e "${NO_FORMAT}${F_BOLD}Running pre-commit hook...${NO_FORMAT}"
+
+trap on_script_finish_cleanup EXIT
+
+skip_if_merge_in_progress
+skip_if_no_changes
+
+fail_if_unresolved_merge_conflict
+
+lint_eof_newlines || fail
+lint_php || fail
+
+echo -e "${C_LIME}${F_BOLD}Pre-commit hook passed!${NO_FORMAT}"

From af24cbbc671016cfe4fd3da15fb82b9532121106 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 1 Dec 2023 14:48:37 -0600
Subject: [PATCH 09/18] Test linting

---
 .githooks/pre-commit | 4 ----
 src/Lti1p1Key.php    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index 82e5ceb4..079f7b28 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -112,10 +112,6 @@ function lint_php {
     return 0 # There's nothing to lint.
   fi
 
-  if ! [ -x "composer" ]; then
-    echo -e "${C_RED}Composer is not installed. Install it, then run \`composer install\`.${NO_FORMAT}" && return 1
-  fi
-
   composer lint-fix || return 1
 }
 
diff --git a/src/Lti1p1Key.php b/src/Lti1p1Key.php
index 7bd5026e..251e7bf9 100644
--- a/src/Lti1p1Key.php
+++ b/src/Lti1p1Key.php
@@ -2,7 +2,7 @@
 
 namespace Packback\Lti1p3;
 
-/**
+/** 
  * Used for migrations from LTI 1.1 to LTI 1.3
  *
  * @see IMigrationDatabase

From 46ee0863e900dd566811a3c5f95faacf03f4bf9a Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 1 Dec 2023 14:52:56 -0600
Subject: [PATCH 10/18] Test linting

---
 .githooks/pre-commit | 11 +++++++++--
 src/Lti1p1Key.php    |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index 079f7b28..c6d93a11 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -106,13 +106,20 @@ function lint_eof_newlines {
 }
 
 function lint_php {
-
   php_files=$(echo "$CHANGED_FILES" | grep '\.php')
   if [[ -z "$php_files" ]]; then
     return 0 # There's nothing to lint.
   fi
 
-  composer lint-fix || return 1
+  phpcsfixer="vendor/bin/php-cs-fixer"
+
+  if ! [ -x "$phpcsfixer" ]; then
+    echo -e "${C_RED}PHP-CS-Fixer is not installed. Install it with \`composer install\`.${NO_FORMAT}" && return 1
+  fi
+
+  echo -e "${C_CYAN}Linting PHP-CS-Fixer...${NO_FORMAT}"
+
+  $phpcsfixer fix -q || return 1
 }
 
 echo -e "${NO_FORMAT}${F_BOLD}Running pre-commit hook...${NO_FORMAT}"
diff --git a/src/Lti1p1Key.php b/src/Lti1p1Key.php
index 251e7bf9..a96d2d34 100644
--- a/src/Lti1p1Key.php
+++ b/src/Lti1p1Key.php
@@ -2,7 +2,7 @@
 
 namespace Packback\Lti1p3;
 
-/** 
+/**  
  * Used for migrations from LTI 1.1 to LTI 1.3
  *
  * @see IMigrationDatabase

From 292df0e6e5dd774c9dca329d54686ef19b78c5f1 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 1 Dec 2023 14:54:23 -0600
Subject: [PATCH 11/18] Test linting

---
 .githooks/pre-commit | 5 ++++-
 src/Lti1p1Key.php    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index c6d93a11..7f74be5a 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -117,9 +117,12 @@ function lint_php {
     echo -e "${C_RED}PHP-CS-Fixer is not installed. Install it with \`composer install\`.${NO_FORMAT}" && return 1
   fi
 
-  echo -e "${C_CYAN}Linting PHP-CS-Fixer...${NO_FORMAT}"
+  php_files_arg=$(echo "$php_files" | tr '\n' ' ')
 
+  echo -e "${C_CYAN}Linting PHP-CS-Fixer...${NO_FORMAT}"
   $phpcsfixer fix -q || return 1
+
+  git add $php_files_arg
 }
 
 echo -e "${NO_FORMAT}${F_BOLD}Running pre-commit hook...${NO_FORMAT}"
diff --git a/src/Lti1p1Key.php b/src/Lti1p1Key.php
index a96d2d34..7bd5026e 100644
--- a/src/Lti1p1Key.php
+++ b/src/Lti1p1Key.php
@@ -2,7 +2,7 @@
 
 namespace Packback\Lti1p3;
 
-/**  
+/**
  * Used for migrations from LTI 1.1 to LTI 1.3
  *
  * @see IMigrationDatabase

From 3e0ac108bb8bf3629d5e4c2995c937717d89e452 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 1 Dec 2023 14:56:37 -0600
Subject: [PATCH 12/18] fix merge conflict

---
 src/JwksEndpoint.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/JwksEndpoint.php b/src/JwksEndpoint.php
index b18f6fbe..92197f17 100644
--- a/src/JwksEndpoint.php
+++ b/src/JwksEndpoint.php
@@ -52,11 +52,7 @@ public function getPublicJwks()
     }
 
     /**
-<<<<<<< HEAD
      * @deprecated
-=======
-     * @todo: Deprecate this in the next major version
->>>>>>> mgmt-132-migrations
      */
     public function outputJwks()
     {

From e72fd0dfcd0e8cba66b546ea6f154600e7f9fa2a Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Fri, 1 Dec 2023 15:54:17 -0600
Subject: [PATCH 13/18] deprecate some stuff

---
 src/ImsStorage/ImsCookie.php | 4 ----
 src/LtiDeepLinkResource.php  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ImsStorage/ImsCookie.php b/src/ImsStorage/ImsCookie.php
index 3e15ee55..3e3b552c 100644
--- a/src/ImsStorage/ImsCookie.php
+++ b/src/ImsStorage/ImsCookie.php
@@ -5,11 +5,7 @@
 use Packback\Lti1p3\Interfaces\ICookie;
 
 /**
-<<<<<<< HEAD
  * @deprecated
-=======
- * @todo Deprecate this in the next major version
->>>>>>> mgmt-132-migrations
  */
 class ImsCookie implements ICookie
 {
diff --git a/src/LtiDeepLinkResource.php b/src/LtiDeepLinkResource.php
index 093f979c..5f4ba7a8 100644
--- a/src/LtiDeepLinkResource.php
+++ b/src/LtiDeepLinkResource.php
@@ -125,6 +125,8 @@ public function setCustomParams(array $value): LtiDeepLinkResource
      */
     public function getTarget(): string
     {
+        trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
+
         return $this->target;
     }
 
@@ -134,6 +136,8 @@ public function getTarget(): string
      */
     public function setTarget(string $value): LtiDeepLinkResource
     {
+        trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
+
         $this->target = $value;
 
         return $this;

From 6ab7f598a6daa204c4bb59025a28d39c1b1737c0 Mon Sep 17 00:00:00 2001
From: Davo <dbhynds@gmail.com>
Date: Tue, 5 Dec 2023 10:09:31 -0600
Subject: [PATCH 14/18] Update .githooks/pre-commit

Co-authored-by: Brian Lin <lin.brian.l@gmail.com>
---
 .githooks/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index 7f74be5a..09cf1fb4 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -2,7 +2,7 @@
 
 set -o pipefail
 
-GIT_ROOT=$(git rev-parse --show-toplevel) # ".../questions"
+GIT_ROOT=$(git rev-parse --show-toplevel) # ".../lti-1-3-php-library"
 
 # So we avoid the "Not a git repository" error when performing git commands in a subdir
 unset GIT_DIR

From ee439b09567e7f23a91d0fcc73ac21a42f9cfecd Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Tue, 5 Dec 2023 10:13:41 -0600
Subject: [PATCH 15/18] PR Feedback

---
 .githooks/pre-commit | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index 09cf1fb4..40f94577 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -10,11 +10,6 @@ unset GIT_DIR
 # Get changed files to be committed, excluding deleted files (since we can't grep them)
 CHANGED_FILES=$(git diff --cached --name-only --diff-filter=d)
 
-STARTING_DIR=$(pwd)
-APP_API_DIR="$GIT_ROOT/backend/app-api"
-FRONTEND_DIR="$GIT_ROOT/frontend"
-E2E_DIR="$GIT_ROOT/e2e-tests"
-
 NO_FORMAT="\e[0m"
 F_BOLD="\e[1m"
 C_RED="\e[31m"
@@ -22,11 +17,6 @@ C_YELLOW="\e[93m"
 C_CYAN="\e[36m"
 C_LIME="\e[92m"
 
-function on_script_finish_cleanup {
-  # Whether it passed or failed, undo any stateful changes.
-  cd "$STARTING_DIR"
-}
-
 # Rather than doing `return 1`, we fail fast.
 function fail {
   echo -e "${C_RED}${F_BOLD}Pre-commit hook failed! Fix the above errors before committing.${NO_FORMAT}"
@@ -127,8 +117,6 @@ function lint_php {
 
 echo -e "${NO_FORMAT}${F_BOLD}Running pre-commit hook...${NO_FORMAT}"
 
-trap on_script_finish_cleanup EXIT
-
 skip_if_merge_in_progress
 skip_if_no_changes
 

From ffa881a920898d6a3b80e997be936b566cc4ff34 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Tue, 5 Dec 2023 11:10:27 -0600
Subject: [PATCH 16/18] rm unused func

---
 .githooks/pre-commit | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index 40f94577..1dfeb762 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -64,15 +64,6 @@ function skip_if_merge_in_progress {
   fi
 }
 
-function fail_if_on_master_branch {
-  # Make sure we're not making a commit directly on master
-  branch=$(git rev-parse --abbrev-ref HEAD)
-
-  if [[ "$branch" == "master" ]]; then
-    echo -e "${C_RED}Disallowing commit directly to branch $branch, please commit to a feature branch ${NO_FORMAT}" && fail
-  fi
-}
-
 function fail_if_unresolved_merge_conflict {
   # Check the files to prevent merge markers from being committed.
   if echo "$CHANGED_FILES" | xargs --no-run-if-empty egrep '[><]{7}' -H -I --line-number; then

From 6cff169a79e939649018be9c53dc22bb2f1591de Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Tue, 5 Dec 2023 11:13:29 -0600
Subject: [PATCH 17/18] One more function

---
 src/Redirect.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Redirect.php b/src/Redirect.php
index 75a47410..f90f6961 100644
--- a/src/Redirect.php
+++ b/src/Redirect.php
@@ -22,8 +22,12 @@ public function doRedirect()
         exit;
     }
 
+    /**
+     * @deprecated
+     */
     public function doHybridRedirect(ICookie $cookie)
     {
+        trigger_error('Method '.__METHOD__.' is deprecated', E_USER_DEPRECATED);
         if (!empty($cookie->getCookie(self::$CAN_302_COOKIE))) {
             return $this->doRedirect();
         }

From 484229bf644c753fc46c0ffdfdbf5cc6a3803fe0 Mon Sep 17 00:00:00 2001
From: Davo Hynds <dbhynds@gmail.com>
Date: Tue, 5 Dec 2023 13:21:01 -0600
Subject: [PATCH 18/18] Update docs

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index f95f6bbd..aa71587d 100644
--- a/README.md
+++ b/README.md
@@ -44,11 +44,11 @@ A JWKS (JSON Web Key Set) endpoint can be generated for either an individual reg
 use Packback\Lti1p3\JwksEndpoint;
 
 // From issuer
-JwksEndpoint::fromIssuer($database, 'http://example.com')->outputJwks();
+JwksEndpoint::fromIssuer($database, 'http://example.com')->getPublicJwks();
 // From registration
-JwksEndpoint::fromRegistration($registration)->outputJwks();
+JwksEndpoint::fromRegistration($registration)->getPublicJwks();
 // From array
-JwksEndpoint::new(['a_unique_KID' => file_get_contents('/path/to/private/key.pem')])->outputJwks();
+JwksEndpoint::new(['a_unique_KID' => file_get_contents('/path/to/private/key.pem')])->getPublicJwks();
 ```
 
 ## Documentation