Framework 2.0

.editorconfig

@@ -7,7 +7,7 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
 
-[*.{php,md,twig,html}]
+[*.{php,md}]
 indent_style = space
 indent_size = 4
 

.gitignore

@@ -14,8 +14,8 @@ public/wp/
 cache
 .cache
 .vagrant
-npm-debug.log
 __init__.py
+*.log
 
 # Credentials
 s3.json

Vagrantfile

@@ -10,7 +10,7 @@ Vagrant.configure("2") do |config|
   database = YAML.load_file("./config/secrets/database.yml")
 
   # Network
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/bionic64"
 
   # Do some network configuration
   config.vm.network "private_network", ip: project['stage']['dev']['ip']
@@ -20,8 +20,12 @@ Vagrant.configure("2") do |config|
 
   # VirtualBox config
   config.vm.provider :virtualbox do |v|
-	# Give our box enough memory
-	v.memory = 1024
+    # Give our box enough memory
+    v.memory = 1024
+
+    # Experimental fixes for slow VM network speeds
+    v.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
+    v.customize ["modifyvm", :id, "--natdnsproxy1", "on"]
 
     # Linked clone support
     v.linked_clone = true if Vagrant::VERSION =~ /^1.8/

app/assets/js/index.js

@@ -0,0 +1,2 @@
+import $ from 'jquery'
+import _ from 'lodash'

app/assets/sass/style.scss

@@ -1,5 +1,5 @@
 /**
  * Externals
  */
-@import "sanitize-css/lib/sanitize.scss";
-@import "breakpoint";
+@import "sanitize.css/sanitize.css";
+@import "breakpoint";

app/themes/base/composer.json → app/bootstrap/composer.json

@@ -1,6 +1,6 @@
 {
-  "name": "tomodomo/theme",
-  "description": "Base theme",
+  "name": "tomodomo/bootstrap",
+  "description": "The default Kaiso bootstrap",
   "type": "wordpress-theme",
   "license": "MIT",
   "authors": [
@@ -15,9 +15,10 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "extra": {
-    "installer-name": "base"
+    "installer-name": "bootstrap"
   },
   "require": {
-    "php": "^7.0"
+    "php": "^7.1",
+    "tomodomo/kaiso": "*@dev"
   }
 }

app/bootstrap/functions.php

@@ -0,0 +1,6 @@
+<?php
+
+/**
+ * Load the real functions.php file, which lives at `app/functions.php`.
+ */
+require_once ABSPATH . '/../../app/functions.php';

app/themes/base/index.php → app/bootstrap/index.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tomodomo\Theme;
+namespace Tomodomo;
 
 use Tomodomo\Kaiso as App;
 use Timber as Timber;
@@ -17,17 +17,13 @@
     ABSPATH . '/../../app/views',
 ];
 
-// App settings. So far you only need to provide a controllerPath
-$settings = [
-    'controllerPath'  => '\\Tomodomo\\Controllers\\',
-    'customTemplates' => [],
-];
-
 // Instantiate the app with our settings
+require_once ABSPATH . '/../../app/settings.php';
+
 $app = new App($settings);
 
 // Load up the container
-require_once 'container.php';
+require_once ABSPATH . '/../../app/container.php';
 
 // Run the app!
 $app->run();

app/themes/base/style.css → app/bootstrap/style.css

@@ -1,5 +1,5 @@
 /**
- * Theme Name: Tomodomo
+ * Theme Name: Kaiso Bootstrap
  * Theme URI: https://tomodomo.co/
  * Author: Tomodomo
  * Author URI: https://tomodomo.co/

app/themes/base/container.php → app/container.php

@@ -12,11 +12,12 @@
     return $context;
 };
 
+// Allow accessing the current user
 $app->container['user'] = function ($container) {
     return $container['context']['user'] ?? null;
 };
 
+// Add an instance of Twig
 $app->container['twig'] = function ($container) {
-    // Cheating a bit, wrapping Timber
     return new Twig($container);
 };

app/controllers/BaseController.php

@@ -2,24 +2,26 @@
 
 namespace Tomodomo\Controllers;
 
+use Pimple\Container;
+
 class BaseController
 {
     /**
-     * @var \Pimple\Container
+     * @var Container
      */
     public $container;
 
     /**
-     * @param \Pimple\Container $container
+     * @param Container $container
      *
      * @return void
      */
-    public function __construct($container)
+    public function __construct(Container $container)
     {
         // Grab the Pimple container
         $this->container = $container;
 
-        // Twig!
+        // Make Twig available for convenience
         $this->twig = $this->container['twig'];
 
         return;

app/controllers/IndexController.php

@@ -2,20 +2,27 @@
 
 namespace Tomodomo\Controllers;
 
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Timber\PostQuery as Query;
+
 class IndexController extends BaseController
 {
     /**
-     * Handle GET requests to this route
+     * Respond to a GET request on the index.
      *
-     * @path /
+     * @param RequestInterface  $request
+     * @param ResponseInterface $response
+     * @param array             $args
      *
-     * @param \GuzzleHttp\Psr7\Request $request
-     * @param null $response
-     * @param array $args
-     * @return string
+     * @return ResponseInterface
      */
-    public function get($request, $response, $args)
+    public function get(RequestInterface $request, ResponseInterface $response, array $args) : ResponseInterface
     {
-        return $this->twig->compile('index.twig');
+        $context = [
+            'posts' => new Query(false, '\Tomodomo\Models\Post'),
+        ];
+
+        return $this->twig->render($response, 'index.twig', $context);
     }
 }

app/themes/base/functions.php → app/functions.php

@@ -1,4 +1,14 @@
 <?php
+/**
+ * Kaiso brings a number of modern PHP best practices to WordPress,
+ * but also brings along some core WordPress functionality —
+ * including a functions.php file, which can run functionality
+ * automatically in your site.
+ *
+ * While you can put any code here, we recommend using this file to
+ * configure "environment" settings: defining theme supports,
+ * registering nav menus, adding to Timber's global context, etc.
+ */
 
 namespace Tomodomo\Theme;
 
@@ -9,7 +19,7 @@
  *
  * @return void
  */
-function themeSupports()
+function themeSupports() : void
 {
     // Featured images
     add_theme_support('post-thumbnails');
@@ -20,6 +30,9 @@ function themeSupports()
     // Disable Gutenberg colors
     add_theme_support('disable-custom-colors');
 
+    // Disable Gutenberg custom font sizes
+    add_theme_support('disable-custom-font-sizes');
+
     // Auto-generate the title tag
     add_theme_support('title-tag');
 
@@ -33,7 +46,7 @@ function themeSupports()
  *
  * @return void
  */
-function registerMenus()
+function registerMenus() : void
 {
     register_nav_menus([
         'primary' => 'Primary Menu',
@@ -52,7 +65,7 @@ function registerMenus()
  *
  * @return array
  */
-function context($context)
+function context(array $context) : array
 {
     // Load in menus
     $context['menu']['primary'] = new Menu('primary');

app/helpers/Twig.php

@@ -2,31 +2,33 @@
 
 namespace Tomodomo\Helpers;
 
+use Pimple\Container;
+use Psr\Http\Message\ResponseInterface;
 use Timber;
 
 class Twig
 {
     /**
-     * @param \Pimple\Container
+     * @param Container
      *
      * @return void
      */
-    public function __construct($container)
+    public function __construct(Container $container)
     {
         $this->container = $container;
 
         return;
     }
 
     /**
-     * Compile a template
+     * Compile a template to a string.
      *
      * @param string|array $template
-     * @param array $context
+     * @param array        $context
      *
      * @return string
      */
-    public function compile($template, $context = [])
+    public function compile($template, array $context = []) : string
     {
         // Build the context settings
         $settings = array_merge(
@@ -39,4 +41,22 @@ public function compile($template, $context = [])
 
         return Timber::compile($template, $settings);
     }
+
+    /**
+     * Compiles a template, adds it to the PSR7 response body stream,
+     * and returns the response. Inspired by Slim Framework's Twig
+     * integration: https://github.com/slimphp/Twig-View
+     *
+     * @param ResponseInterface $response
+     * @param string|array      $template
+     * @param array             $context
+     *
+     * @return ResponseInterface
+     */
+    public function render(ResponseInterface $response, $template, array $context = []) : ResponseInterface
+    {
+        $response->getBody()->write($this->compile($template, $context));
+
+        return $response;
+    }
 }

app/settings.php

@@ -0,0 +1,8 @@
+<?php
+
+// App settings
+$settings = [
+    'controllerPath'  => '\\Tomodomo\\Controllers\\',
+    'customTemplates' => [],
+    'displayErrors'   => defined('WP_DEBUG_DISPLAY') ? WP_DEBUG_DISPLAY : false,
+];

app/views/index.twig

@@ -0,0 +1,16 @@
+{% extends 'layouts/base.twig' %}
+
+{% block content %}
+
+{% for post in posts %}
+<article class="post">
+  <header>
+    <h1>{{post.title}}</h1>
+  </header>
+  <div class="post__content">
+    {{post.content}}
+  </div>
+</article>
+{% endfor %}
+
+{% endblock %}

app/views/layouts/base.twig

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  {{wp_head}}
+</head>
+<body>
+  <main>
+    {% block content %}{% endblock %}
+  </main>
+
+  {{wp_footer}}
+</body>
+</html>