Merge branch '2'

emteknetnz · emteknetnz · commit ba8bae91c031 · 2021-11-10T16:31:51.000+13:00
diff --git a/.travis.yml b/.travis.yml
diff --git a/composer.json b/composer.json
@@ -32,12 +32,13 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
+        "php": "^7.3 || ^8.0",
         "composer/composer": "^1",
-        "silverstripe/framework": "^4",
+        "silverstripe/framework": "^4.10",
         "bringyourownideas/silverstripe-maintenance": "^2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^5.7",
+        "phpunit/phpunit": "^9.5",
         "squizlabs/php_codesniffer": "^3"
     },
     "autoload": {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
@@ -2,6 +2,9 @@
 <ruleset name="SilverStripe">
     <description>CodeSniffer ruleset for SilverStripe coding conventions.</description>
 
+    <file>src</file>
+    <file>tests</file>
+
     <!-- base rules are PSR-2 -->
     <rule ref="PSR2" >
         <!-- Current exclusions -->
diff --git a/tests/Extensions/CheckComposerUpdatesExtensionTest.php b/tests/Extensions/CheckComposerUpdatesExtensionTest.php
@@ -30,7 +30,7 @@ class CheckComposerUpdatesExtensionTest extends SapphireTest
      */
     protected $allowedTypes;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 
diff --git a/tests/UpdateCheckerTest.php b/tests/UpdateCheckerTest.php
@@ -21,7 +21,7 @@ class UpdateCheckerTest extends SapphireTest
      */
     protected $updateChecker;
 
-    protected function setUp()
+    protected function setUp(): void
     {
         parent::setUp();
 

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class CheckComposerUpdatesExtensionTest extends SapphireTest`
`30`	`30`	`*/`
`31`	`31`	`protected $allowedTypes;`
`32`	`32`
`33`		`- protected function setUp()`
	`33`	`+ protected function setUp(): void`
`34`	`34`	`{`
`35`	`35`	`parent::setUp();`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class UpdateCheckerTest extends SapphireTest`
`21`	`21`	`*/`
`22`	`22`	`protected $updateChecker;`
`23`	`23`
`24`		`- protected function setUp()`
	`24`	`+ protected function setUp(): void`
`25`	`25`	`{`
`26`	`26`	`parent::setUp();`
`27`	`27`