diff --git a/apps/profile/templates/404-profile.php b/apps/profile/templates/404-profile.php index 8a1084b3911..2d34a9e7614 100644 --- a/apps/profile/templates/404-profile.php +++ b/apps/profile/templates/404-profile.php @@ -8,7 +8,7 @@ /** @var \OCP\Defaults $theme */ // @codeCoverageIgnoreStart if (!isset($_)) { //standalone page is not supported anymore - redirect to / - require_once '../../lib/base.php'; + require_once '../../../lib/base.php'; $urlGenerator = \OCP\Server::get(\OCP\IURLGenerator::class); header('Location: ' . $urlGenerator->getAbsoluteURL('/')); diff --git a/build/psalm-checker.sh b/build/psalm-checker.sh index f0288269bc4..679c42c4fa0 100755 --- a/build/psalm-checker.sh +++ b/build/psalm-checker.sh @@ -5,10 +5,15 @@ if [ -d "dist" ]; then missing='' - for f in apps/*; do - grep "directory name=\"$f\"" psalm.xml 2>&1 > /dev/null + for app in apps/*; do + if git check-ignore "$app" -q ; then + echo "ℹ️ Ignoring non shipped app: $app" + continue + fi + + grep "directory name=\"$app\"" psalm.xml 2>&1 > /dev/null if [ $? -ne 0 ]; then - missing="$missing- $f\n" + missing="$missing - $app\n" fi done