From f6bf82a15e9d64a47b8d72159e2beee0f37ff5a7 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Wed, 16 Jan 2019 21:52:54 +0000
Subject: [PATCH] Rename FormatTalksBundle to TalksBundle

---
 app/SculpinKernel.php                              |  3 ++-
 composer.json                                      |  3 +--
 src/FormatTalksBundle/SculpinFormatTalksBundle.php |  9 ---------
 .../DependencyInjection/SculpinTalksExtension.php} |  4 ++--
 .../Resources/config/services.yml                  |  2 +-
 src/TalksBundle/SculpinTalksBundle.php             |  9 +++++++++
 .../TwigExtension/TalksExtension.php}              |  6 +++---
 .../composer.json                                  |  0
 .../TwigExtension/FormatTalksTest.php              | 14 +++++++-------
 9 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 src/FormatTalksBundle/SculpinFormatTalksBundle.php
 rename src/{FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php => TalksBundle/DependencyInjection/SculpinTalksExtension.php} (83%)
 rename src/{FormatTalksBundle => TalksBundle}/Resources/config/services.yml (55%)
 create mode 100644 src/TalksBundle/SculpinTalksBundle.php
 rename src/{FormatTalksBundle/TwigExtension/FormatTalksExtension.php => TalksBundle/TwigExtension/TalksExtension.php} (96%)
 rename src/{FormatTalksBundle => TalksBundle}/composer.json (100%)
 rename tests/{FormatTalksBundle => TalksBundle}/TwigExtension/FormatTalksTest.php (93%)

diff --git a/app/SculpinKernel.php b/app/SculpinKernel.php
index a5077eec..10b2c12e 100644
--- a/app/SculpinKernel.php
+++ b/app/SculpinKernel.php
@@ -5,6 +5,7 @@ use Opdavies\Sculpin\Bundle\ContentGeneratorBundle\SculpinContentGeneratorBundle
 use Opdavies\Sculpin\Bundle\GistEmbedBundle\SculpinGistEmbedBundle;
 use Opdavies\Sculpin\Bundle\TwigMarkdownBundle\SculpinTwigMarkdownBundle;
 use Sculpin\Bundle\SculpinBundle\HttpKernel\AbstractKernel;
+use TalksBundle\SculpinTalksBundle;
 use WebsiteBundle\SculpinWebsiteBundle;
 
 class SculpinKernel extends AbstractKernel
@@ -19,7 +20,7 @@ class SculpinKernel extends AbstractKernel
             SculpinGistEmbedBundle::class,
             SculpinTwigMarkdownBundle::class,
 
-            SculpinFormatTalksBundle::class,
+            SculpinTalksBundle::class,
         ];
     }
 }
diff --git a/composer.json b/composer.json
index 2b39bec7..34054051 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,7 @@
     },
     "autoload": {
         "psr-4": {
-            "FormatTalksBundle\\": "src/FormatTalksBundle",
-            "WebsiteBundle\\": "src/WebsiteBundle"
+            "TalksBundle\\": "src/TalksBundle"
         }
     },
     "autoload-dev": {
diff --git a/src/FormatTalksBundle/SculpinFormatTalksBundle.php b/src/FormatTalksBundle/SculpinFormatTalksBundle.php
deleted file mode 100644
index 6e5071b7..00000000
--- a/src/FormatTalksBundle/SculpinFormatTalksBundle.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace FormatTalksBundle;
-
-use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-class SculpinFormatTalksBundle extends Bundle
-{
-}
diff --git a/src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php b/src/TalksBundle/DependencyInjection/SculpinTalksExtension.php
similarity index 83%
rename from src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php
rename to src/TalksBundle/DependencyInjection/SculpinTalksExtension.php
index a992f0f3..39d2bb8d 100644
--- a/src/FormatTalksBundle/DependencyInjection/SculpinFormatTalksExtension.php
+++ b/src/TalksBundle/DependencyInjection/SculpinTalksExtension.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace FormatTalksBundle\DependencyInjection;
+namespace TalksBundle\DependencyInjection;
 
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
 use Symfony\Component\Config\FileLocator;
 
-class SculpinFormatTalksExtension extends Extension
+class SculpinTalksExtension extends Extension
 {
     /**
      * {@inheritdoc}
diff --git a/src/FormatTalksBundle/Resources/config/services.yml b/src/TalksBundle/Resources/config/services.yml
similarity index 55%
rename from src/FormatTalksBundle/Resources/config/services.yml
rename to src/TalksBundle/Resources/config/services.yml
index 8ed1edab..426e5f86 100644
--- a/src/FormatTalksBundle/Resources/config/services.yml
+++ b/src/TalksBundle/Resources/config/services.yml
@@ -1,5 +1,5 @@
 services:
     twig.format_talks:
-        class: 'FormatTalksBundle\TwigExtension\FormatTalksExtension'
+        class: 'TalksBundle\TwigExtension\TalksExtension'
         tags:
             - { name: twig.extension }
diff --git a/src/TalksBundle/SculpinTalksBundle.php b/src/TalksBundle/SculpinTalksBundle.php
new file mode 100644
index 00000000..16eb8f32
--- /dev/null
+++ b/src/TalksBundle/SculpinTalksBundle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace TalksBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class SculpinTalksBundle extends Bundle
+{
+}
diff --git a/src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php b/src/TalksBundle/TwigExtension/TalksExtension.php
similarity index 96%
rename from src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php
rename to src/TalksBundle/TwigExtension/TalksExtension.php
index 7390baee..b50f0e3e 100644
--- a/src/FormatTalksBundle/TwigExtension/FormatTalksExtension.php
+++ b/src/TalksBundle/TwigExtension/TalksExtension.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace FormatTalksBundle\TwigExtension;
+namespace TalksBundle\TwigExtension;
 
 use Illuminate\Support\Collection;
 use Sculpin\Contrib\ProxySourceCollection\ProxySourceCollection;
 use Twig_Extension;
 use Twig_SimpleFunction;
 
-class FormatTalksExtension extends Twig_Extension
+class TalksExtension extends Twig_Extension
 {
     /**
      * @var string The current date.
@@ -112,6 +112,6 @@ class FormatTalksExtension extends Twig_Extension
      */
     public function getName()
     {
-        return 'format_talks';
+        return 'talks';
     }
 }
diff --git a/src/FormatTalksBundle/composer.json b/src/TalksBundle/composer.json
similarity index 100%
rename from src/FormatTalksBundle/composer.json
rename to src/TalksBundle/composer.json
diff --git a/tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php b/tests/TalksBundle/TwigExtension/FormatTalksTest.php
similarity index 93%
rename from tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php
rename to tests/TalksBundle/TwigExtension/FormatTalksTest.php
index be65a325..96fddb57 100644
--- a/tests/FormatTalksBundle/TwigExtension/FormatTalksTest.php
+++ b/tests/TalksBundle/TwigExtension/FormatTalksTest.php
@@ -3,14 +3,14 @@
 namespace Tests\FormatTalksBundle\TwigExtension;
 
 use DateTime;
-use FormatTalksBundle\TwigExtension\FormatTalksExtension;
+use TalksBundle\TwigExtension\TalksExtension;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\TestCase;
 
 class FormatTalksTest extends TestCase
 {
     /**
-     * @var FormatTalksExtension
+     * @var TalksExtension
      */
     private $extension;
 
@@ -19,11 +19,11 @@ class FormatTalksTest extends TestCase
      */
     public function setUp()
     {
-        $this->extension = new FormatTalksExtension();
+        $this->extension = new TalksExtension();
     }
 
     /**
-     * @covers FormatTalksExtension::format()
+     * @covers \TalksBundle\TwigExtension\TalksExtension::format()
      */
     public function testFormat()
     {
@@ -98,7 +98,7 @@ class FormatTalksTest extends TestCase
     }
 
     /**
-     * @covers FormatTalksExtension::getAll()
+     * @covers \TalksBundle\TwigExtension\TalksExtension::getAll()
      */
     public function testGetAll()
     {
@@ -123,7 +123,7 @@ class FormatTalksTest extends TestCase
     }
 
     /**
-     * @covers FormatTalksExtension::getUpcoming()
+     * @covers \TalksBundle\TwigExtension\TalksExtension::getUpcoming()
      */
     public function testGetUpcoming()
     {
@@ -150,7 +150,7 @@ class FormatTalksTest extends TestCase
     }
 
     /**
-     * @covers FormatTalksExtension::getPast()
+     * @covers \TalksBundle\TwigExtension\TalksExtension::getPast()
      */
     public function testGetPast()
     {