Actually use Config class (#71)

Author: Firehed

bin/generate_endpoint

@@ -2,6 +2,8 @@
 <?php
 declare(strict_types=1);
 
+use Firehed\API\Config;
+
 $config = require 'load_config.php';
 
 if ($argc < 2) {
@@ -64,23 +66,10 @@ php;
 
 $class = sprintf(
     $template,
-    $config['namespace'],
+    $config->get(Config::KEY_NAMESPACE),
     $namespace ? '\\' . implode('\\', array_map('ucfirst', $namespace)) : '',
     ucfirst($className),
     implode('/', $defaultUrl)
 );
 
 echo $class;
-
-// For now, just echo the class skeleton and allow the user to handle it as
-// they want. A future version of this should intelligently resolve paths and
-// write the file directly.
-/*
-$targetFile = sprintf(
-    '%s/%s/%s/%s.php',
-    $config['source'],
-    strtr($config['namespace'], '\\', '/'),
-    implode('/', $namespace),
-    $className
-);
- */

bin/generate_endpoint_list

@@ -2,15 +2,17 @@
 <?php
 declare(strict_types=1);
 
+use Firehed\API\Config;
+
 $config = require 'load_config.php';
 
 // Build out the endpoint map
 (new Firehed\Common\ClassMapGenerator())
-    ->setPath(getcwd().DIRECTORY_SEPARATOR.$config['source'])
+    ->setPath(getcwd().DIRECTORY_SEPARATOR.$config->get(Config::KEY_SOURCE))
     ->setInterface('Firehed\API\Interfaces\EndpointInterface')
     ->addCategory('getMethod')
     ->setMethod('getURI')
-    ->setNamespace($config['namespace'])
+    ->setNamespace($config->get(Config::KEY_NAMESPACE))
     ->setOutputFile(getcwd().'/__endpoint_list__.json')
     ->generate();
 

bin/generate_front_controller

@@ -2,14 +2,16 @@
 <?php
 declare(strict_types=1);
 
+use Firehed\API\Config;
+
 $config = require 'load_config.php';
 
 // Returns a series of '/..'s to get from the directory of the webroot to that
 // of the project root
-function resolveProjectRoot(string $webroot): string {
+$resolveProjectRoot = function (string $webroot): string {
     $dirs = explode('/', $webroot);
     return str_repeat('/..', count($dirs));
-}
+};
 
 $template = <<<'php'
 <?php
@@ -56,24 +58,26 @@ $response = (new Dispatcher())
 Firehed\API\ResponseRenderer::render($response);
 php;
 
-$container = array_key_exists('container', $config)
-    ? sprintf(
+if ($config->has(Config::KEY_CONTAINER)) {
+    $container = sprintf(
         'require \'%s\'',
         $config['container']
-    )
-    : 'null';
+    );
+} else {
+    $container = 'null';
+}
 
 // TODO: write to file
 $fc = sprintf(
     $template,
-    resolveProjectRoot($config['webroot']),
+    $resolveProjectRoot($config->get(Config::KEY_WEBROOT)),
     $container
 );
 
-$dir = $config['local_project_root'].'/'.$config['webroot'];
+$dir = $config->get(Config::KEY_WEBROOT);
 if (!file_exists($dir)) {
-    fwrite(STDOUT, "Making '$dir' with 0755 permissions");
+    fwrite(STDOUT, "Making '$dir' with 0755 permissions\n");
     mkdir($dir, 0755, true);
 }
 file_put_contents($dir.'/index.php', $fc);
-fwrite(STDOUT, "Wrote front controller to $dir/index.php");
+fwrite(STDOUT, "Wrote front controller to $dir/index.php\n");

bin/load_config.php

@@ -1,82 +1,16 @@
 <?php
 declare(strict_types=1);
 
+use Firehed\API\Config;
 use Psr\Container\ContainerInterface;
 
 $root = __DIR__;
 while (!file_exists($root.'/vendor/autoload.php') && $root != DIRECTORY_SEPARATOR) {
     $root = dirname($root);
 }
 
-require $root.'/vendor/autoload.php';
+chdir($root);
 
-$file = '/.apiconfig';
-$config_file = $root.$file;
+require_once 'vendor/autoload.php';
 
-if (!file_exists($config_file) || !is_readable($config_file)) {
-    fwrite(STDERR, ".apiconfig file not found");
-    exit(1);
-}
-
-$config = json_decode(file_get_contents($config_file), true);
-
-if (JSON_ERROR_NONE !== json_last_error()) {
-    fwrite(STDERR, ".apiconfig contains invalid JSON");
-    exit(1);
-}
-
-$config = array_map(function ($val) {
-    return rtrim($val, '/');
-}, $config);
-
-$required_keys = [
-    'webroot',
-    'namespace',
-    'source',
-];
-$optionalKeys = [
-    'container',
-];
-
-$allKeys = array_merge($required_keys, $optionalKeys);
-
-$keysInConfig = array_keys($config);
-
-if ($diff = array_diff($keysInConfig, $allKeys)) {
-    fwrite(STDERR, sprintf(
-        'Found unexpected config keys in .apiconfig: %s',
-        implode(', ', $diff)
-    ));
-    exit(1);
-}
-
-foreach ($required_keys as $required_key) {
-    if (!array_key_exists($required_key, $config)) {
-        fwrite(STDERR, ".apiconfig is missing value for '$required_key'");
-        exit(1);
-    }
-}
-
-if (array_key_exists('container', $config)) {
-    $file = $config['container'];
-    if (!file_exists($file)) {
-        fwrite(STDERR, ".apiconfig[container] must point to a file returning a PSR-11 container");
-        exit(1);
-    }
-
-    // Require the container file in a closure to avoid any variable scope
-    // leaking into the current context.
-    $load = function (string $path): ContainerInterface {
-        return require $path;
-    };
-    try {
-        $container = $load($config['container']);
-    } catch (TypeError $e) {
-        fwrite(STDERR, ".apiconfig[container] must point to a file returning a PSR-11 container");
-        exit(1);
-    }
-}
-
-$config['local_project_root'] = dirname($config_file);
-
-return $config;
+return Config::load('.apiconfig');