From bd9cc11c4389105b28114784e8fb2fb87a293a39 Mon Sep 17 00:00:00 2001
From: Aleksi Peebles <aleksi@iki.fi>
Date: Mon, 13 Nov 2017 15:24:30 +0200
Subject: [PATCH 1/2] Add console and router.php from editions

---
 bin/console                                   | 46 +++++++++++++++++++
 bin/router.php                                | 41 +++++++++++++++++
 composer.json                                 |  3 +-
 .../Console/Commands/ServerCommand.php        |  2 +-
 4 files changed, 90 insertions(+), 2 deletions(-)
 create mode 100644 bin/console
 create mode 100644 bin/router.php

diff --git a/bin/console b/bin/console
new file mode 100644
index 00000000..5bd68c51
--- /dev/null
+++ b/bin/console
@@ -0,0 +1,46 @@
+<?php
+
+/*!
+ * Pattern Lab Builder CLI
+ *
+ * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
+ * Licensed under the MIT license
+ *
+ */
+
+use \PatternLab\Config;
+use \PatternLab\Console;
+use \PatternLab\Dispatcher;
+use \PatternLab\Timer;
+
+// check to see if json_decode exists. might be disabled in installs of PHP 5.5
+if (!function_exists("json_decode")) {
+	print "Please check that your version of PHP includes the JSON extension. It's required for Pattern Lab to run. Aborting.\n";
+	exit;
+}
+
+// set-up the project base directory
+$baseDir = __DIR__."/../";
+
+// auto-load classes
+if (file_exists($baseDir."vendor/autoload.php")) {
+	require($baseDir."vendor/autoload.php");
+} else {
+	print "it doesn't appear that pattern lab has been set-up yet...\n";
+	print "please install pattern lab's dependencies by typing: php core/bin/composer.phar install...\n";
+	exit;
+}
+
+// start the timer
+Timer::start();
+
+// load the options
+Console::init();
+Config::init($baseDir, false);
+
+// initialize the dispatcher & note that the config has been loaded
+Dispatcher::init();
+Dispatcher::getInstance()->dispatch("config.configLoadEnd");
+
+// run the console
+Console::run();
diff --git a/bin/router.php b/bin/router.php
new file mode 100644
index 00000000..42976b92
--- /dev/null
+++ b/bin/router.php
@@ -0,0 +1,41 @@
+<?php
+
+/*!
+ * Router for the PHP Server
+ *
+ * Copyright (c) 2014 Dave Olsen
+ * Licensed under the MIT license
+ *
+ */
+
+use \PatternLab\Config;
+
+// set-up the project base directory
+$baseDir = __DIR__."/../../";
+
+// auto-load classes
+if (file_exists($baseDir."vendor/autoload.php")) {
+	require($baseDir."vendor/autoload.php");
+} else {
+	print "it doesn't appear that pattern lab has been set-up yet...\n";
+	print "please install pattern lab's dependencies by typing: php core/bin/composer.phar install...\n";
+	exit;
+}
+
+// load the options and be quiet about it
+Config::init($baseDir, false);
+
+if (($_SERVER["SCRIPT_NAME"] == "") || ($_SERVER["SCRIPT_NAME"] == "/")) {
+	
+	require("index.html");
+	
+} else if (file_exists(Config::getOption("publicDir").$_SERVER["SCRIPT_NAME"])) {
+	
+	return false;
+	
+} else {
+	
+	header("HTTP/1.0 404 Not Found");
+	print "file doesn't exist.";
+	
+}
diff --git a/composer.json b/composer.json
index da40fa12..b18497cb 100644
--- a/composer.json
+++ b/composer.json
@@ -50,5 +50,6 @@
     "symfony/finder": "^3.0",
     "symfony/process": "^3.1",
     "symfony/yaml": "^3.0"
-  }
+  },
+  "bin": ["bin/console", "bin/router.php"]
 }
diff --git a/src/PatternLab/Console/Commands/ServerCommand.php b/src/PatternLab/Console/Commands/ServerCommand.php
index 1e4d1664..c185184e 100644
--- a/src/PatternLab/Console/Commands/ServerCommand.php
+++ b/src/PatternLab/Console/Commands/ServerCommand.php
@@ -56,7 +56,7 @@ public function run() {
 			$quiet = Console::findCommandOption("quiet");
 			
 			// set-up the base command
-			$command    = $this->pathPHP." -S ".$host." ".$coreDir."/server/router.php";
+			$command    = $this->pathPHP." -S ".$host." ".$coreDir."/router.php";
 			$commands   = array();
 			$commands[] = array("command" => $command, "cwd" => $publicDir, "timeout" => null, "idle" => 1800);
 			

From e13480fedbeef73aefd594acfecc63116a51c225 Mon Sep 17 00:00:00 2001
From: Aleksi Peebles <aleksi@iki.fi>
Date: Mon, 13 Nov 2017 15:46:35 +0200
Subject: [PATCH 2/2] Fix console and router.php baseDir

---
 bin/console    | 2 +-
 bin/router.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/console b/bin/console
index 5bd68c51..b8631a69 100644
--- a/bin/console
+++ b/bin/console
@@ -20,7 +20,7 @@ if (!function_exists("json_decode")) {
 }
 
 // set-up the project base directory
-$baseDir = __DIR__."/../";
+$baseDir = __DIR__."/../../../../";
 
 // auto-load classes
 if (file_exists($baseDir."vendor/autoload.php")) {
diff --git a/bin/router.php b/bin/router.php
index 42976b92..1dc4d8ce 100644
--- a/bin/router.php
+++ b/bin/router.php
@@ -11,7 +11,7 @@
 use \PatternLab\Config;
 
 // set-up the project base directory
-$baseDir = __DIR__."/../../";
+$baseDir = __DIR__."/../../../../";
 
 // auto-load classes
 if (file_exists($baseDir."vendor/autoload.php")) {