Merge branch '2'

bringyourownideas · Nov 10, 2021 · ba8bae9 · ba8bae9
2 parents cc0131d + fd5bab3
commit ba8bae9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 57 deletions.
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();