Skip to content

Commit 41d9254

Browse files
tvdijentvdijen
committed
Generic improvements
1 parent 343be6e commit 41d9254

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+1460
-593
lines changed

‎.github/workflows/php.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
run: composer-require-checker check --config-file tools/composer-require-checker.json composer.json
8080

8181
- name: Check code for unused dependencies in composer.json
82-
run: composer-unused --excludePackage=simplesamlphp/simplesamlphp-assets-base
82+
run: composer-unused --excludePackage=simplesamlphp/simplesamlphp-assets-base --excludePackage=composer/composer
8383

8484
- name: PHP Code Sniffer
8585
run: phpcs

‎bin/convertTranslations.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ function codifyWithSource(array $sourcePairs, array $destPairs): array
4141
function dissectFile(array $fileInputRaw): array
4242
{
4343
$pairs = [];
44-
// create an array with MSGID => MSGSTR
44+
// create an array with MSGID => MSGSTR
4545
foreach ($fileInputRaw as $rowIndex => $oneLine) {
4646
if (preg_match("/^msgid/", $oneLine)) {
4747
$msgId = $oneLine;

‎composer.json‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,37 +58,39 @@
5858
"ext-pcre": "*",
5959
"ext-session": "*",
6060
"ext-simplexml": "*",
61-
"ext-spl": "*",
61+
"ext-SPL": "*",
6262
"ext-xml": "*",
63+
"ext-zlib": "*",
6364

64-
"gettext/gettext": "^5.6.1",
65-
"gettext/translator": "^1.0.1",
66-
"phpmailer/phpmailer": "^6.5",
67-
"psr/log": "^2.0 || ^3.0",
65+
"composer/composer": "^2.5",
66+
"gettext/gettext": "^5.7",
67+
"gettext/translator": "^1.1",
68+
"phpmailer/phpmailer": "^6.8",
69+
"psr/log": "^3.0",
6870
"robrichards/xmlseclibs": "^3.1.1",
6971
"simplesamlphp/assert": "^1.0.0",
7072
"simplesamlphp/saml2": "^v5.0.0@dev",
7173
"simplesamlphp/simplesamlphp-assets-base": "^2.0.0",
7274
"simplesamlphp/simplesamlphp-module-adfs": "dev-release-2.1@dev",
73-
"symfony/cache": "^5.4||^6",
74-
"symfony/config": "^5.4||^6",
75-
"symfony/console": "^5.4||^6",
76-
"symfony/dependency-injection": "^5.4||^6",
77-
"symfony/filesystem": "^5.4||^6",
78-
"symfony/finder": "^5.4||^6",
79-
"symfony/framework-bundle": "^5.4||^6",
80-
"symfony/http-foundation": "^5.4||^6",
81-
"symfony/http-kernel": "^5.4||^6",
82-
"symfony/intl": "^5.4||^6",
83-
"symfony/psr-http-message-bridge": "^2.1",
84-
"symfony/routing": "^5.4||^6",
85-
"symfony/translation-contracts": "^2.5||^3",
86-
"symfony/twig-bridge": "^5.4||^6",
87-
"symfony/var-exporter": "^5.4||^6",
88-
"symfony/yaml": "^5.4||^6",
75+
"simplesamlphp/xml-common": "^1.12",
76+
"symfony/cache": "^6.0",
77+
"symfony/config": "^6.0",
78+
"symfony/console": "^6.0",
79+
"symfony/dependency-injection": "^6.0",
80+
"symfony/filesystem": "^6.0",
81+
"symfony/finder": "^6.0",
82+
"symfony/framework-bundle": "^6.0",
83+
"symfony/http-foundation": "^6.0",
84+
"symfony/http-kernel": "^6.0",
85+
"symfony/intl": "^6.0",
86+
"symfony/psr-http-message-bridge": "^2.3",
87+
"symfony/routing": "^6.0",
88+
"symfony/translation-contracts": "^3.0",
89+
"symfony/twig-bridge": "^6.0",
90+
"symfony/var-exporter": "^6.0",
91+
"symfony/yaml": "^6.0",
8992
"twig/intl-extra": "^3.3",
90-
"twig/twig": "^3.3.8",
91-
"simplesamlphp/xml-common": "^1.12"
93+
"twig/twig": "^3.3.8"
9294
},
9395
"require-dev": {
9496
"mikey179/vfsstream": "~1.6",

0 commit comments

Comments
 (0)