Skip to content

minor improvements #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slr655 merged 1 commit into from
Aug 21, 2026
Merged

minor improvements #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion application-restricted-signed-jwt-tutorials/php/auth/JwtHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public function GenerateJwt()
return $jwt;
}

function base64UrlEncode($data)
private function base64UrlEncode($data)
{
return \str_replace('=', '', \strtr(\base64_encode($data), '+/', '-_'));
}
Expand Down
12 changes: 8 additions & 4 deletions scripts/githooks/scan-secrets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function main() {
function get-cmd-to-run() {

check=${check:-staged-changes}
case $check in
case "$check" in
"whole-history")
cmd="detect --source $dir --verbose --redact"
;;
Expand All @@ -52,9 +52,13 @@ function get-cmd-to-run() {
"staged-changes")
cmd="protect --source $dir --verbose --staged"
;;
*)
echo "ERROR: Invalid check value: '$check'" >&2
exit 1
;;
esac
# Include base line file if it exists
if [ -f "$dir/scripts/config/.gitleaks-baseline.json" ]; then
if [[ -f "$dir/scripts/config/.gitleaks-baseline.json" ]]; then
cmd="$cmd --baseline-path $dir/scripts/config/.gitleaks-baseline.json"
fi
# Include the config file
Expand Down Expand Up @@ -94,8 +98,8 @@ function run-gitleaks-in-docker() {
# ==============================================================================

function is-arg-true() {

if [[ "$1" =~ ^(true|yes|y|on|1|TRUE|YES|Y|ON)$ ]]; then
local value="$1"
if [[ "$value" =~ ^(true|yes|y|on|1|TRUE|YES|Y|ON)$ ]]; then
return 0
else
return 1
Expand Down
2 changes: 1 addition & 1 deletion user-restricted-combined-auth-tutorials/cis2/php/config/preload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php

if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
require_once dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
}
4 changes: 2 additions & 2 deletions user-restricted-combined-auth-tutorials/cis2/php/tests/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

use Symfony\Component\Dotenv\Dotenv;

require dirname(__DIR__).'/vendor/autoload.php';
require_once dirname(__DIR__).'/vendor/autoload.php';

if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
require dirname(__DIR__).'/config/bootstrap.php';
require_once dirname(__DIR__).'/config/bootstrap.php';
} elseif (method_exists(Dotenv::class, 'bootEnv')) {
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
}
2 changes: 1 addition & 1 deletion user-restricted-combined-auth-tutorials/nhs-login/php/config/preload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php

if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
require_once dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
}
4 changes: 2 additions & 2 deletions user-restricted-combined-auth-tutorials/nhs-login/php/tests/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

use Symfony\Component\Dotenv\Dotenv;

require dirname(__DIR__).'/vendor/autoload.php';
require_once dirname(__DIR__).'/vendor/autoload.php';

if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
require dirname(__DIR__).'/config/bootstrap.php';
require_once dirname(__DIR__).'/config/bootstrap.php';
} elseif (method_exists(Dotenv::class, 'bootEnv')) {
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
}
2 changes: 1 addition & 1 deletion user-restricted-separate-auth-tutorials/cis2/php/config/preload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php

if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
require_once dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
}
2 changes: 1 addition & 1 deletion user-restricted-separate-auth-tutorials/cis2/php/src/Service/ISTokenExchange.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ISTokenExchange {
private $subject_token;
private $client_assertion;

function __construct($subject_token, $client_assertion)
public function __construct($subject_token, $client_assertion)
{
$this->subject_token = $subject_token;
$this->client_assertion = $client_assertion;
Expand Down
4 changes: 2 additions & 2 deletions user-restricted-separate-auth-tutorials/cis2/php/src/Service/JwtHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ class JwtHandler
private $privateKeyFile;
private $alg;

function __construct($privateKeyFile, $audience, $client_id, $kid, $alg, $alg_encrypt)
public function __construct($privateKeyFile, $audience, $client_id, $kid, $alg, $alg_encrypt)
{
$this->audience = $audience;
$this->client_id = $client_id;
Expand Down Expand Up @@ -47,7 +47,7 @@ public function GenerateJwt()
return $jwt;
}

function base64UrlEncode($data)
private function base64UrlEncode($data)
{
return \str_replace('=', '', \strtr(\base64_encode($data), '+/', '-_'));
}
Expand Down
2 changes: 1 addition & 1 deletion user-restricted-separate-auth-tutorials/cis2/php/src/Service/SeparateAuthHttpClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class SeparateAuthHttpClient {
private $jwt;
private $tokenUrl;

function __construct($code, $jwt, $tokenUrl)
public function __construct($code, $jwt, $tokenUrl)
{
$this->code = $code;
$this->jwt = $jwt;
Expand Down
2 changes: 1 addition & 1 deletion user-restricted-separate-auth-tutorials/nhs-login/php/config/preload.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php

if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
require_once dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
}
2 changes: 1 addition & 1 deletion user-restricted-separate-auth-tutorials/nhs-login/php/src/Service/ISTokenExchange.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class ISTokenExchange {
private $subject_token;
private $client_assertion;

function __construct($subject_token, $client_assertion)
public function __construct($subject_token, $client_assertion)
{
$this->subject_token = $subject_token;
$this->client_assertion = $client_assertion;
Expand Down
2 changes: 1 addition & 1 deletion user-restricted-separate-auth-tutorials/nhs-login/php/src/Service/JwtHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public function GenerateJwt()
return $jwt;
}

function base64UrlEncode($data)
private function base64UrlEncode($data)
{
return \str_replace('=', '', \strtr(\base64_encode($data), '+/', '-_'));
}
Expand Down
2 changes: 1 addition & 1 deletion user-restricted-separate-auth-tutorials/nhs-login/php/src/Service/SeparateAuthHttpClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class SeparateAuthHttpClient {
private $jwt;
private $tokenUrl;

function __construct($code, $jwt, $tokenUrl)
public function __construct($code, $jwt, $tokenUrl)
{
$this->code = $code;
$this->jwt = $jwt;
Expand Down
4 changes: 2 additions & 2 deletions user-restricted-separate-auth-tutorials/nhs-login/php/tests/bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

use Symfony\Component\Dotenv\Dotenv;

require dirname(__DIR__).'/vendor/autoload.php';
require_once dirname(__DIR__).'/vendor/autoload.php';

if (file_exists(dirname(__DIR__).'/config/bootstrap.php')) {
require dirname(__DIR__).'/config/bootstrap.php';
require_once dirname(__DIR__).'/config/bootstrap.php';
} elseif (method_exists(Dotenv::class, 'bootEnv')) {
(new Dotenv())->bootEnv(dirname(__DIR__).'/.env');
}