Cleanup

- Remove unused classes/services
- Use `::class` constant whenever possible
- Remove debug statements

config/autoload/global.php

@@ -119,7 +119,6 @@
         'factories' => [
             'http'                            => 'Mwop\Factory\HttpClient',
             'mail.transport'                  => 'Mwop\Factory\MailTransport',
-            'renderer'                        => 'Mwop\Factory\Renderer',
             'session'                         => 'Mwop\Factory\Session',
             'Mwop\Auth\AuthCallback'          => 'Mwop\Auth\AuthCallbackFactory',
             'Mwop\Auth\Auth'                  => 'Mwop\Auth\AuthFactory',
@@ -145,7 +144,6 @@
             'Mwop\Job\Middleware'             => 'Mwop\Job\MiddlewareFactory',
             'Mwop\ResumePage'                 => 'Mwop\Factory\PageFactory',
             'Mwop\Site'                       => 'Zend\Expressive\Container\ApplicationFactory',
-            'Mwop\Templated'                  => 'Mwop\Factory\Templated',
             'Mwop\Template\TemplateInterface' => 'Mwop\Template\MustacheTemplateFactory',
             'Mwop\Unauthorized'               => 'Mwop\Factory\Unauthorized',
         ],

src/Blog/MiddlewareFactory.php

@@ -9,37 +9,37 @@ public function __invoke($services)
     {
         $blog = AppFactory::create($services);
 
-        $blog->get('/tag/php.xml', 'Mwop\Blog\FeedMiddleware')
+        $blog->get('/tag/php.xml', FeedMiddleware::class)
             ->setOptions([
                 'values' => [
                     'tag'  => 'php',
                     'type' => 'rss',
                 ],
             ]);
 
-        $blog->get('/tag/{tag}/{type}.xml', 'Mwop\Blog\FeedMiddleware')
+        $blog->get('/tag/{tag}/{type}.xml', FeedMiddleware::class)
             ->setOptions([
                 'tokens' => [
                     'tag'  => '[^/]+',
                     'type' => '(atom|rss)',
                 ],
             ]);
 
-        $blog->get('/tag/{tag}', 'Mwop\Blog\ListPostsMiddleware')
+        $blog->get('/tag/{tag}', ListPostsMiddleware::class)
             ->setOptions([
                 'tokens' => [
                     'tag'  => '[^/]+',
                 ],
             ]);
 
-        $blog->get('/{type}.xml', 'Mwop\Blog\FeedMiddleware')
+        $blog->get('/{type}.xml', FeedMiddleware::class)
             ->setOptions([
                 'tokens' => [
                     'type'  => '(atom|rss)',
                 ],
             ]);
 
-        $blog->get('/{id}.html', 'Mwop\Blog\DisplayPostMiddleware')
+        $blog->get('/{id}.html', DisplayPostMiddleware::class)
             ->setOptions([
                 'tokens' => [
                     'id'  => '[^/]',
@@ -54,7 +54,7 @@ public function __invoke($services)
                 return $next($req, $res, $next, 405);
             }
 
-            $middleware = $services->get('Mwop\Blog\ListPostsMiddleware');
+            $middleware = $services->get(ListPostsMiddleware::class);
             return $middleware($req, $res, $next);
         });
 

src/ComicsPage.php

@@ -5,13 +5,10 @@ class ComicsPage extends Page
 {
     public function __invoke($request, $response, $next)
     {
-        error_log(sprintf("In %s", __CLASS__));
         if (! $request->getAttribute('user', false)) {
-            error_log('No user present; calling next with error');
             return $next($request, $response->withStatus(401), 401);
         }
 
-        error_log('User found; returning page');
         return parent::__invoke($request, $response, $next);
     }
 }

src/Contact/MiddlewareFactory.php

@@ -7,13 +7,12 @@ class MiddlewareFactory
 {
     public function __invoke($services)
     {
-        error_log(sprintf("In %s", __CLASS__));
         $contact = AppFactory::create($services);
 
-        $contact->get('', 'Mwop\Contact\LandingPage');
-        $contact->get('/', 'Mwop\Contact\LandingPage');
-        $contact->post('/process', 'Mwop\Contact\Process');
-        $contact->get('/thank-you', 'Mwop\Contact\ThankYouPage');
+        $contact->get('', LandingPage::class);
+        $contact->get('/', LandingPage::class);
+        $contact->post('/process', Process::class);
+        $contact->get('/thank-you', ThankYouPage::class);
 
         return $contact;
     }