simplesamlphp · tvdijen · Jul 1, 2022 · Jul 4, 2022 · Jul 4, 2022 · Jul 4, 2022
diff --git a/.gitattributes b/.gitattributes
@@ -1,8 +1,6 @@
-/cache/.gitkeep export-ignore
-/config/.gitkeep export-ignore
-/metadata/.gitkeep export-ignore
+/cert/.gitkeep export-ignore
+/public/assets/.gitkeep export-ignore
 /tests export-ignore
-/tools export-ignore
 codecov.yml export-ignore
 .editorconfig export-ignore
 .gitattributes export-ignore

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -24,6 +24,13 @@ jobs:
           files: .
           ignore_path: .markdownlintignore
 
+      - name: Perform spell check
+        uses: codespell-project/actions-codespell@master
+        with:
+          path: '**/*.md'
+          check_filenames: true
+          ignore_words_list: tekst
+
   build:
     name: Build documentation
     needs: quality

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -6,7 +6,7 @@ on:
     paths-ignore:
       - '**.md'
   pull_request:
-    branches: [ master, release-* ]
+    branches: [ master, simplesamlphp-* ]
     paths-ignore:
       - '**.md'
 
@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         operating-system: [ubuntu-latest, windows-latest]
-        php-versions: ['7.4', '8.0', '8.1']
+        php-versions: ['8.0', '8.1', '8.2']
 
     steps:
       - name: Setup PHP, with composer and extensions
@@ -43,14 +43,18 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Get composer cache directory (linux)
+        if: ${{ matrix.operating-system == 'ubuntu-latest' }}
+        run: echo "COMPOSER_CACHE=$(composer config cache-files-dir)" >> $GITHUB_ENV
+
+      - name: Get composer cache directory (windows)
+        if: ${{ matrix.operating-system == 'windows-latest' }}
+        run: echo "COMPOSER_CACHE=$(composer config cache-files-dir)" >> $env:GITHUB_ENV
 
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
-          path: ${{ steps.composer-cache.outputs.dir }}
+          path: $COMPOSER_CACHE
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: ${{ runner.os }}-composer-
 
@@ -63,18 +67,16 @@ jobs:
       - name: Syntax check PHP
         run: bash vendor/bin/check-syntax-php.sh
 
-      - name: Decide whether to run code coverage or not
-        if: ${{ matrix.php-versions != '7.4' || matrix.operating-system != 'ubuntu-latest' }}
-        run: |
-          echo "NO_COVERAGE=--no-coverage" >> $GITHUB_ENV
+      - name: Run unit tests with coverage
+        if: ${{ matrix.php-versions == '8.1' && matrix.operating-system == 'ubuntu-latest' }}
+        run: ./vendor/bin/phpunit
 
-      - name: Run unit tests
-        run: |
-          echo $NO_COVERAGE
-          ./vendor/bin/phpunit $NO_COVERAGE
+      - name: Run unit tests (no coverage)
+        if: ${{ matrix.php-versions != '8.1' || matrix.operating-system != 'ubuntu-latest' }}
+        run: ./vendor/bin/phpunit --no-coverage
 
       - name: Save coverage data
-        if: ${{ matrix.php-versions == '7.4' && matrix.operating-system == 'ubuntu-latest' }}
+        if: ${{ matrix.php-versions == '8.1' && matrix.operating-system == 'ubuntu-latest' }}
         uses: actions/upload-artifact@v3
         with:
             name: build-data
@@ -87,7 +89,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-            php-version: '7.4'
+            php-version: '8.0'
             extensions: mbstring, xml
             tools: composer:v2
             coverage: none
@@ -97,28 +99,24 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
-            path: ${{ steps.composer-cache.outputs.dir }}
+            path: $COMPOSER_CACHE
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
             restore-keys: ${{ runner.os }}-composer-
 
       - name: Install Composer dependencies
         run: composer install --no-progress --prefer-dist --optimize-autoloader
 
       - name: Security check for locked dependencies
-        uses: symfonycorp/security-checker-action@v3
+        run: composer audit
 
       - name: Update Composer dependencies
         run: composer update --no-progress --prefer-dist --optimize-autoloader
 
       - name: Security check for updated dependencies
-        uses: symfonycorp/security-checker-action@v3
+        run: composer audit
 
   sanity-check:
     name: Sanity checks
@@ -128,7 +126,7 @@ jobs:
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           extensions: mbstring, xml
           tools: composer:v2
           coverage: none
@@ -138,14 +136,10 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
-            path: ${{ steps.composer-cache.outputs.dir }}
+            path: $COMPOSER_CACHE
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
             restore-keys: ${{ runner.os }}-composer-
 
@@ -165,9 +159,10 @@ jobs:
 
     steps:
       - name: Setup PHP, with composer and extensions
+        id: setup-php
         uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
         with:
-          php-version: '7.4'
+          php-version: '8.0'
           tools: composer:v2
           extensions: mbstring, xml
 
@@ -176,14 +171,10 @@ jobs:
 
       - uses: actions/checkout@v3
 
-      - name: Get composer cache directory
-        id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
       - name: Cache composer dependencies
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         with:
-            path: ${{ steps.composer-cache.outputs.dir }}
+            path: $COMPOSER_CACHE
             key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
             restore-keys: ${{ runner.os }}-composer-
 
@@ -196,16 +187,16 @@ jobs:
           path: ${{ github.workspace }}/build
 
       - name: Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
 
       - name: PHP Code Sniffer
         continue-on-error: false
         run: php vendor/bin/phpcs
 
       - name: Psalm
         continue-on-error: true
-        run: php vendor/bin/psalm --show-info=true --shepherd
+        run: php vendor/bin/psalm --show-info=true --shepherd --php-version=${{ steps.setup-php.outputs.php-version }}
 
       - name: Psalter
         continue-on-error: false
-        run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run
+        run: php vendor/bin/psalter --issues=UnnecessaryVarAnnotation --dry-run --php-version=${{ steps.setup-php.outputs.php-version }}
diff --git a/.gitignore b/.gitignore
@@ -1,27 +1,13 @@
-/log/
-/config/
-/metadata/
-/cert/
-/www/assets/fonts/*
-/www/assets/js/*.js
-/www/assets/js/*.js.LICENSE.txt
-!/www/assets/js/post.js
-/www/assets/js/*.map
-/www/assets/css/*.css
-/www/assets/css/*.css.LICENSE.txt
-!/www/assets/css/post.css
-/www/assets/css/*.map
+cert/*
+config/*
+metadata/*
+!/cert/*.gitkeep
+!/config/*.dist
+!/metadata/*.dist
+!/public/assets/.gitkeep
+/public/assets/*
 .phpunit.result.cache
 
-!/config/.gitkeep
-!/metadata/.gitkeep
-!/cache/.gitkeep
-!/locales/.gitkeep
-!/www/assets/fonts/.gitkeep
-!/www/assets/js/.gitkeep
-!/www/assets/css/.gitkeep
-
-
 # https://www.gitignore.io/api/osx,windows,linux,netbeans,sublimetext,composer,phpstorm,vagrant
 # Created by https://www.gitignore.io
 

diff --git a/.php_cs.dist b/.php_cs.dist
@@ -1,13 +1,13 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-    ->exclude(__DIR__ . '/www/resources')
+    ->exclude(__DIR__ . '/public/assets')
     ->in([
         __DIR__ . '/modules',
+        __DIR__ . '/public',
         __DIR__ . '/src',
         __DIR__ . '/templates',
         __DIR__ . '/tests',
-        __DIR__ . '/www',
     ])
 ;
 

diff --git a/COPYING b/COPYING
@@ -1,4 +1,4 @@
-Copyright 2007-2020 UNINETT AS, 2021-2022 SimpleSAMLphp
+Copyright 2007-2020 UNINETT AS, 2021-2023 SimpleSAMLphp
 
 SimpleSAMLphp is licensed under the CC-GNU LGPL version 2.1.
 http://creativecommons.org/licenses/LGPL/2.1/

diff --git a/bin/build-release.sh b/bin/build-release.sh
@@ -8,9 +8,7 @@ REPOPATH=$2
 if ! shift; then
     echo "$0: Missing required version parameter." >&2
     exit 1
-fi
-
-if [ -z "$VERSION" ]; then
+elif [ -z "$VERSION" ]; then
     echo "$0: Empty version parameter." >&2
     exit 1
 fi
@@ -21,6 +19,7 @@ fi
 
 TAG="v$VERSION"
 TARGET="simplesamlphp-$VERSION"
+COMPOSER="/tmp/composer.phar"
 
 cd /tmp
 
@@ -31,41 +30,24 @@ fi
 
 umask 0022
 
-git clone $REPOPATH $TARGET
+git clone --depth 1 --branch $TAG $REPOPATH $TARGET
 cd $TARGET
-git checkout $TAG
-cd ..
 
-if [ ! -x "$TARGET/composer.phar" ]; then
-    curl -sS https://getcomposer.org/installer | php -- --install-dir=$TARGET
+if [ ! -x "$COMPOSER" ]; then
+    curl -sS https://getcomposer.org/installer | php -- --install-dir=/tmp
 fi
 
 # Set the version in composer.json
-php "$TARGET/composer.phar" config version "v$VERSION" -d "$TARGET"
+php "$COMPOSER" config version "v$VERSION"
 
 # Install dependencies (without vcs history or dev tools)
-php "$TARGET/composer.phar" install --no-dev --prefer-dist -o -d "$TARGET"
+php "$COMPOSER" install --no-dev --prefer-dist -o
 
-cd $TARGET
 npm install
 npm audit fix
+npx browserslist@latest --update-db
 npm run build
-cd ..
-
-mkdir -p "$TARGET/config" "$TARGET/metadata" "$TARGET/cert" "$TARGET/log" "$TARGET/data"
-cp -rv "$TARGET/config-templates/"* "$TARGET/config/"
-cp -rv "$TARGET/metadata-templates/"* "$TARGET/metadata/"
-rm -rf "$TARGET/.git"
-rm -rf "$TARGET/node_modules"
-rm "$TARGET/www/assets/js/stylesheet.js"*
-rm "$TARGET/.editorconfig"
-rm "$TARGET/.gitattributes"
-rm -r "$TARGET/.github"
-rm "$TARGET"/phpunit.xml
-rm "$TARGET"/{cache,config,metadata,locales}/.gitkeep
-rm "$TARGET/composer.phar"
-rm "$TARGET/bin/build-release.sh"
-tar --owner 0 --group 0 -cvzf "$TARGET.tar.gz" "$TARGET"
-rm -rf "$TARGET"
 
-echo "Created: /tmp/$TARGET.tar.gz"
+php "$COMPOSER" archive -f tar.gz --dir /tmp --file "$TARGET"
+rm "$COMPOSER"
+echo `shasum -a 256 /tmp/$TARGET.tar.gz`
diff --git a/bin/get-translatable-strings b/bin/get-translatable-strings
@@ -19,7 +19,7 @@ use SimpleSAML\Utils;
 use Symfony\Component\Filesystem\Filesystem;
 
 // This is the base directory of the SimpleSAMLphp installation
-$baseDir = dirname(dirname(__FILE__));
+$baseDir = dirname(__FILE__, 2);
 
 // Add library autoloader
 require_once($baseDir . '/src/_autoload.php');

diff --git a/bin/importPdoMetadata.php b/bin/importPdoMetadata.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 
-$baseDir = dirname(dirname(__FILE__));
+$baseDir = dirname(__FILE__, 2);
 
 require_once $baseDir . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . '_autoload.php';
 require_once \SimpleSAML\Utils\Config::getConfigDir() . DIRECTORY_SEPARATOR . 'config.php';

diff --git a/bin/initMDSPdo.php b/bin/initMDSPdo.php
@@ -2,7 +2,7 @@
 <?php
 
 // This is the base directory of the SimpleSAMLphp installation
-$baseDir = dirname(dirname(__FILE__));
+$baseDir = dirname(__FILE__, 2);
 
 // Add library autoloader and configuration
 require_once $baseDir . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR . '_autoload.php';

diff --git a/bin/memcacheSync.php b/bin/memcacheSync.php
@@ -18,7 +18,7 @@
 }
 
 // This is the base directory of the SimpleSAMLphp installation
-$baseDir = dirname(dirname(__FILE__));
+$baseDir = dirname(__FILE__, 2);
 
 // Add library autoloader
 require_once($baseDir . '/src/_autoload.php');

diff --git a/bin/pwgen.php b/bin/pwgen.php
@@ -7,7 +7,7 @@
  */
 
 // This is the base directory of the SimpleSAMLphp installation
-$baseDir = dirname(dirname(__FILE__));
+$baseDir = dirname(__FILE__, 2);
 
 // Add library autoloader
 require_once($baseDir . '/src/_autoload.php');

diff --git a/cache/.gitkeep → cert/.gitkeep b/cache/.gitkeep → cert/.gitkeep