The application could not run because of the following error:
';
$body .= '
Details
';
@@ -153,33 +153,33 @@ protected static function renderBody($exception)
return static::exceptionMarkup($title, $body);
}
- /**
- * Generate diagnostic template markup
- *
- * This method accepts a title and body content to generate an HTML document layout.
- *
- * @param string $title The title of the HTML template
- * @param string $body The body content of the HTML template
- * @return string
- */
- protected static function errorMarkup($title, $body)
- {
- return "$title
$title
$body";
- }
-
- /**
- * Generate diagnostic template markup
- *
- * This method accepts a title and body content to generate an HTML document layout.
- *
- * @param string $title The title of the HTML template
- * @param string $body The body content of the HTML template
- * @return string
- */
- protected static function exceptionMarkup($title, $body)
- {
- return "$title$body";
- }
+ /**
+ * Generate diagnostic template markup
+ *
+ * This method accepts a title and body content to generate an HTML document layout.
+ *
+ * @param string $title The title of the HTML template
+ * @param string $body The body content of the HTML template
+ * @return string
+ */
+ protected static function errorMarkup($title, $body)
+ {
+ return "$title
$title
$body";
+ }
+
+ /**
+ * Generate diagnostic template markup
+ *
+ * This method accepts a title and body content to generate an HTML document layout.
+ *
+ * @param string $title The title of the HTML template
+ * @param string $body The body content of the HTML template
+ * @return string
+ */
+ protected static function exceptionMarkup($title, $body)
+ {
+ return "$title$body";
+ }
/**
* Default Not Found handler
@@ -187,9 +187,9 @@ protected static function exceptionMarkup($title, $body)
public static function defaultDown()
{
echo static::errorMarkup(
- 'Oops!',
- '
App is under maintainance, please check back soon.
'
- );
+ 'Oops!',
+ '
App is under maintainance, please check back soon.
'
+ );
}
/**
@@ -198,9 +198,9 @@ public static function defaultDown()
public static function default404()
{
echo static::errorMarkup(
- '404',
- '
The page you are looking for could not be found.
'
- );
+ '404',
+ '
The page you are looking for could not be found.
'
+ );
}
/**
diff --git a/src/Helpers/Container.php b/src/Helpers/Container.php
index 416cb78..f4551ae 100755
--- a/src/Helpers/Container.php
+++ b/src/Helpers/Container.php
@@ -8,234 +8,234 @@
* Leaf service container
* ----
* A simple container solution for your leaf apps
- *
+ *
* @since v2.0
*/
class Container
{
- /**
- * Key-value array of arbitrary data
- * @var array
- */
- protected $data = [];
-
- /**
- * Constructor
- * @param array $items Pre-populate set with this key-value array
- */
- public function __construct($items = [])
- {
- $this->replace($items);
- }
-
- /**
- * Normalize data key
- *
- * Used to transform data key into the necessary
- * key format for this set. Used in subclasses
- * like \Leaf\Http\Headers.
- *
- * @param string $key The data key
- * @return mixed The transformed/normalized data key
- */
- protected function normalizeKey($key)
- {
- return $key;
- }
-
- /**
- * Set data key to value
- * @param string $key The data key
- * @param mixed $value The data value
- */
- public function set($key, $value)
- {
- $this->data[$this->normalizeKey($key)] = $value;
- }
-
- /**
- * Get data value with key
- * @param string $key The data key
- * @param mixed $default The value to return if data key does not exist
- * @return mixed The data value, or the default value
- */
- public function get($key, $default = null)
- {
- if ($this->has($key)) {
- $isInvokable = is_object($this->data[$this->normalizeKey($key)]) && method_exists($this->data[$this->normalizeKey($key)], '__invoke');
-
- return $isInvokable ? $this->data[$this->normalizeKey($key)]($this) : $this->data[$this->normalizeKey($key)];
- }
-
- return $default;
- }
-
- /**
- * Add data to set
- * @param array $items Key-value array of data to append to this set
- */
- public function replace($items)
- {
- foreach ($items as $key => $value) {
- $this->set($key, $value); // Ensure keys are normalized
- }
- }
-
- /**
- * Set the content-type of response to json
- */
- public function contentJson()
- {
- $this->replace(['Content-Type' => 'text/json']);
- }
-
- /**
- * Set the content-type of response to html
- */
- public function contentHtml()
- {
- $this->replace(['Content-Type' => 'text/html']);
- }
-
- /**
- * Fetch set data
- * @return array This set's key-value data array
- */
- public function all()
- {
- return $this->data;
- }
-
- /**
- * Fetch set data keys
- * @return array This set's key-value data array keys
- */
- public function keys()
- {
- return array_keys($this->data);
- }
-
- /**
- * Does this set contain a key?
- * @param string $key The data key
- * @return boolean
- */
- public function has($key)
- {
- return array_key_exists($this->normalizeKey($key), $this->data);
- }
-
- /**
- * Remove value with key from this set
- * @param string $key The data key
- */
- public function remove($key)
- {
- unset($this->data[$this->normalizeKey($key)]);
- }
-
- /**
- * Property Overloading
- */
-
- public function __get($key)
- {
- return $this->get($key);
- }
-
- public function __set($key, $value)
- {
- $this->set($key, $value);
- }
-
- public function __isset($key)
- {
- return $this->has($key);
- }
-
- public function __unset($key)
- {
- $this->remove($key);
- }
-
- /**
- * Clear all values
- */
- public function clear()
- {
- $this->data = [];
- }
-
- /**
- * Array Access
- */
-
- public function offsetExists($offset)
- {
- return $this->has($offset);
- }
-
- public function offsetGet($offset)
- {
- return $this->get($offset);
- }
-
- public function offsetSet($offset, $value)
- {
- $this->set($offset, $value);
- }
-
- public function offsetUnset($offset)
- {
- $this->remove($offset);
- }
-
- /**
- * Countable
- */
- public function count()
- {
- return count($this->data);
- }
-
- /**
- * IteratorAggregate
- */
- public function getIterator()
- {
- return new \ArrayIterator($this->data);
- }
-
- /**
- * Ensure a value or object will remain globally unique
- *
- * @param string $key The value or object name
- * @param \Closure $value The closure that defines the object
- *
- * @return mixed
- */
- public function singleton($key, $value)
- {
- $this->set($key, function ($c) use ($value) {
- static $object;
-
- if (null === $object) {
- $object = $value($c);
- }
-
- return $object;
- });
- }
-
- /**
- * Protect closure from being directly invoked
- * @param \Closure $callable A closure to keep from being invoked and evaluated
- * @return \Closure
- */
- public function protect(\Closure $callable)
- {
- return function () use ($callable) {
- return $callable;
- };
- }
+ /**
+ * Key-value array of arbitrary data
+ * @var array
+ */
+ protected $data = [];
+
+ /**
+ * Constructor
+ * @param array $items Pre-populate set with this key-value array
+ */
+ public function __construct($items = [])
+ {
+ $this->replace($items);
+ }
+
+ /**
+ * Normalize data key
+ *
+ * Used to transform data key into the necessary
+ * key format for this set. Used in subclasses
+ * like \Leaf\Http\Headers.
+ *
+ * @param string $key The data key
+ * @return mixed The transformed/normalized data key
+ */
+ protected function normalizeKey($key)
+ {
+ return $key;
+ }
+
+ /**
+ * Set data key to value
+ * @param string $key The data key
+ * @param mixed $value The data value
+ */
+ public function set($key, $value)
+ {
+ $this->data[$this->normalizeKey($key)] = $value;
+ }
+
+ /**
+ * Get data value with key
+ * @param string $key The data key
+ * @param mixed $default The value to return if data key does not exist
+ * @return mixed The data value, or the default value
+ */
+ public function get($key, $default = null)
+ {
+ if ($this->has($key)) {
+ $isInvokable = is_object($this->data[$this->normalizeKey($key)]) && method_exists($this->data[$this->normalizeKey($key)], '__invoke');
+
+ return $isInvokable ? $this->data[$this->normalizeKey($key)]($this) : $this->data[$this->normalizeKey($key)];
+ }
+
+ return $default;
+ }
+
+ /**
+ * Add data to set
+ * @param array $items Key-value array of data to append to this set
+ */
+ public function replace($items)
+ {
+ foreach ($items as $key => $value) {
+ $this->set($key, $value); // Ensure keys are normalized
+ }
+ }
+
+ /**
+ * Set the content-type of response to json
+ */
+ public function contentJson()
+ {
+ $this->replace(['Content-Type' => 'text/json']);
+ }
+
+ /**
+ * Set the content-type of response to html
+ */
+ public function contentHtml()
+ {
+ $this->replace(['Content-Type' => 'text/html']);
+ }
+
+ /**
+ * Fetch set data
+ * @return array This set's key-value data array
+ */
+ public function all()
+ {
+ return $this->data;
+ }
+
+ /**
+ * Fetch set data keys
+ * @return array This set's key-value data array keys
+ */
+ public function keys()
+ {
+ return array_keys($this->data);
+ }
+
+ /**
+ * Does this set contain a key?
+ * @param string $key The data key
+ * @return bool
+ */
+ public function has($key)
+ {
+ return array_key_exists($this->normalizeKey($key), $this->data);
+ }
+
+ /**
+ * Remove value with key from this set
+ * @param string $key The data key
+ */
+ public function remove($key)
+ {
+ unset($this->data[$this->normalizeKey($key)]);
+ }
+
+ /**
+ * Property Overloading
+ */
+
+ public function __get($key)
+ {
+ return $this->get($key);
+ }
+
+ public function __set($key, $value)
+ {
+ $this->set($key, $value);
+ }
+
+ public function __isset($key)
+ {
+ return $this->has($key);
+ }
+
+ public function __unset($key)
+ {
+ $this->remove($key);
+ }
+
+ /**
+ * Clear all values
+ */
+ public function clear()
+ {
+ $this->data = [];
+ }
+
+ /**
+ * Array Access
+ */
+
+ public function offsetExists($offset)
+ {
+ return $this->has($offset);
+ }
+
+ public function offsetGet($offset)
+ {
+ return $this->get($offset);
+ }
+
+ public function offsetSet($offset, $value)
+ {
+ $this->set($offset, $value);
+ }
+
+ public function offsetUnset($offset)
+ {
+ $this->remove($offset);
+ }
+
+ /**
+ * Countable
+ */
+ public function count()
+ {
+ return count($this->data);
+ }
+
+ /**
+ * IteratorAggregate
+ */
+ public function getIterator()
+ {
+ return new \ArrayIterator($this->data);
+ }
+
+ /**
+ * Ensure a value or object will remain globally unique
+ *
+ * @param string $key The value or object name
+ * @param \Closure $value The closure that defines the object
+ *
+ * @return mixed
+ */
+ public function singleton($key, $value)
+ {
+ $this->set($key, function ($c) use ($value) {
+ static $object;
+
+ if (null === $object) {
+ $object = $value($c);
+ }
+
+ return $object;
+ });
+ }
+
+ /**
+ * Protect closure from being directly invoked
+ * @param \Closure $callable A closure to keep from being invoked and evaluated
+ * @return \Closure
+ */
+ public function protect(\Closure $callable)
+ {
+ return function () use ($callable) {
+ return $callable;
+ };
+ }
}
diff --git a/src/Middleware.php b/src/Middleware.php
index 76a661b..6a2ca0b 100755
--- a/src/Middleware.php
+++ b/src/Middleware.php
@@ -13,62 +13,62 @@
*/
abstract class Middleware
{
- /**
- * @var \Leaf\App Reference to the primary application instance
- */
- protected $app;
+ /**
+ * @var \Leaf\App Reference to the primary application instance
+ */
+ protected $app;
- /**
- * @var mixed Reference to the next downstream middleware
- */
- protected $next;
+ /**
+ * @var mixed Reference to the next downstream middleware
+ */
+ protected $next;
- /**
- * Set next middleware
- *
- * This method injects the next downstream middleware into
- * this middleware so that it may optionally be called
- * when appropriate.
- *
- * @param \Leaf\Middleware
- */
- final public function setNextMiddleware($nextMiddleware)
- {
- $this->next = $nextMiddleware;
- }
+ /**
+ * Set next middleware
+ *
+ * This method injects the next downstream middleware into
+ * this middleware so that it may optionally be called
+ * when appropriate.
+ *
+ * @param \Leaf\Middleware
+ */
+ final public function setNextMiddleware($nextMiddleware)
+ {
+ $this->next = $nextMiddleware;
+ }
- /**
- * Get next middleware
- *
- * This method retrieves the next downstream middleware
- * previously injected into this middleware.
- *
- * @return \Leaf\Middleware
- */
- final public function getNextMiddleware()
- {
- return $this->next;
- }
+ /**
+ * Get next middleware
+ *
+ * This method retrieves the next downstream middleware
+ * previously injected into this middleware.
+ *
+ * @return \Leaf\Middleware
+ */
+ final public function getNextMiddleware()
+ {
+ return $this->next;
+ }
- /**
- * Call the next middleware
- */
- final public function next()
- {
- $nextMiddleware = $this->next;
+ /**
+ * Call the next middleware
+ */
+ final public function next()
+ {
+ $nextMiddleware = $this->next;
- if (!$nextMiddleware) {
- return;
- }
+ if (!$nextMiddleware) {
+ return;
+ }
- $nextMiddleware->call();
- }
+ $nextMiddleware->call();
+ }
- /**
- * Call
- *
- * Perform actions specific to this middleware and optionally
- * call the next downstream middleware.
- */
- abstract public function call();
+ /**
+ * Call
+ *
+ * Perform actions specific to this middleware and optionally
+ * call the next downstream middleware.
+ */
+ abstract public function call();
}
diff --git a/src/View.php b/src/View.php
index fba0417..a3d8083 100644
--- a/src/View.php
+++ b/src/View.php
@@ -14,33 +14,33 @@
*/
class View
{
- public static $engines = [];
-
- /**
- * Attach view engine to Leaf view
- *
- * @param mixed $className The class to attach
- * @param string|null $name The key to save view engine with
- */
- public static function attach($className, $name = null)
- {
- $class = new $className;
- static::$engines[$name ?? static::getDiIndex($class)] = $class;
- Config::set("views.engine", $name ?? static::getDiIndex($class));
- }
-
- private static function getDiIndex($class)
- {
- $className = strtolower(get_class($class));
-
- $fullName = explode("\\", $className);
- $className = $fullName[count($fullName) - 1];
-
- return $className;
- }
-
- public static function __callstatic($name, $arguments)
- {
- return static::$engines[$name];
- }
+ public static $engines = [];
+
+ /**
+ * Attach view engine to Leaf view
+ *
+ * @param mixed $className The class to attach
+ * @param string|null $name The key to save view engine with
+ */
+ public static function attach($className, $name = null)
+ {
+ $class = new $className();
+ static::$engines[$name ?? static::getDiIndex($class)] = $class;
+ Config::set("views.engine", $name ?? static::getDiIndex($class));
+ }
+
+ private static function getDiIndex($class)
+ {
+ $className = strtolower(get_class($class));
+
+ $fullName = explode("\\", $className);
+ $className = $fullName[count($fullName) - 1];
+
+ return $className;
+ }
+
+ public static function __callstatic($name, $arguments)
+ {
+ return static::$engines[$name];
+ }
}
diff --git a/src/functions.php b/src/functions.php
index 906b71b..29542d3 100755
--- a/src/functions.php
+++ b/src/functions.php
@@ -3,22 +3,22 @@
declare(strict_types=1);
if (!function_exists('app')) {
- /**
- * Return the Leaf instance
- *
- * @return Leaf\App
- */
- function app()
- {
- $app = Leaf\Config::get("app")["instance"] ?? null;
+ /**
+ * Return the Leaf instance
+ *
+ * @return Leaf\App
+ */
+ function app()
+ {
+ $app = Leaf\Config::get("app")["instance"] ?? null;
- if (!$app) {
- $app = new Leaf\App;
- Leaf\Config::set("app", ["instance" => $app]);
- }
+ if (!$app) {
+ $app = new Leaf\App();
+ Leaf\Config::set("app", ["instance" => $app]);
+ }
- return $app;
- }
+ return $app;
+ }
}
if (!function_exists('_env')) {
diff --git a/tests/app.test.php b/tests/app.test.php
index 4d3e0f3..4eb68ac 100644
--- a/tests/app.test.php
+++ b/tests/app.test.php
@@ -1,130 +1,138 @@
request())->toBeInstanceOf(\Leaf\Http\Request::class);
- expect(app()->response())->toBeInstanceOf(\Leaf\Http\Response::class);
- expect(app()->headers())->toBeInstanceOf(\Leaf\Http\Headers::class);
+ expect(app()->request())->toBeInstanceOf(\Leaf\Http\Request::class);
+ expect(app()->response())->toBeInstanceOf(\Leaf\Http\Response::class);
+ expect(app()->headers())->toBeInstanceOf(\Leaf\Http\Headers::class);
});
test('app mode', function () {
- app()->config('app.down', false);
+ app()->config('app.down', false);
- $_SERVER['REQUEST_METHOD'] = 'GET';
- $_SERVER['REQUEST_URI'] = '/';
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/';
- app()->config('mode', 'TEST');
- app()->get('/', function () {});
- app()->script('TEST', function () {
- app()->config('app.down', true);
- });
+ app()->config('mode', 'TEST');
+ app()->get('/', function () {
+ });
+ app()->script('TEST', function () {
+ app()->config('app.down', true);
+ });
- app()->run();
+ app()->run();
- expect(app()->config('mode'))->toBe('TEST');
- expect(app()->config('app.down'))->toBe(true);
+ expect(app()->config('mode'))->toBe('TEST');
+ expect(app()->config('app.down'))->toBe(true);
});
test('set error handler', function () {
- app()->config('app.down', false);
+ app()->config('app.down', false);
- $_SERVER['REQUEST_METHOD'] = 'GET';
- $_SERVER['REQUEST_URI'] = '/';
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/';
- // create an error to trigger error handler
- app()->get('/', function () {$app;});
+ // create an error to trigger error handler
+ app()->get('/', function () {
+ $app;
+ });
- app()->setErrorHandler(function () {
- app()->config('app.down', true);
- });
+ app()->setErrorHandler(function () {
+ app()->config('app.down', true);
+ });
- app()->run();
+ app()->run();
- expect(app()->config('app.down'))->toBe(true);
+ expect(app()->config('app.down'))->toBe(true);
});
test('set 404', function () {
- app()->config('app.down', false);
+ app()->config('app.down', false);
- $_SERVER['REQUEST_METHOD'] = 'GET';
- $_SERVER['REQUEST_URI'] = '/';
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/';
- app()->set404(function () {
- app()->config('app.down', true);
- });
+ app()->set404(function () {
+ app()->config('app.down', true);
+ });
- app()->run();
+ app()->run();
- expect(app()->config('app.down'))->toBe(true);
+ expect(app()->config('app.down'))->toBe(true);
});
test('leaf middleware', function () {
- $app = new Leaf\App;
- app()->config('app.down', false);
-
- class AppMid extends \Leaf\Middleware {
- public function call()
- {
- app()->config('app.down', true);
- $this->next();
- }
- }
-
- $_SERVER['REQUEST_METHOD'] = 'GET';
- $_SERVER['REQUEST_URI'] = '/';
-
- app()->use(new AppMid);
- app()->get('/', function () {});
- app()->run();
-
- expect(app()->config('app.down'))->toBe(true);
+ $app = new Leaf\App();
+ app()->config('app.down', false);
+
+ class AppMid extends \Leaf\Middleware
+ {
+ public function call()
+ {
+ app()->config('app.down', true);
+ $this->next();
+ }
+ }
+
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/';
+
+ app()->use(new AppMid());
+ app()->get('/', function () {
+ });
+ app()->run();
+
+ expect(app()->config('app.down'))->toBe(true);
});
test('in-route middleware', function () {
- $_SERVER['REQUEST_METHOD'] = 'GET';
- $_SERVER['REQUEST_URI'] = '/';
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/';
- $app = new Leaf\App;
- $app->config('app.down', false);
+ $app = new Leaf\App();
+ $app->config('app.down', false);
- $m = function () use($app) {
- $app->config('app.down', true);
- };
+ $m = function () use ($app) {
+ $app->config('app.down', true);
+ };
- $app->get('/', ['middleware' => $m, function () {}]);
- $app->run();
+ $app->get('/', ['middleware' => $m, function () {
+ }]);
+ $app->run();
- expect($app->config('app.down'))->toBe(true);
+ expect($app->config('app.down'))->toBe(true);
});
test('before route middleware', function () {
- $_SERVER['REQUEST_METHOD'] = 'GET';
- $_SERVER['REQUEST_URI'] = '/';
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/';
- $app = new Leaf\App;
+ $app = new Leaf\App();
- $app->config('inTest', 'true');
- $app->before('GET', '/', function () use($app) {
- $app->config('inTest', 'false');
- });
- $app->get('/', function () {});
- $app->run();
+ $app->config('inTest', 'true');
+ $app->before('GET', '/', function () use ($app) {
+ $app->config('inTest', 'false');
+ });
+ $app->get('/', function () {
+ });
+ $app->run();
- expect($app->config('inTest'))->toBe('false');
+ expect($app->config('inTest'))->toBe('false');
});
test('before router middleware', function () {
- $_SERVER['REQUEST_METHOD'] = 'GET';
- $_SERVER['REQUEST_URI'] = '/test';
+ $_SERVER['REQUEST_METHOD'] = 'GET';
+ $_SERVER['REQUEST_URI'] = '/test';
+
+ $app = new Leaf\App();
- $app = new Leaf\App;
-
- $app->config('inTest2', 'true');
+ $app->config('inTest2', 'true');
- $app->before('GET', '/.*', function () use($app) {
- $app->config('inTest2', 'false');
- });
- $app->get('/test', function () {});
- $app->run();
+ $app->before('GET', '/.*', function () use ($app) {
+ $app->config('inTest2', 'false');
+ });
+ $app->get('/test', function () {
+ });
+ $app->run();
- expect($app->config('inTest2'))->toBe('false');
+ expect($app->config('inTest2'))->toBe('false');
});
diff --git a/tests/config.test.php b/tests/config.test.php
index 059cf37..4867f2b 100644
--- a/tests/config.test.php
+++ b/tests/config.test.php
@@ -1,51 +1,51 @@
config('mode');
+ $appMode = app()->config('mode');
- expect($appMode)->toBe($testMode);
+ expect($appMode)->toBe($testMode);
});
test('centralized config after init', function () {
- $testMode = 'down';
+ $testMode = 'down';
- app()->config('mode', $testMode);
+ app()->config('mode', $testMode);
- $appMode = \Leaf\Config::get('mode');
+ $appMode = \Leaf\Config::get('mode');
- expect($appMode)->toBe($testMode);
+ expect($appMode)->toBe($testMode);
});
test('nested config', function () {
- app()->config('app.key', '2');
+ app()->config('app.key', '2');
- $appConfig = app()->config('app');
+ $appConfig = app()->config('app');
- expect(isset($appConfig['key']))->toBeTrue();
- expect($appConfig['key'])->toBe('2');
- expect(app()->config('app.key'))->toBe('2');
+ expect(isset($appConfig['key']))->toBeTrue();
+ expect($appConfig['key'])->toBe('2');
+ expect(app()->config('app.key'))->toBe('2');
});
test('nested config (array)', function () {
- app()->config(['app.key' => '2']);
+ app()->config(['app.key' => '2']);
- $appConfig = app()->config('app');
+ $appConfig = app()->config('app');
- expect(isset($appConfig['key']))->toBeTrue();
- expect($appConfig['key'])->toBe('2');
- expect(app()->config('app.key'))->toBe('2');
+ expect(isset($appConfig['key']))->toBeTrue();
+ expect($appConfig['key'])->toBe('2');
+ expect(app()->config('app.key'))->toBe('2');
});
test('nested config (custom group)', function () {
- app()->config(['home.key' => '2']);
+ app()->config(['home.key' => '2']);
- $homeConfig = app()->config('home');
+ $homeConfig = app()->config('home');
- expect(isset($homeConfig['key']))->toBeTrue();
- expect($homeConfig['key'])->toBe('2');
- expect(app()->config('home.key'))->toBe('2');
+ expect(isset($homeConfig['key']))->toBeTrue();
+ expect($homeConfig['key'])->toBe('2');
+ expect(app()->config('home.key'))->toBe('2');
});
diff --git a/tests/container.test.php b/tests/container.test.php
index 40cbc33..3861bac 100644
--- a/tests/container.test.php
+++ b/tests/container.test.php
@@ -1,33 +1,33 @@
request)->toBeInstanceOf(\Leaf\Http\Request::class);
- expect($app->response)->toBeInstanceOf(\Leaf\Http\Response::class);
- expect($app->headers)->toBeInstanceOf(\Leaf\Http\Headers::class);
+ expect($app->request)->toBeInstanceOf(\Leaf\Http\Request::class);
+ expect($app->response)->toBeInstanceOf(\Leaf\Http\Response::class);
+ expect($app->headers)->toBeInstanceOf(\Leaf\Http\Headers::class);
});
test('set container item', function () {
- $app = new \Leaf\App;
+ $app = new \Leaf\App();
- $app->register('req', function () {
- return new \Leaf\Http\Request();
- });
+ $app->register('req', function () {
+ return new \Leaf\Http\Request();
+ });
- expect($app->req)->toBeInstanceOf(\Leaf\Http\Request::class);
+ expect($app->req)->toBeInstanceOf(\Leaf\Http\Request::class);
});
test('directly set container item', function () {
- $app = new \Leaf\App;
+ $app = new \Leaf\App();
- $app->item = 1;
+ $app->item = 1;
- expect($app->item)->toBe(1);
+ expect($app->item)->toBe(1);
});
test('remove container item', function () {
- unset(app()->request);
+ unset(app()->request);
- expect(app()->request)->toBeFalsy();
+ expect(app()->request)->toBeFalsy();
});
diff --git a/tests/functional.test.php b/tests/functional.test.php
index 0bf918b..0dd0bbb 100644
--- a/tests/functional.test.php
+++ b/tests/functional.test.php
@@ -1,20 +1,20 @@
toBeInstanceOf(\Leaf\App::class);
+ expect(app())->toBeInstanceOf(\Leaf\App::class);
});
test('shared app instance', function () {
- $app = new \Leaf\App();
- $app->item = 1;
+ $app = new \Leaf\App();
+ $app->item = 1;
- expect(app()->item)->toBe(1);
+ expect(app()->item)->toBe(1);
});
test('functional mode response', function () {
- expect(app()->response())->toBeInstanceOf(\Leaf\Http\Response::class);
+ expect(app()->response())->toBeInstanceOf(\Leaf\Http\Response::class);
});
test('functional mode request', function () {
- expect(app()->request())->toBeInstanceOf(\Leaf\Http\Request::class);
+ expect(app()->request())->toBeInstanceOf(\Leaf\Http\Request::class);
});
diff --git a/tests/view.test.php b/tests/view.test.php
index e04aa70..41c4b8d 100644
--- a/tests/view.test.php
+++ b/tests/view.test.php
@@ -1,34 +1,35 @@
toBeInstanceOf(TView::class);
+ expect(Leaf\View::tview())->toBeInstanceOf(TView::class);
});
test('view attach with name', function () {
- Leaf\View::attach(TView::class, 'named');
+ Leaf\View::attach(TView::class, 'named');
- expect(Leaf\View::named())->toBeInstanceOf(TView::class);
+ expect(Leaf\View::named())->toBeInstanceOf(TView::class);
});
test('access attached view props', function () {
- Leaf\View::attach(TView::class, 'named');
+ Leaf\View::attach(TView::class, 'named');
- expect(Leaf\View::named()::$num)->toBe(TView::$num);
+ expect(Leaf\View::named()::$num)->toBe(TView::$num);
});
test('access attached view methods', function () {
- Leaf\View::attach(TView::class, 'named');
+ Leaf\View::attach(TView::class, 'named');
- expect(Leaf\View::named()->test())->toBe(TView::test());
+ expect(Leaf\View::named()->test())->toBe(TView::test());
});