tonyair/silverstripe-installer
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-installer synced 2024-10-22 17:05:33 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.1' into 5

Browse Source
This commit is contained in:
Guy Sartorelli 2023-10-16 16:47:02 +13:00
commit e86725dc6e
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.json
View File

@ -4,11 +4,11 @@
"description": "The SilverStripe Framework Installer", "description": "The SilverStripe Framework Installer",
"require": { "require": {
"php": "^8.1", "php": "^8.1",
"silverstripe/recipe-plugin": "2.x-dev", "silverstripe/recipe-plugin": "2.0.x-dev",
"silverstripe/vendor-plugin": "2.x-dev", "silverstripe/vendor-plugin": "2.0.x-dev",
"silverstripe/recipe-cms": "5.x-dev", "silverstripe/recipe-cms": "5.1.x-dev",
"silverstripe-themes/simple": "~3.2.0", "silverstripe-themes/simple": "3.3.x-dev",
"silverstripe/login-forms": "5.x-dev" "silverstripe/login-forms": "5.1.x-dev"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.6" "phpunit/phpunit": "^9.6"

4
phpunit.xml.dist
View File

@ -29,9 +29,7 @@
<!-- Framework ORM tests are split up to run in parallel --> <!-- Framework ORM tests are split up to run in parallel -->
<testsuite name="framework-core"> <testsuite name="framework-core">
<directory>vendor/silverstripe/framework/tests/php</directory> <directory>vendor/silverstripe/framework/tests/php</directory>
<exclude> <exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
<directory>vendor/silverstripe/framework/tests/php/ORM</directory>
</exclude>
</testsuite> </testsuite>
<testsuite name="framework-orm"> <testsuite name="framework-orm">
<directory>vendor/silverstripe/framework/tests/php/ORM</directory> <directory>vendor/silverstripe/framework/tests/php/ORM</directory>

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 97 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB