🔧 rename src directory to Silverstripe

- the directory of the ruleset determines the name of the ruleset
silverstripeltd · Jan 17, 2024 · bf1ed9b · bf1ed9b
1 parent e371304
commit bf1ed9b
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/.../Extension/DisallowOwnerPropertySniff.php → .../Extension/DisallowOwnerPropertySniff.php b/.../Extension/DisallowOwnerPropertySniff.php → .../Extension/DisallowOwnerPropertySniff.php
diff --git a/src/ruleset.xml → Silverstripe/ruleset.xml b/src/ruleset.xml → Silverstripe/ruleset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Silverstripe Bespoke" xsi:noNamespaceSchemaLocation="../../../vendor/squizlabs/php_codesniffer/phpcs.xsd">
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Silverstripe" xsi:noNamespaceSchemaLocation="../../../vendor/squizlabs/php_codesniffer/phpcs.xsd">
     <description>Coding standards for SilverStripe based project</description>
 
     <!-- Don't sniff third party libraries -->

diff --git a/bespoke-phpcbf b/bespoke-phpcbf
@@ -12,7 +12,7 @@ $_SERVER['argv'][] = 'app'; // scan app folder
 if (file_exists(__DIR__ . '/../../../phpcs.xml')) {
     $_SERVER['argv'][] = '--standard=phpcs.xml';
 } else {
-    $_SERVER['argv'][] = '--standard=Silverstripe-Bespoke'; // rules
+    $_SERVER['argv'][] = '--standard=Silverstripe'; // rules
 }
 $_SERVER['argv'][] = '--extensions=php'; // only php files
 $_SERVER['argv'][] = '--encoding=utf-8';

diff --git a/bespoke-phpcs b/bespoke-phpcs
@@ -12,7 +12,7 @@ $_SERVER['argv'][] = 'app'; // scan app folder
 if (file_exists(__DIR__ . '/../../../phpcs.xml')) {
     $_SERVER['argv'][] = '--standard=phpcs.xml';
 } else {
-    $_SERVER['argv'][] = '--standard=Silverstripe-Bespoke'; // rules
+    $_SERVER['argv'][] = '--standard=Silverstripe'; // rules
 }
 $_SERVER['argv'][] = '--extensions=php'; // only php files
 $_SERVER['argv'][] = '--encoding=utf-8';

diff --git a/composer.json b/composer.json
@@ -34,7 +34,12 @@
     },
     "autoload": {
         "psr-4": {
-            "Silverstripe\\": "src/"
+            "Silverstripe\\": "Silverstripe/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Silverstripe\\": "tests/"
         }
     },
     "scripts": {

diff --git a/tests/Sniffs/Extension/DisallowOwnerPropertySniffTest.php b/tests/Sniffs/Extension/DisallowOwnerPropertySniffTest.php
@@ -1,6 +1,8 @@
 <?php
+
 namespace Silverstripe\Sniffs\Extension;
 
+use Silverstripe\Sniffs\Extension\DisallowOwnerPropertySniff;
 use SlevomatCodingStandard\Sniffs\TestCase;
 
 class DisallowOwnerPropertySniffTest extends TestCase
@@ -12,7 +14,7 @@ public function testNoErrors(): void
             [],
             [],
             [
-                '--standard=' . __DIR__ . '/../../../src/ruleset.xml'
+                '--standard=Silverstripe'
             ]
         );
         self::assertNoSniffErrorInFile($report);
@@ -25,7 +27,7 @@ public function testErrors(): void
             [],
             [],
             [
-                '--standard=' . __DIR__ . '/../../../src/ruleset.xml'
+                '--standard=Silverstripe'
             ]
         );
 

diff --git a/tests/Sniffs/Extension/data/DisallowOwnerPropertySniff_NoErrors.php b/tests/Sniffs/Extension/data/DisallowOwnerPropertySniff_NoErrors.php
@@ -3,7 +3,6 @@
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\Fake\Extension;
 
-
 class MyCoolExtension extends DataExtension
 {
     function doSomething()