Minor code cleanups

alez007 · Jun 19, 2013 · d4bb11b · d4bb11b
1 parent e80e857
commit d4bb11b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -163,9 +163,7 @@ class Foo extends \Swiftlet\Controller
  // Get an instance of the Example class (Swiftlet/Models/Example.php)
  $exampleModel = $this->app->getModel('example');
 
- $helloWorld = $exampleModel->getHelloWorld();
-
- $this->view->helloWorld = $helloWorld;
+ $this->view->helloWorld = $exampleModel->getHelloWorld();
  }
 }
 ```

diff --git a/Swiftlet/App.php b/Swiftlet/App.php
@@ -115,7 +115,9 @@ public function run()
  public function serve()
  {
  ob_start();
+
  $this->view->render();
+
  ob_end_flush();
  }
 
@@ -129,7 +131,8 @@ public function getConfig($variable)
  if ( isset($this->config[$variable]) ) {
  return $this->config[$variable];
  }
- return null;
+
+ return null;
  }
 
  /**

diff --git a/Swiftlet/Model.php b/Swiftlet/Model.php
@@ -10,7 +10,7 @@ abstract class Model implements Interfaces\Model
 
  /**
  * Constructor
- * @param object $app
+ * @param Interfaces\App $app
  */
  public function __construct(Interfaces\App $app)
  {

diff --git a/Swiftlet/Plugins/Example.php b/Swiftlet/Plugins/Example.php
@@ -9,7 +9,7 @@ class Example extends \Swiftlet\Plugin
  */
  public function actionAfter()
  {
- if ( get_class($this->controller) === 'Swiftlet\Controllers\Index' ) {
+ if ( $this->app->getControllerName() === 'Index' ) {
  $this->view->helloWorld .= ' This string was altered by ' . __CLASS__ . '.';
  }
  }

diff --git a/Swiftlet/View.php b/Swiftlet/View.php
@@ -30,7 +30,7 @@ public function __construct(Interfaces\App $app, $name)
  * @param bool $htmlEncode
  * @return mixed|null
  */
- public function get($variable, $htmlEncode = true)
+ public function get($variable, $htmlEncode = true)
  {
  if ( isset($this->variables[$variable]) ) {
  if ( $htmlEncode ) {