Skip to content

Commit ad96417

Browse files
tvdijentvdijen
authored
Import assets from assets-module (#1750)
* Move www > public * Remove local assets * Import remotely generated assets * Update files to reflect www > public move * Update upgrade notes * Make assets-filter aware of new assets-location * Update test-framework * Exclude generated assets from code sniffer
1 parent 9c79567 commit ad96417

Some content is hidden

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

51 files changed

+543
-5235
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
/cert/.gitkeep export-ignore
2-
/www/assets/css/.gitkeep export-ignore
3-
/www/assets/fonts/.gitkeep export-ignore
4-
/www/assets/js/.gitkeep export-ignore
2+
/public/assets/.gitkeep export-ignore
53
/tests export-ignore
64
codecov.yml export-ignore
75
.editorconfig export-ignore

‎.gitignore‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,10 @@ metadata/*
44
!/cert/*.gitkeep
55
!/config/*.dist
66
!/metadata/*.dist
7-
/www/assets/fonts/*
8-
/www/assets/js/*.js
9-
/www/assets/js/*.js.LICENSE.txt
10-
!/www/assets/js/post.js
11-
/www/assets/js/*.map
12-
/www/assets/css/*.css
13-
/www/assets/css/*.css.LICENSE.txt
14-
!/www/assets/css/post.css
15-
/www/assets/css/*.map
7+
!/public/assets/.gitkeep
8+
/public/assets/*
169
.phpunit.result.cache
1710

18-
!/www/assets/fonts/.gitkeep
19-
!/www/assets/js/.gitkeep
20-
!/www/assets/css/.gitkeep
21-
22-
2311
# https://www.gitignore.io/api/osx,windows,linux,netbeans,sublimetext,composer,phpstorm,vagrant
2412
# Created by https://www.gitignore.io
2513

‎.php_cs.dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?php
22

33
$finder = PhpCsFixer\Finder::create()
4-
->exclude(__DIR__ . '/www/resources')
4+
->exclude(__DIR__ . '/public/assets')
55
->in([
66
__DIR__ . '/modules',
7+
__DIR__ . '/public',
78
__DIR__ . '/src',
89
__DIR__ . '/templates',
910
__DIR__ . '/tests',
10-
__DIR__ . '/www',
1111
])
1212
;
1313

‎composer.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
"phpmailer/phpmailer": "^6.5",
6363
"simplesamlphp/assert": "^0.8.0",
6464
"simplesamlphp/saml2": "^4.6",
65+
"simplesamlphp/simplesamlphp-assets-base": "^2.0.0",
6566
"symfony/cache": "^5.4||^6",
6667
"symfony/config": "^5.4||^6",
6768
"symfony/console": "^5.4||^6",
@@ -86,7 +87,7 @@
8687

8788
"mikey179/vfsstream": "~1.6",
8889
"simplesamlphp/simplesamlphp-module-adfs": "dev-master",
89-
"simplesamlphp/simplesamlphp-test-framework": "^1.2.1",
90+
"simplesamlphp/simplesamlphp-test-framework": "^1.3.2",
9091
"simplesamlphp/xml-security": "^0.6.5"
9192
},
9293
"suggest": {
@@ -125,10 +126,8 @@
125126
"phpunit.xml",
126127
"phpunit-interoperability.xml",
127128
"psalm.xml",
128-
"tests",
129-
"www/assets/css/.gitkeep",
130-
"www/assets/fonts/.gitkeep",
131-
"www/assets/js/.gitkeep"
129+
"public/assets/.gitkeep",
130+
"tests"
132131
]
133132
}
134133
}

0 commit comments

Comments
 (0)