Move SessionMessage to Framework, clean up index.php/parable

CHANGELOG.md

@@ -51,6 +51,7 @@ __Changes__
 
 __Backwards-incompatible Changes__
 - `Bootstrap.php` has been removed. `\Parable\Framework\App` handles its own setup now. This makes it easier to implement App without much hassle.
+- `SessionMessage` has been moved from the `GetSet` component into `Framework`, as it isn't a `GetSet` instance itself but merely uses the `Session` instance.
 - `\Parable\Console` no longer accepts options in the format `--option value`, but only in the following: `--option=value`. This is because if you had an option which didn't require a value, and was followed by an argument, the argument would be seen as the option's value instead.
 - `\Parable\Console\App::setDefaultCommand()` now takes a command instance rather than the name, as the name would suggest. To set the default command by name, use `setDefaultCommandByName()` instead.
 - `\Parable\Console\App::setOnlyUseDefaultCommand()` was added, and the boolean paramater was removed from the `setDefaultCommand/ByName()` function calls. Checked by calling `shouldOnlyUseDefaultCommand()`.
@@ -74,6 +75,7 @@ __Bugfixes__
 - `\Parable\Console\Output` had a bug where moving the cursors would mess with the functionality of `clearLine()`. Line length is no longer kept track of, but whether or not the line is clearable is a boolean value. Moving the cursor up/down or placing it disables line clearing, writing anything enables it again. When you clear the line, the line gets cleared using the terminal width.
 - `\Parable\Console\Parameter` had a bug where providing an argument after an option with an `=` sign in it (so `script.php command option=value arg`) would see the argument as the option value and overwrite the actual value. Fixed by @dmvdbrugge in PR #31. Thanks!
 - `\Parable\Console\Parameter` had a bug, where false-equivalent values passed to an option would be seen as the option being provided without a value, making the returned value `true`. Fixed by @dmvdbrugge in PR #37. Thanks!
+- `\Parable\Http\Response` had a bug in `appendContent()` and `prependResponse()` where when working with arrays, empty values ended up as an empty array key, messing with json output.
 - `\Parable\Filesystem\Path::getDir()` had a bug where if the filename you were trying to get a proper base-dirred path for already existed in the directory the code was run from, it would think it didn't need to and return just the provided path again.
 - `\Parable\Framework\Config` had a bug where a class was referenced that doesn't exist until you've run `parable init-structure`. This has been replaced with a string value instead. Found by @dmvdbrugge. Thanks!
 - `\Parable\Routing\Router` now sanitizes the Url before trying to match it, stripping html and special characters.

parable

@@ -3,11 +3,8 @@
 // We're going to want to display all errors.
 ini_set('display_errors', '1');
 
-// Require defines.php so we've got DS and BASEDIR
-require_once __DIR__ . DIRECTORY_SEPARATOR . "src" . DIRECTORY_SEPARATOR . "defines.php";
-
-// Require the autoloader
-require_once realpath(BASEDIR . DS . "vendor" . DS . "autoload.php");
+// Require the Composer autoloader
+require_once realpath(__DIR__ . "/../../autoload.php");
 
 /** @var \Parable\Console\App $app */
 $app = \Parable\DI\Container::create(\Parable\Console\App::class);

src/GetSet/SessionMessage.php → src/Framework/SessionMessage.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Parable\GetSet;
+namespace Parable\Framework;
 
 class SessionMessage
 {

src/Framework/View.php

@@ -12,6 +12,7 @@
  * @property \Parable\Framework\Authentication         $authentication
  * @property \Parable\Framework\Config                 $config
  * @property \Parable\Framework\Dispatcher             $dispatcher
+ * @property \Parable\Framework\SessionMessage         $sessionMessage
  * @property \Parable\Framework\Toolkit                $toolkit
  * @property \Parable\Framework\View                   $view
  * @property \Parable\Framework\Mail\Mailer            $mailer
@@ -27,7 +28,6 @@
  * @property \Parable\GetSet\Post                      $post
  * @property \Parable\GetSet\Server                    $server
  * @property \Parable\GetSet\Session                   $session
- * @property \Parable\GetSet\SessionMessage            $sessionMessage
  * @property \Parable\Log\Logger                       $logger
  * @property \Parable\ORM\Query                        $query
  * @property \Parable\ORM\Database                     $database

src/Http/Response.php

@@ -228,10 +228,12 @@ public function getContent()
      */
     public function prependContent($content)
     {
-        if (is_array($this->content)) {
-            array_unshift($this->content, $content);
-        } else {
-            $this->content = $content . $this->content;
+        if (!empty($content)) {
+            if (is_array($this->content)) {
+                array_unshift($this->content, $content);
+            } else {
+                $this->content = $content . $this->content;
+            }
         }
         return $this;
     }
@@ -245,10 +247,12 @@ public function prependContent($content)
      */
     public function appendContent($content)
     {
-        if (is_array($this->content)) {
-            $this->content[] = $content;
-        } else {
-            $this->content .= $content;
+        if (!empty($content)) {
+            if (is_array($this->content)) {
+                $this->content[] = $content;
+            } else {
+                $this->content .= $content;
+            }
         }
         return $this;
     }

structure/public/index.php_struct

@@ -1,9 +1,8 @@
 <?php
-$bs = DIRECTORY_SEPARATOR;
-$autoloaderPath = realpath(__DIR__ . $bs . ".." . $bs . "vendor" . $bs . "autoload.php");
+$autoloaderPath = realpath(__DIR__ . "/../vendor/autoload2.php");
 
-if (!file_exists($autoloaderPath)) {
-    die("<b>ERROR</b>: You need to run <pre style='display:inline-block;background:#e6e6e6;padding:2px 5px'>composer install</pre> before Parable will work.");
+if ($autoloaderPath) {
+    die("<b>ERROR</b>: You need to run <code>composer install</code> before Parable will work.");
 }
 
 require_once $autoloaderPath;

tests/Components/GetSet/SessionMessageTest.php → tests/Components/Framework/SessionMessageTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Parable\Tests\Components\GetSet;
+namespace Parable\Tests\Components\Framework;
 
 class SessionMessageTest extends \Parable\Tests\Base
 {
-    /** @var \Parable\GetSet\SessionMessage */
+    /** @var \Parable\Framework\SessionMessage */
     protected $sessionMessage;
 
     protected function setUp()
@@ -13,15 +13,15 @@ protected function setUp()
 
         $session = new \Parable\GetSet\Session();
         $session->set(
-            \Parable\GetSet\SessionMessage::SESSION_KEY,
+            \Parable\Framework\SessionMessage::SESSION_KEY,
             [
                 'notice' => [
                     'This is message 1.',
                     'This is message 2.'
                 ],
             ]
         );
-        $this->sessionMessage = new \Parable\GetSet\SessionMessage($session);
+        $this->sessionMessage = new \Parable\Framework\SessionMessage($session);
     }
 
     public function testGet()