From 2fa6b9f5717210beb315cf6b8459ab7493a8fb0f Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Fri, 11 Nov 2022 21:29:25 +0100
Subject: [PATCH] Cleanup
---
.gitattributes | 3 ---
.gitignore | 5 -----
bin/build-release.sh | 3 ---
composer.json | 2 ++
phpcs.xml | 4 ++--
psalm.xml | 8 ++++----
6 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index f5760a67e..d3b3d555c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,8 +1,5 @@
/cert/.gitkeep export-ignore
-/config/.gitkeep export-ignore
-/metadata/.gitkeep export-ignore
/tests export-ignore
-/tools export-ignore
codecov.yml export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
diff --git a/.gitignore b/.gitignore
index 35d237f35..6c8316247 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-/log/
/config/
/metadata/
/cert/
@@ -13,10 +12,6 @@
/www/assets/css/*.map
.phpunit.result.cache
-!/config/.gitkeep
-!/metadata/.gitkeep
-!/cache/.gitkeep
-!/locales/.gitkeep
!/www/assets/fonts/.gitkeep
!/www/assets/js/.gitkeep
!/www/assets/css/.gitkeep
diff --git a/bin/build-release.sh b/bin/build-release.sh
index 99b16e858..d4194c2c5 100755
--- a/bin/build-release.sh
+++ b/bin/build-release.sh
@@ -51,9 +51,6 @@ npm audit fix
npx browserslist@latest --update-db
npm run build
-rm cert/.gitkeep
-rm bin/build-release.sh
-
php "$COMPOSER" archive -f tar.gz --dir /tmp --file "$TARGET"
rm "$COMPOSER"
echo `shasum -a 256 /tmp/$TARGET.tar.gz`
diff --git a/composer.json b/composer.json
index bf639e40d..8651b7a20 100644
--- a/composer.json
+++ b/composer.json
@@ -115,6 +115,8 @@
".gitattributes",
".gitignore",
".php_cs.dist",
+ "bin/build-release.sh",
+ "cert/.gitkeep",
"codecov.yml",
"node_modules",
"phpcs.xml",
diff --git a/phpcs.xml b/phpcs.xml
index 9bdd0c40b..40b1cc46a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -7,8 +7,8 @@
</description>
<file>bin</file>
- <file>config-templates</file>
- <file>metadata-templates</file>
+ <file>config</file>
+ <file>metadata</file>
<file>modules</file>
<file>resources</file>
<file>src</file>
diff --git a/psalm.xml b/psalm.xml
index 68f407eb4..62985323f 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -8,8 +8,8 @@
allowStringToStandInForClass="true"
>
<projectFiles>
- <directory name="config-templates" />
- <directory name="metadata-templates" />
+ <directory name="config" />
+ <directory name="metadata" />
<directory name="modules" />
<directory name="src/SimpleSAML" />
<directory name="tests" />
@@ -69,8 +69,8 @@
<!-- Suppress PossiblyUndefinedGlobalVariable on templates -->
<PossiblyUndefinedGlobalVariable>
<errorLevel type="suppress">
- <directory name="config-templates" />
- <directory name="metadata-templates" />
+ <directory name="config" />
+ <directory name="metadata" />
<directory name="modules/adfs/metadata-templates" />
</errorLevel>
</PossiblyUndefinedGlobalVariable>
--
GitLab