From 2a4247684d9906a356302eccb8ae67ecb575412c Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Fri, 2 Aug 2024 18:35:36 +0100
Subject: [PATCH] Group talk classes into a `modules` directory

---
 app/config/sculpin_kernel.yml                          |  2 +-
 composer.json                                          |  6 +-----
 .../Talk/Tests/TwigExtension/TalkTwigExtensionTest.php | 10 +++++-----
 .../Talk/TwigExtension/TalkTwigExtension.php           |  4 ++--
 phpunit.xml.dist                                       |  4 ++--
 5 files changed, 11 insertions(+), 15 deletions(-)
 rename tests/Opdavies/TwigExtension/OpdaviesTwigExtensionTest.php => modules/Talk/Tests/TwigExtension/TalkTwigExtensionTest.php (94%)
 rename src/Opdavies/TwigExtension/OpdaviesTwigExtension.php => modules/Talk/TwigExtension/TalkTwigExtension.php (92%)

diff --git a/app/config/sculpin_kernel.yml b/app/config/sculpin_kernel.yml
index 66e62640..ac9664c2 100644
--- a/app/config/sculpin_kernel.yml
+++ b/app/config/sculpin_kernel.yml
@@ -12,6 +12,6 @@ sculpin_content_types:
     permalink: /talks/:basename/
 
 services:
-  App\Opdavies\TwigExtension\OpdaviesTwigExtension:
+  Modules\Talk\TwigExtension\TalkTwigExtension:
     tags:
       - {name: twig.extension}
diff --git a/composer.json b/composer.json
index 6e87e2fa..5397a438 100644
--- a/composer.json
+++ b/composer.json
@@ -11,11 +11,7 @@
     },
     "autoload": {
         "psr-4": {
-            "App\\": "src" }
-   },
-   "autoload-dev": {
-        "psr-4": {
-            "App\\Tests\\": "tests" }
+            "Modules\\": "modules/" }
    },
     "require-dev": {
         "phpunit/phpunit": "^11.1"
diff --git a/tests/Opdavies/TwigExtension/OpdaviesTwigExtensionTest.php b/modules/Talk/Tests/TwigExtension/TalkTwigExtensionTest.php
similarity index 94%
rename from tests/Opdavies/TwigExtension/OpdaviesTwigExtensionTest.php
rename to modules/Talk/Tests/TwigExtension/TalkTwigExtensionTest.php
index ebd03d46..3c8c0e25 100644
--- a/tests/Opdavies/TwigExtension/OpdaviesTwigExtensionTest.php
+++ b/modules/Talk/Tests/TwigExtension/TalkTwigExtensionTest.php
@@ -1,19 +1,19 @@
 <?php
 
-namespace App\Tests\Opdavies\TwigExtension;
+namespace Modules\Talk\Tests\TwigExtension;
 
-use App\Opdavies\TwigExtension\OpdaviesTwigExtension;
 use Dflydev\DotAccessConfiguration\Configuration;
+use Modules\Talk\TwigExtension\TalkTwigExtension;
 use PHPUnit\Framework\TestCase;
 use Sculpin\Contrib\ProxySourceCollection\ProxySourceItem;
 
-class OpdaviesTwigExtensionTest extends TestCase
+class TalkTwigExtensionTest extends TestCase
 {
-    private OpdaviesTwigExtension $extension;
+    private TalkTwigExtension $extension;
 
     public function setUp(): void
     {
-        $this->extension = new OpdaviesTwigExtension();
+        $this->extension = new TalkTwigExtension();
     }
 
     public function testNoPastEvents(): void
diff --git a/src/Opdavies/TwigExtension/OpdaviesTwigExtension.php b/modules/Talk/TwigExtension/TalkTwigExtension.php
similarity index 92%
rename from src/Opdavies/TwigExtension/OpdaviesTwigExtension.php
rename to modules/Talk/TwigExtension/TalkTwigExtension.php
index 6d664998..726cd89c 100644
--- a/src/Opdavies/TwigExtension/OpdaviesTwigExtension.php
+++ b/modules/Talk/TwigExtension/TalkTwigExtension.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Opdavies\TwigExtension;
+namespace Modules\Talk\TwigExtension;
 
 use Sculpin\Contrib\ProxySourceCollection\ProxySourceItem;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
 
-class OpdaviesTwigExtension extends AbstractExtension
+class TalkTwigExtension extends AbstractExtension
 {
     public function getFunctions(): array
     {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index eecbdc3c..e23be814 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="./vendor/autoload.php" colors="true" stopOnFailure="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.1/phpunit.xsd" cacheDirectory=".phpunit.cache">
   <testsuites>
-    <testsuite name="unit tests">
-      <directory suffix="Test.php">tests</directory>
+    <testsuite name="Modules">
+      <directory suffix="Test.php">modules</directory>
     </testsuite>
   </testsuites>
 </phpunit>