Fix bugs with creating new items and updating pages

djmarland · Jan 2, 2021 · 948bf69 · 948bf69
1 parent 920aca7
commit 948bf69
Show file tree

Hide file tree

Showing 15 changed files with 134 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -36,7 +36,7 @@ RUN docker-php-ext-configure opcache \
     && docker-php-ext-configure zip \
     && docker-php-ext-configure xml \
     && docker-php-ext-configure intl \
-    && docker-php-source delete \\
+    && docker-php-source delete \
     && docker-php-ext-install \
     opcache \
     calendar \

diff --git a/app/composer.json b/app/composer.json
@@ -25,7 +25,9 @@
         "phpunit/phpunit": "^7.0",
         "roave/security-advisories": "dev-master",
         "squizlabs/php_codesniffer": "^3.2",
-        "symfony/debug": "^4.0"
+        "symfony/debug": "^4.0",
+        "symfony/stopwatch": "^4.4",
+        "symfony/web-profiler-bundle": "^4.4"
     },
     "config": {
         "preferred-install": {

diff --git a/app/composer.lock b/app/composer.lock
diff --git a/app/config/bundles.php b/app/config/bundles.php
@@ -2,6 +2,7 @@
 
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],

diff --git a/app/config/packages/dev/web_profiler.yaml b/app/config/packages/dev/web_profiler.yaml
@@ -0,0 +1,6 @@
+web_profiler:
+    toolbar: true
+    intercept_redirects: false
+
+framework:
+    profiler: { only_exceptions: false }
diff --git a/app/config/packages/test/web_profiler.yaml b/app/config/packages/test/web_profiler.yaml
@@ -0,0 +1,6 @@
+web_profiler:
+    toolbar: false
+    intercept_redirects: false
+
+framework:
+    profiler: { collect: false }
diff --git a/app/config/routes/dev/web_profiler.yaml b/app/config/routes/dev/web_profiler.yaml
@@ -0,0 +1,7 @@
+web_profiler_wdt:
+    resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
+    prefix: /_wdt
+
+web_profiler_profiler:
+    resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
+    prefix: /_profiler
diff --git a/app/src/Controller/Admin/PageAction.php b/app/src/Controller/Admin/PageAction.php
@@ -3,6 +3,7 @@
 
 namespace App\Controller\Admin;
 
+use App\Controller\Home\HomeAction;
 use App\Controller\Page\OutsideBroadcastsAction;
 use App\Controller\Page\PeopleAction;
 use App\Controller\Page\RequestsAction;
@@ -22,7 +23,7 @@
 class PageAction extends AbstractAdminController
 {
     private const RESERVED_URLS = [
-        \App\Controller\Home\HomeAction::SPECIAL_PAGE_URL => 'Home',
+        HomeAction::SPECIAL_PAGE_URL => 'Home',
         AbstractSchedulesAction::SPECIAL_PAGE_URL => 'Programme Listings',
         RequestsAction::SPECIAL_PAGE_URL => 'Requests',
         SportsAction::SPECIAL_PAGE_URL => 'Sports',

diff --git a/app/src/Controller/Admin/PagesAction.php b/app/src/Controller/Admin/PagesAction.php
@@ -34,7 +34,7 @@ public function __invoke(
             } elseif ($request->get('new-page-title')) {
                 $title = $request->get('new-page-title');
                 $pageId = $pageService->newPage($title);
-                return $this->redirect('/admin/pages/' . $pageId);
+                return $this->redirect('/admin/pages/' . $pageId->toString());
             } elseif ($request->get('new-category-title')) {
                 $title = $request->get('new-category-title');
                 $pageService->newPageCategory($title);

diff --git a/app/src/Controller/Admin/PeopleAction.php b/app/src/Controller/Admin/PeopleAction.php
@@ -26,7 +26,7 @@ public function __invoke(
             if ($request->get('new-person-name')) {
                 $name = $request->get('new-person-name');
                 $personId = $peopleService->newPerson($name);
-                return $this->redirect('/admin/people/' . $personId);
+                return $this->redirect('/admin/people/' . $personId->toString());
             }
 
             if ($request->get('delete-person')) {

diff --git a/app/src/Controller/Admin/ShowsAction.php b/app/src/Controller/Admin/ShowsAction.php
@@ -27,7 +27,7 @@ public function __invoke(
             if ($request->get('new-show-name')) {
                 $name = $request->get('new-show-name');
                 $showId = $programmesService->newProgramme($name);
-                return $this->redirect('/admin/shows/' . $showId);
+                return $this->redirect('/admin/shows/' . $showId->toString());
             }
 
             if ($request->get('delete-show')) {

diff --git a/app/src/Service/PageService.php b/app/src/Service/PageService.php
@@ -125,7 +125,7 @@ public function updatePage(
         $entity->title = $title;
         $entity->urlPath = $url;
         $entity->htmlContent = $htmlContent;
-        $entity->order = $navPosition;
+        $entity->order = $navPosition ?? 0;
         $entity->category = $category;
 
         $this->entityManager->persist($entity);
@@ -140,7 +140,7 @@ public function findAllUncategorised()
         );
     }
 
-    public function newPage(string $title)
+    public function newPage(string $title): UuidInterface
     {
         $url = str_replace(' ', '-', strtolower($title));
         $url = preg_replace('/[^a-z0-9-]/s', '', $url);
@@ -155,6 +155,6 @@ public function newPage(string $title)
         $this->entityManager->persist($page);
         $this->entityManager->flush();
 
-        return $page->pkid;
+        return $page->id;
     }
 }
diff --git a/app/src/Service/PeopleService.php b/app/src/Service/PeopleService.php
@@ -54,14 +54,14 @@ public function findForProgramme(Programme $programme): array
         );
     }
 
-    public function newPerson(string $name): int
+    public function newPerson(string $name): UuidInterface
     {
         $page = new DbPerson($name);
 
         $this->entityManager->persist($page);
         $this->entityManager->flush();
 
-        return $page->pkid;
+        return $page->id;
     }
 
     public function deletePerson(UuidInterface $programmeId): void

diff --git a/app/src/Service/ProgrammesService.php b/app/src/Service/ProgrammesService.php
@@ -86,7 +86,7 @@ public function getAllByPeople(?Programme $exclude = null): array
         return $groupedResults;
     }
 
-    public function newProgramme(string $name, int $type = Programme::PROGRAMME_TYPE_REGULAR): int
+    public function newProgramme(string $name, int $type = Programme::PROGRAMME_TYPE_REGULAR): UuidInterface
     {
         $page = new DbProgramme(
             $name,
@@ -96,7 +96,7 @@ public function newProgramme(string $name, int $type = Programme::PROGRAMME_TYPE
         $this->entityManager->persist($page);
         $this->entityManager->flush();
 
-        return $page->pkid;
+        return $page->id;
     }
 
     public function deleteProgramme(UuidInterface $programmeId): void

diff --git a/app/symfony.lock b/app/symfony.lock
@@ -134,6 +134,9 @@
     "phar-io/version": {
         "version": "1.0.1"
     },
+    "php": {
+        "version": "7.1"
+    },
     "phpdocumentor/reflection-common": {
         "version": "1.0.1"
     },
@@ -368,6 +371,9 @@
     "symfony/polyfill-php80": {
         "version": "v1.18.1"
     },
+    "symfony/profiler-pack": {
+        "version": "v1.0.5"
+    },
     "symfony/property-access": {
         "version": "v4.1.0"
     },
@@ -437,6 +443,20 @@
     "symfony/var-exporter": {
         "version": "v4.4.4"
     },
+    "symfony/web-profiler-bundle": {
+        "version": "3.3",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "master",
+            "version": "3.3",
+            "ref": "6bdfa1a95f6b2e677ab985cd1af2eae35d62e0f6"
+        },
+        "files": [
+            "config/packages/dev/web_profiler.yaml",
+            "config/packages/test/web_profiler.yaml",
+            "config/routes/dev/web_profiler.yaml"
+        ]
+    },
     "symfony/yaml": {
         "version": "v4.0.8"
     },