Merge branch '3.2' into 3

silverstripe · Apr 15, 2024 · a282a92 · a282a92
2 parents 9b3845b + 7330df9
commit a282a92
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+/tests            export-ignore
+/client/src       export-ignore
+/.gitattributes   export-ignore
+/.gitignore       export-ignore
+/.github          export-ignore
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 vendor
 composer.lock
+.phpunit.result.cache
diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
     },
     "autoload": {
         "psr-4": {
-            "SilverStripe\\Forms\\": "code/",
+            "SilverStripe\\Forms\\": "src/",
             "SilverStripe\\Forms\\Tests\\": "tests/"
         }
     },

diff --git a/tests/SegmentFieldModifier/IDSegmentFieldModifierTest.php b/tests/SegmentFieldModifier/IDSegmentFieldModifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Forms\Tests;
+namespace SilverStripe\Forms\Tests\SegmentFieldModifier;
 
 use stdClass;
 use SilverStripe\Dev\SapphireTest;

diff --git a/tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php b/tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SilverStripe\Forms\Tests;
+namespace SilverStripe\Forms\Tests\SegmentFieldModifier;
 
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Dev\SapphireTest;

diff --git a/tests/SegmentFieldTest.php b/tests/SegmentFieldTest.php
@@ -6,7 +6,6 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\SegmentField;
-use SilverStripe\Forms\SegmentFieldModifier\AbstractSegmentFieldModifier;
 
 class SegmentFieldTest extends SapphireTest
 {