From f30858762490fcbc817a241c6376966619cef75e Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 19 Jan 2016 15:45:51 -0700
Subject: [PATCH 01/48] add SSL page variable and also force `include_host` if
 `absolute_urls: true`

---
 system/src/Grav/Common/Page/Page.php | 29 +++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 916d99aca..9b96c83b1 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -87,6 +87,7 @@ class Page
     protected $last_modified;
     protected $home_route;
     protected $hide_home_route;
+    protected $ssl;
 
     /**
      * @var Page Unmodified (original) version of the page. Used for copying and moving the page.
@@ -361,6 +362,9 @@ class Page
             if (isset($this->header->last_modified)) {
                 $this->last_modified = (bool) $this->header->last_modified;
             }
+            if (isset($this->header->ssl)) {
+                $this->ssl = (bool) $this->header->ssl;
+            }
         }
 
         return $this->header;
@@ -1118,6 +1122,15 @@ class Page
         return $this->routable && $this->published();
     }
 
+    public function ssl($var = null)
+    {
+        if ($var !== null) {
+            $this->ssl = (bool) $var;
+        }
+
+        return $this->ssl;
+    }
+
     /**
      * Gets and Sets the process setup for this Page. This is multi-dimensional array that consists of
      * a simple array of arrays with the form array("markdown"=>true) for example
@@ -1260,9 +1273,17 @@ class Page
         /** @var Pages $pages */
         $pages = self::getGrav()['pages'];
 
+        /** @var Config $config */
+        $config = self::getGrav()['config'];
+
         /** @var Language $language */
         $language = self::getGrav()['language'];
 
+        /** @var Uri $uri */
+        $uri = self::getGrav()['uri'];
+
+        $include_port = false;
+
         // get pre-route
         if ($include_lang && $language->enabled()) {
            $pre_route = $language->getLanguageURLPrefix();
@@ -1270,6 +1291,11 @@ class Page
             $pre_route = '';
         }
 
+        // add full route if configured to do so
+        if ($config->get('system.absolute_urls', false)) {
+            $include_host = true;
+        }
+
         // get canonical route if requested
         if ($canonical) {
             $route = $pre_route . $this->routeCanonical();
@@ -1277,9 +1303,6 @@ class Page
             $route = $pre_route . $this->route();
         }
 
-        /** @var Uri $uri */
-        $uri = self::getGrav()['uri'];
-
         $rootUrl = $uri->rootUrl($include_host) . $pages->base();
 
         $url = $rootUrl.'/'.trim($route, '/') . $this->urlExtension();

From 4fa04f6eecf31388fc6aca99745b44cf65a794d0 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 19 Jan 2016 15:46:09 -0700
Subject: [PATCH 02/48] added `scheme` to URI

---
 system/src/Grav/Common/Uri.php | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index bf16db18c..235e4c18d 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -15,6 +15,7 @@ class Uri
 
     public $url;
 
+    protected $scheme;
     protected $basename;
     protected $base;
     protected $root;
@@ -35,12 +36,12 @@ class Uri
      */
     public function __construct()
     {
-        $name = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost');
-        // Remove port from HTTP_HOST generated $name
-        $name = Utils::substrToString($name, ':');
+        $host = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost');
+        // Remove port from HTTP_HOST generated $host
+        $host = Utils::substrToString($host, ':');
 
         // Validate the hostname
-        $name = preg_match(Uri::HOSTNAME_REGEX, $name) ? $name : 'unknown';
+        $host = preg_match(Uri::HOSTNAME_REGEX, $host) ? $host : 'unknown';
 
         $port = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
         $uri  = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
@@ -49,13 +50,13 @@ class Uri
 
         // set the base
         if (isset($_SERVER['HTTPS'])) {
-            $base = (strtolower(@$_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';
+            $scheme = (strtolower(@$_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';
         } else {
-            $base = 'http://';
+            $scheme = 'http://';
         }
 
         // add the sever name
-        $base .= $name;
+        $base =  $scheme . $host;
 
         // check if userdir in the path and workaround PHP bug with PHP_SELF
         if (strpos($uri, '/~') !== false && strpos($_SERVER['PHP_SELF'], '/~') === false) {
@@ -66,12 +67,13 @@ class Uri
         $address = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '::1';
 
         // check for localhost variations
-        if ($name == 'localhost' || $address == '::1' || $address == '127.0.0.1') {
+        if ($host == 'localhost' || $address == '::1' || $address == '127.0.0.1') {
             $this->host = 'localhost';
         } else {
-            $this->host = $name;
+            $this->host = $host;
         }
 
+        $this->scheme = $scheme;
         $this->port = $port;
         $this->base = $base;
         $this->uri = $uri;
@@ -328,6 +330,16 @@ class Uri
         return $this->extension;
     }
 
+    /**
+     * Return the scheme of the URI
+     *
+     * @return String The scheme of the URI
+     */
+    public function scheme()
+    {
+        return $this->scheme;
+    }
+
     /**
      * Return the host of the URI
      *
@@ -379,6 +391,7 @@ class Uri
         return $this->base;
     }
 
+
     /**
      * Return root URL to the site.
      *

From e801c8f44e02f6fcea9e5cb8e513b69982e08f45 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 19 Jan 2016 15:48:18 -0700
Subject: [PATCH 03/48] Added support for `absolute_urls: true` and page level
 ssl

---
 .../Common/Markdown/ParsedownGravTrait.php    | 57 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 3 deletions(-)

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index 6617ab5a0..f65478573 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -320,12 +320,63 @@ trait ParsedownGravTrait
                 unset ($url['query']);
             }
 
+            // set path to / if not set
+            if (empty($url['path'])) {
+                $url['path'] = '/';
+            }
+
             // if there is no scheme, the file is local and we'll need to convert that URL
             if (!isset($url['scheme']) && (count($url) > 0)) {
-                $excerpt['element']['attributes']['href'] = Uri::convertUrl($this->page, Uri::buildUrl($url), $type, true);
-            } else {
-                $excerpt['element']['attributes']['href'] = Uri::buildUrl($url);
+                $url['path'] = Uri::convertUrl($this->page, $url['path'], $type, true);
             }
+
+            // if absolute urls enabled, add them
+            if (self::getGrav()['config']->get('system.absolute_urls', false)) {
+                $uri = self::getGrav()['uri'];
+                $url['scheme'] = str_replace('://', '', $uri->scheme());
+                $url['host'] = $uri->host();
+
+                if ($uri->port() != 80 && $uri->port() != 443) {
+                    $url['port'] = $uri->port();
+                }
+
+                // check if page exists for this route, and if so, check if it has SSL enabled
+                $pages = self::getGrav()['pages'];
+                $routes = $pages->routes();
+
+                // if this is an image, get the proper path
+                $url_bits = pathinfo($url['path']);
+                if (isset($url_bits['extension'])) {
+                    $target_path = $url_bits['dirname'];
+                } else {
+                    $target_path = $url['path'];
+                }
+
+                // strip base from this path
+                $target_path = str_replace($uri->rootUrl(), '', $target_path);
+
+                // set to / if root
+                if (empty($target_path)) {
+                    $target_path = '/';
+                }
+
+                // look to see if this page exists and has ssl enabled
+                if (isset($routes[$target_path])) {
+                    $target_page = $pages->get($routes[$target_path]);
+                    if ($target_page) {
+                        $ssl_enabled = $target_page->ssl();
+                        if (isset($ssl_enabled)) {
+                            if ($ssl_enabled) {
+                                $url['scheme'] = 'https';
+                            } else {
+                                $url['scheme'] = 'http';
+                            }
+                        }
+                    }
+                }
+            }
+
+            $excerpt['element']['attributes']['href'] = Uri::buildUrl($url);
         }
 
         return $excerpt;

From af2e416ea1dcf2461cd699c7f946745b7ae92655 Mon Sep 17 00:00:00 2001
From: Tyler Cosgrove <Vivalldi@users.noreply.github.com>
Date: Wed, 27 Jan 2016 13:25:42 -0500
Subject: [PATCH 04/48] Fix for #612

---
 webserver-configs/web.config | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/webserver-configs/web.config b/webserver-configs/web.config
index e09e94fb5..9ef3d88fd 100644
--- a/webserver-configs/web.config
+++ b/webserver-configs/web.config
@@ -52,4 +52,7 @@
             </rules>
         </rewrite>
     </system.webServer>
+    <system.web>
+        <httpRuntime requestPathInvalidCharacters="&lt;,&gt;,*,%,&amp;,\,?" />
+    </system.web>
 </configuration>

From 1494247c85afdb752d9fe3b571eee6d92ac13117 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 09:08:57 +0100
Subject: [PATCH 05/48] :white_check_mark: Tests code cleanup

---
 tests/unit/Grav/Common/AssetsTest.php   | 378 +++++++---------
 tests/unit/Grav/Common/BrowserTest.php  |  14 +-
 tests/unit/Grav/Common/ComposerTest.php |   5 -
 tests/unit/Grav/Common/MarkdownTest.php |   4 -
 tests/unit/Grav/Common/UriTest.php      | 553 +++++++++++-------------
 tests/unit/Grav/Common/UtilsTest.php    |  17 +-
 6 files changed, 422 insertions(+), 549 deletions(-)

diff --git a/tests/unit/Grav/Common/AssetsTest.php b/tests/unit/Grav/Common/AssetsTest.php
index 82f37ba22..a034a7518 100644
--- a/tests/unit/Grav/Common/AssetsTest.php
+++ b/tests/unit/Grav/Common/AssetsTest.php
@@ -7,41 +7,25 @@ use Codeception\Util\Fixtures;
  */
 class AssetsTest extends \Codeception\TestCase\Test
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
     protected function _before()
     {
+        $this->grav = Fixtures::get('grav');
+        $this->assets = $this->grav['assets'];
     }
 
     protected function _after()
     {
     }
 
-    public function grav()
-    {
-        $grav = Fixtures::get('grav');
-        return $grav;
-    }
-
-    public function assets()
-    {
-        return $this->grav()['assets'];
-    }
-
     public function testAddingAssets()
     {
-        $assets = $this->assets();
-
         //test add()
-        $assets->add('test.css');
+        $this->assets->add('test.css');
 
-        $css = $assets->css();
+        $css = $this->assets->css();
         $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
 
-        $array = $assets->getCss();
+        $array = $this->assets->getCss();
         $this->assertSame(reset($array), [
             'asset' => '/test.css',
             'priority' => 10,
@@ -50,11 +34,11 @@ class AssetsTest extends \Codeception\TestCase\Test
             'group' => 'head'
         ]);
 
-        $assets->add('test.js');
-        $js = $assets->js();
+        $this->assets->add('test.js');
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
 
-        $array = $assets->getCss();
+        $array = $this->assets->getCss();
         $this->assertSame(reset($array), [
             'asset' => '/test.css',
             'priority' => 10,
@@ -64,12 +48,12 @@ class AssetsTest extends \Codeception\TestCase\Test
         ]);
 
         //test addCss(). Test adding asset to a separate group
-        $assets->reset();
-        $assets->addCSS('test.css');
-        $css = $assets->css();
+        $this->assets->reset();
+        $this->assets->addCSS('test.css');
+        $css = $this->assets->css();
         $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
 
-        $array = $assets->getCss();
+        $array = $this->assets->getCss();
         $this->assertSame(reset($array), [
             'asset' => '/test.css',
             'priority' => 10,
@@ -79,12 +63,12 @@ class AssetsTest extends \Codeception\TestCase\Test
         ]);
 
         //test addJs()
-        $assets->reset();
-        $assets->addJs('test.js');
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs('test.js');
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
 
-        $array = $assets->getJs();
+        $array = $this->assets->getJs();
         $this->assertSame(reset($array), [
             'asset' => '/test.js',
             'priority' => 10,
@@ -95,14 +79,14 @@ class AssetsTest extends \Codeception\TestCase\Test
         ]);
 
         //Test CSS Groups
-        $assets->reset();
-        $assets->addCSS('test.css', null, true, 'footer');
-        $css = $assets->css();
+        $this->assets->reset();
+        $this->assets->addCSS('test.css', null, true, 'footer');
+        $css = $this->assets->css();
         $this->assertEmpty($css);
-        $css = $assets->css('footer');
+        $css = $this->assets->css('footer');
         $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
 
-        $array = $assets->getCss();
+        $array = $this->assets->getCss();
         $this->assertSame(reset($array), [
             'asset' => '/test.css',
             'priority' => 10,
@@ -112,14 +96,14 @@ class AssetsTest extends \Codeception\TestCase\Test
         ]);
 
         //Test JS Groups
-        $assets->reset();
-        $assets->addJs('test.js', null, true, null, 'footer');
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs('test.js', null, true, null, 'footer');
+        $js = $this->assets->js();
         $this->assertEmpty($js);
-        $js = $assets->js('footer');
+        $js = $this->assets->js('footer');
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
 
-        $array = $assets->getJs();
+        $array = $this->assets->getJs();
         $this->assertSame(reset($array), [
             'asset' => '/test.js',
             'priority' => 10,
@@ -130,12 +114,12 @@ class AssetsTest extends \Codeception\TestCase\Test
         ]);
 
         //Test async / defer
-        $assets->reset();
-        $assets->addJs('test.js', null, true, 'async', null);
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs('test.js', null, true, 'async', null);
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
 
-        $array = $assets->getJs();
+        $array = $this->assets->getJs();
         $this->assertSame(reset($array), [
             'asset' => '/test.js',
             'priority' => 10,
@@ -145,12 +129,12 @@ class AssetsTest extends \Codeception\TestCase\Test
             'group' => 'head'
         ]);
 
-        $assets->reset();
-        $assets->addJs('test.js', null, true, 'defer', null);
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs('test.js', null, true, 'defer', null);
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" defer></script>' . PHP_EOL);
 
-        $array = $assets->getJs();
+        $array = $this->assets->getJs();
         $this->assertSame(reset($array), [
             'asset' => '/test.js',
             'priority' => 10,
@@ -163,49 +147,45 @@ class AssetsTest extends \Codeception\TestCase\Test
 
     public function testAddingAssetPropertiesWithArray()
     {
-        $assets = $this->assets();
-
         //Test adding assets with object to define properties
-        $assets->reset();
-        $assets->addJs('test.js', ['loading' => 'async']);
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs('test.js', ['loading' => 'async']);
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
-        $assets->reset();
+        $this->assets->reset();
 
     }
 
     public function testAddingJSAssetPropertiesWithArrayFromCollection()
     {
-        $assets = $this->assets();
-
         //Test adding properties with array
-        $assets->reset();
-        $assets->addJs('jquery', ['loading' => 'async']);
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs('jquery', ['loading' => 'async']);
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
 
         //Test priority too
-        $assets->reset();
-        $assets->addJs('jquery', ['loading' => 'async', 'priority' => 1]);
-        $assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs('jquery', ['loading' => 'async', 'priority' => 1]);
+        $this->assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL .
             '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
 
         //Test multiple groups
-        $assets->reset();
-        $assets->addJs('jquery', ['loading' => 'async', 'priority' => 1, 'group' => 'footer']);
-        $assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs('jquery', ['loading' => 'async', 'priority' => 1, 'group' => 'footer']);
+        $this->assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
-        $js = $assets->js('footer');
+        $js = $this->assets->js('footer');
         $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
 
         //Test adding array of assets
         //Test priority too
-        $assets->reset();
-        $assets->addJs(['jquery', 'test.js'], ['loading' => 'async']);
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addJs(['jquery', 'test.js'], ['loading' => 'async']);
+        $js = $this->assets->js();
 
         $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL .
             '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
@@ -213,64 +193,60 @@ class AssetsTest extends \Codeception\TestCase\Test
 
     public function testAddingCSSAssetPropertiesWithArrayFromCollection()
     {
-        $assets = $this->assets();
-
-        $assets->registerCollection('test', ['/system/assets/whoops.css']);
+        $this->assets->registerCollection('test', ['/system/assets/whoops.css']);
 
         //Test priority too
-        $assets->reset();
-        $assets->addCss('test', ['priority' => 1]);
-        $assets->addCss('test.css', ['priority' => 2]);
-        $css = $assets->css();
+        $this->assets->reset();
+        $this->assets->addCss('test', ['priority' => 1]);
+        $this->assets->addCss('test.css', ['priority' => 2]);
+        $css = $this->assets->css();
         $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
             '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
 
         //Test multiple groups
-        $assets->reset();
-        $assets->addCss('test', ['priority' => 1, 'group' => 'footer']);
-        $assets->addCss('test.css', ['priority' => 2]);
-        $css = $assets->css();
+        $this->assets->reset();
+        $this->assets->addCss('test', ['priority' => 1, 'group' => 'footer']);
+        $this->assets->addCss('test.css', ['priority' => 2]);
+        $css = $this->assets->css();
         $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
-        $css = $assets->css('footer');
+        $css = $this->assets->css('footer');
         $this->assertSame($css, '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
 
         //Test adding array of assets
         //Test priority too
-        $assets->reset();
-        $assets->addCss(['test', 'test.css'], ['loading' => 'async']);
-        $css = $assets->css();
+        $this->assets->reset();
+        $this->assets->addCss(['test', 'test.css'], ['loading' => 'async']);
+        $css = $this->assets->css();
         $this->assertSame($css, '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
             '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
     }
 
     public function testPriorityOfAssets()
     {
-        $assets = $this->assets();
+        $this->assets->reset();
+        $this->assets->add('test.css');
+        $this->assets->add('test-after.css');
 
-        $assets->reset();
-        $assets->add('test.css');
-        $assets->add('test-after.css');
-
-        $css = $assets->css();
+        $css = $this->assets->css();
         $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
             '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
 
         //----------------
-        $assets->reset();
-        $assets->add('test-after.css', 1);
-        $assets->add('test.css', 2);
+        $this->assets->reset();
+        $this->assets->add('test-after.css', 1);
+        $this->assets->add('test.css', 2);
 
-        $css = $assets->css();
+        $css = $this->assets->css();
         $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
             '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
 
         //----------------
-        $assets->reset();
-        $assets->add('test-after.css', 1);
-        $assets->add('test.css', 2);
-        $assets->add('test-before.css', 3);
+        $this->assets->reset();
+        $this->assets->add('test-after.css', 1);
+        $this->assets->add('test.css', 2);
+        $this->assets->add('test-before.css', 3);
 
-        $css = $assets->css();
+        $css = $this->assets->css();
         $this->assertSame($css, '<link href="/test-before.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
             '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
             '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
@@ -278,196 +254,172 @@ class AssetsTest extends \Codeception\TestCase\Test
 
     public function testPipeline()
     {
-        $assets = $this->assets();
-
-        $assets->reset();
+        $this->assets->reset();
 
         //File not existing. Pipeline searches for that file without reaching it. Output is empty.
-        $assets->add('test.css', null, true);
-        $assets->setCssPipeline(true);
-        $css = $assets->css();
+        $this->assets->add('test.css', null, true);
+        $this->assets->setCssPipeline(true);
+        $css = $this->assets->css();
         $this->assertSame($css, '');
 
         //Add a core Grav CSS file, which is found. Pipeline will now return a file
-        $assets->add('/system/assets/debugger.css', null, true);
-        $css = $assets->css();
+        $this->assets->add('/system/assets/debugger.css', null, true);
+        $css = $this->assets->css();
         $this->assertContains('<link href=', $css);
         $this->assertContains('type="text/css" rel="stylesheet" />', $css);
     }
 
     public function testAddAsyncJs()
     {
-        $assets = $this->assets();
-
-        $assets->reset();
-        $assets->addAsyncJs('jquery');
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addAsyncJs('jquery');
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
     }
 
     public function testAddDeferJs()
     {
-        $assets = $this->assets();
-
-        $assets->reset();
-        $assets->addDeferJs('jquery');
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addDeferJs('jquery');
+        $js = $this->assets->js();
         $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" defer></script>' . PHP_EOL);
     }
 
     public function testAddInlineCss()
     {
-        $assets = $this->assets();
-
-        $assets->reset();
-        $assets->addInlineCss('body { color: black }');
-        $css = $assets->css();
+        $this->assets->reset();
+        $this->assets->addInlineCss('body { color: black }');
+        $css = $this->assets->css();
         $this->assertSame($css, PHP_EOL. '<style>' .PHP_EOL . 'body { color: black }' . PHP_EOL.PHP_EOL .'</style>' . PHP_EOL);
     }
 
     public function testAddInlineJs()
     {
-        $assets = $this->assets();
-
-        $assets->reset();
-        $assets->addInlineJs('alert("test")');
-        $js = $assets->js();
+        $this->assets->reset();
+        $this->assets->addInlineJs('alert("test")');
+        $js = $this->assets->js();
         $this->assertSame($js,
             PHP_EOL . '<script>' . PHP_EOL . 'alert("test")' . PHP_EOL . PHP_EOL . '</script>' . PHP_EOL);
     }
 
     public function testGetCollections()
     {
-        $assets = $this->assets();
-
-        $this->assertTrue(is_array($assets->getCollections()));
-        $this->assertTrue(in_array('jquery', array_keys($assets->getCollections())));
-        $this->assertTrue(in_array('system://assets/jquery/jquery-2.x.min.js', $assets->getCollections()));
+        $this->assertTrue(is_array($this->assets->getCollections()));
+        $this->assertTrue(in_array('jquery', array_keys($this->assets->getCollections())));
+        $this->assertTrue(in_array('system://assets/jquery/jquery-2.x.min.js', $this->assets->getCollections()));
     }
 
     public function testExists()
     {
-        $assets = $this->assets();
-
-        $this->assertTrue($assets->exists('jquery'));
-        $this->assertFalse($assets->exists('another-unexisting-library'));
+        $this->assertTrue($this->assets->exists('jquery'));
+        $this->assertFalse($this->assets->exists('another-unexisting-library'));
     }
 
     public function testRegisterCollection()
     {
-        $assets = $this->assets();
-
-        $assets->registerCollection('debugger', ['/system/assets/debugger.css']);
-        $this->assertTrue($assets->exists('debugger'));
-        $this->assertTrue(in_array('debugger', array_keys($assets->getCollections())));
+        $this->assets->registerCollection('debugger', ['/system/assets/debugger.css']);
+        $this->assertTrue($this->assets->exists('debugger'));
+        $this->assertTrue(in_array('debugger', array_keys($this->assets->getCollections())));
     }
 
     public function testReset()
     {
-        $assets = $this->assets();
+        $this->assets->addInlineJs('alert("test")');
+        $this->assets->reset();
+        $this->assertTrue(count($this->assets->js()) == 0);
 
-        $assets->addInlineJs('alert("test")');
-        $assets->reset();
-        $this->assertTrue(count($assets->js()) == 0);
+        $this->assets->addAsyncJs('jquery');
+        $this->assets->reset();
 
-        $assets->addAsyncJs('jquery');
-        $assets->reset();
+        $this->assertTrue(count($this->assets->js()) == 0);
 
-        $this->assertTrue(count($assets->js()) == 0);
+        $this->assets->addInlineCss('body { color: black }');
+        $this->assets->reset();
 
-        $assets->addInlineCss('body { color: black }');
-        $assets->reset();
+        $this->assertTrue(count($this->assets->css()) == 0);
 
-        $this->assertTrue(count($assets->css()) == 0);
+        $this->assets->add('/system/assets/debugger.css', null, true);
+        $this->assets->reset();
 
-        $assets->add('/system/assets/debugger.css', null, true);
-        $assets->reset();
-
-        $this->assertTrue(count($assets->css()) == 0);
+        $this->assertTrue(count($this->assets->css()) == 0);
     }
 
     public function testResetJs()
     {
-        $assets = $this->assets();
+        $this->assets->addInlineJs('alert("test")');
+        $this->assets->resetJs();
+        $this->assertTrue(count($this->assets->js()) == 0);
 
-        $assets->addInlineJs('alert("test")');
-        $assets->resetJs();
-        $this->assertTrue(count($assets->js()) == 0);
+        $this->assets->addAsyncJs('jquery');
+        $this->assets->resetJs();
 
-        $assets->addAsyncJs('jquery');
-        $assets->resetJs();
-
-        $this->assertTrue(count($assets->js()) == 0);
+        $this->assertTrue(count($this->assets->js()) == 0);
     }
 
     public function testResetCss()
     {
-        $assets = $this->assets();
+        $this->assertTrue(count($this->assets->js()) == 0);
 
-        $this->assertTrue(count($assets->js()) == 0);
+        $this->assets->addInlineCss('body { color: black }');
+        $this->assets->resetCss();
 
-        $assets->addInlineCss('body { color: black }');
-        $assets->resetCss();
+        $this->assertTrue(count($this->assets->css()) == 0);
 
-        $this->assertTrue(count($assets->css()) == 0);
+        $this->assets->add('/system/assets/debugger.css', null, true);
+        $this->assets->resetCss();
 
-        $assets->add('/system/assets/debugger.css', null, true);
-        $assets->resetCss();
-
-        $this->assertTrue(count($assets->css()) == 0);
+        $this->assertTrue(count($this->assets->css()) == 0);
     }
 
     public function testAddDirCss()
     {
-        $assets = $this->assets();
-        $assets->reset();
-        $assets->addDirCss('/system');
+        $this->assets->addDirCss('/system');
 
-        $this->assertTrue(is_array($assets->getCss()));
-        $this->assertTrue(count($assets->getCss()) > 0);
-        $this->assertTrue(is_array($assets->getJs()));
-        $this->assertTrue(count($assets->getJs()) == 0);
+        $this->assertTrue(is_array($this->assets->getCss()));
+        $this->assertTrue(count($this->assets->getCss()) > 0);
+        $this->assertTrue(is_array($this->assets->getJs()));
+        $this->assertTrue(count($this->assets->getJs()) == 0);
 
-        $assets->reset();
-        $assets->addDirCss('/system/assets');
+        $this->assets->reset();
+        $this->assets->addDirCss('/system/assets');
 
-        $this->assertTrue(is_array($assets->getCss()));
-        $this->assertTrue(count($assets->getCss()) > 0);
-        $this->assertTrue(is_array($assets->getJs()));
-        $this->assertTrue(count($assets->getJs()) == 0);
+        $this->assertTrue(is_array($this->assets->getCss()));
+        $this->assertTrue(count($this->assets->getCss()) > 0);
+        $this->assertTrue(is_array($this->assets->getJs()));
+        $this->assertTrue(count($this->assets->getJs()) == 0);
 
-        $assets->reset();
-        $assets->addDirJs('/system');
+        $this->assets->reset();
+        $this->assets->addDirJs('/system');
 
-        $this->assertTrue(is_array($assets->getCss()));
-        $this->assertTrue(count($assets->getCss()) == 0);
-        $this->assertTrue(is_array($assets->getJs()));
-        $this->assertTrue(count($assets->getJs()) > 0);
+        $this->assertTrue(is_array($this->assets->getCss()));
+        $this->assertTrue(count($this->assets->getCss()) == 0);
+        $this->assertTrue(is_array($this->assets->getJs()));
+        $this->assertTrue(count($this->assets->getJs()) > 0);
 
-        $assets->reset();
-        $assets->addDirJs('/system/assets');
+        $this->assets->reset();
+        $this->assets->addDirJs('/system/assets');
 
-        $this->assertTrue(is_array($assets->getCss()));
-        $this->assertTrue(count($assets->getCss()) == 0);
-        $this->assertTrue(is_array($assets->getJs()));
-        $this->assertTrue(count($assets->getJs()) > 0);
+        $this->assertTrue(is_array($this->assets->getCss()));
+        $this->assertTrue(count($this->assets->getCss()) == 0);
+        $this->assertTrue(is_array($this->assets->getJs()));
+        $this->assertTrue(count($this->assets->getJs()) > 0);
 
-        $assets->reset();
-        $assets->addDir('/system/assets');
+        $this->assets->reset();
+        $this->assets->addDir('/system/assets');
 
-        $this->assertTrue(is_array($assets->getCss()));
-        $this->assertTrue(count($assets->getCss()) > 0);
-        $this->assertTrue(is_array($assets->getJs()));
-        $this->assertTrue(count($assets->getJs()) > 0);
+        $this->assertTrue(is_array($this->assets->getCss()));
+        $this->assertTrue(count($this->assets->getCss()) > 0);
+        $this->assertTrue(is_array($this->assets->getJs()));
+        $this->assertTrue(count($this->assets->getJs()) > 0);
 
         //Use streams
-        $assets->reset();
-        $assets->addDir('system://assets');
+        $this->assets->reset();
+        $this->assets->addDir('system://assets');
 
-        $this->assertTrue(is_array($assets->getCss()));
-        $this->assertTrue(count($assets->getCss()) > 0);
-        $this->assertTrue(is_array($assets->getJs()));
-        $this->assertTrue(count($assets->getJs()) > 0);
+        $this->assertTrue(is_array($this->assets->getCss()));
+        $this->assertTrue(count($this->assets->getCss()) > 0);
+        $this->assertTrue(is_array($this->assets->getJs()));
+        $this->assertTrue(count($this->assets->getJs()) > 0);
 
     }
 }
diff --git a/tests/unit/Grav/Common/BrowserTest.php b/tests/unit/Grav/Common/BrowserTest.php
index c91a31bb9..1825c93b1 100644
--- a/tests/unit/Grav/Common/BrowserTest.php
+++ b/tests/unit/Grav/Common/BrowserTest.php
@@ -4,24 +4,16 @@ use Codeception\Util\Fixtures;
 
 class BrowserTest extends \Codeception\TestCase\Test
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
     protected function _before()
     {
+        $this->grav = Fixtures::get('grav');
+        $this->assets = $this->grav['assets'];
     }
 
     protected function _after()
     {
     }
 
-    public function grav()
-    {
-        return Fixtures::get('grav');
-    }
-
     public function testGetBrowser() { /* Already covered by PhpUserAgent tests */ }
     public function testGetPlatform() { /* Already covered by PhpUserAgent tests */ }
     public function testGetLongVersion() { /* Already covered by PhpUserAgent tests */ }
@@ -32,7 +24,7 @@ class BrowserTest extends \Codeception\TestCase\Test
         //Already Partially covered by PhpUserAgent tests
 
         //Make sure it recognizes the test as not human
-        $this->assertFalse($this->grav()['browser']->isHuman());
+        $this->assertFalse($this->grav['browser']->isHuman());
     }
 }
 
diff --git a/tests/unit/Grav/Common/ComposerTest.php b/tests/unit/Grav/Common/ComposerTest.php
index 4823c377c..da64b667f 100644
--- a/tests/unit/Grav/Common/ComposerTest.php
+++ b/tests/unit/Grav/Common/ComposerTest.php
@@ -5,11 +5,6 @@ use Grav\Common\Composer;
 
 class ComposerTest extends \Codeception\TestCase\Test
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
     protected function _before()
     {
     }
diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index 9b08c5169..d14d30cb1 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -7,10 +7,6 @@ use Codeception\Util\Fixtures;
  */
 class MarkdownTest extends \Codeception\TestCase\Test
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
     protected $parsedown;
 
     protected function _before()
diff --git a/tests/unit/Grav/Common/UriTest.php b/tests/unit/Grav/Common/UriTest.php
index 94c2f6c88..ed75871e2 100644
--- a/tests/unit/Grav/Common/UriTest.php
+++ b/tests/unit/Grav/Common/UriTest.php
@@ -6,410 +6,361 @@ use Grav\Common\Utils;
 
 class UriTest extends \Codeception\TestCase\Test
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
     protected function _before()
     {
+        $this->grav = Fixtures::get('grav');
+        $this->uri = $this->grav['uri'];
     }
 
     protected function _after()
     {
     }
 
-    public function grav()
-    {
-        return Fixtures::get('grav');
-    }
-
-    public function getURI()
-    {
-        return $this->grav()['uri'];
-    }
-
     public function testValidatingHostname()
     {
-        $uri = $this->getURI();
+        $this->assertTrue($this->uri->validateHostname('localhost') == 1);
+        $this->assertTrue($this->uri->validateHostname('google.com') == 1);
+        $this->assertTrue($this->uri->validateHostname('google.it') == 1);
+        $this->assertTrue($this->uri->validateHostname('goog.le') == 1);
+        $this->assertTrue($this->uri->validateHostname('goog.wine') == 1);
+        $this->assertTrue($this->uri->validateHostname('goog.localhost') == 1);
 
-        $this->assertTrue($uri->validateHostname('localhost') == 1);
-        $this->assertTrue($uri->validateHostname('google.com') == 1);
-        $this->assertTrue($uri->validateHostname('google.it') == 1);
-        $this->assertTrue($uri->validateHostname('goog.le') == 1);
-        $this->assertTrue($uri->validateHostname('goog.wine') == 1);
-        $this->assertTrue($uri->validateHostname('goog.localhost') == 1);
-
-        $this->assertFalse($uri->validateHostname('localhost:80') == 1);
-        $this->assertFalse($uri->validateHostname('http://localhost') == 1);
-        $this->assertFalse($uri->validateHostname('localhost!') == 1);
+        $this->assertFalse($this->uri->validateHostname('localhost:80') == 1);
+        $this->assertFalse($this->uri->validateHostname('http://localhost') == 1);
+        $this->assertFalse($this->uri->validateHostname('localhost!') == 1);
     }
 
     public function testInitializingUris()
     {
-        $uri = $this->getURI();
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertTrue($this->uri->params() == null);
+        $this->assertTrue($this->uri->query() == '');
 
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertTrue($uri->params() == null);
-        $this->assertTrue($uri->query() == '');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertFalse($this->uri->params() == null);
+        $this->assertTrue($this->uri->query() == '');
 
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertFalse($uri->params() == null);
-        $this->assertTrue($uri->query() == '');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
 
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
+        $this->assertTrue($this->uri->params() == null);
+        $this->assertTrue($this->uri->query() != '');
+        $this->assertTrue($this->uri->query() == 'test=x');
+        $this->assertTrue($this->uri->port() == '8080');
 
-        $this->assertTrue($uri->params() == null);
-        $this->assertTrue($uri->query() != '');
-        $this->assertTrue($uri->query() == 'test=x');
-        $this->assertTrue($uri->port() == '8080');
+        $this->uri->initializeWithURL('http://localhost:80/grav/it/ueper?test=x')->init();
+        $this->assertTrue($this->uri->port() == '80');
 
-        $uri->initializeWithURL('http://localhost:80/grav/it/ueper?test=x')->init();
-        $this->assertTrue($uri->port() == '80');
+        $this->uri->initializeWithURL('http://localhost/grav/it/ueper?test=x')->init();
+        $this->assertTrue($this->uri->port() == '80');
 
-        $uri->initializeWithURL('http://localhost/grav/it/ueper?test=x')->init();
-        $this->assertTrue($uri->port() == '80');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertTrue($this->uri->params() == null);
 
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertTrue($uri->params() == null);
-
-        $uri->initializeWithURL('http://grav/grav/it/ueper')->init();
-        $this->assertTrue($uri->params() == null);
+        $this->uri->initializeWithURL('http://grav/grav/it/ueper')->init();
+        $this->assertTrue($this->uri->params() == null);
     }
 
     public function testPaths()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($uri->paths(), ['grav', 'it', 'ueper']);
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($uri->paths(), ['grav', 'it']);
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($uri->paths(), ['grav', 'it', 'ueper']);
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($uri->paths(), ['a', 'b', 'c', 'd']);
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($uri->paths(), ['a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f']);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertSame($this->uri->paths(), ['grav', 'it', 'ueper']);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertSame($this->uri->paths(), ['grav', 'it']);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
+        $this->assertSame($this->uri->paths(), ['grav', 'it', 'ueper']);
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
+        $this->assertSame($this->uri->paths(), ['a', 'b', 'c', 'd']);
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
+        $this->assertSame($this->uri->paths(), ['a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f']);
     }
 
     public function testRoute()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($uri->route(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($uri->route(), '/grav/it');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($uri->route(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($uri->route(), '/a/b/c/d');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($uri->route(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertSame($this->uri->route(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertSame($this->uri->route(), '/grav/it');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
+        $this->assertSame($this->uri->route(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
+        $this->assertSame($this->uri->route(), '/a/b/c/d');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
+        $this->assertSame($this->uri->route(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
     }
 
     public function testQuery()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($uri->query(), '');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($uri->query(), '');
-        $this->assertSame($uri->query('id'), null);
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($uri->query(), 'test=x');
-        $this->assertSame($uri->query('id'), null);
-        $this->assertSame($uri->query('test'), 'x');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($uri->query(), 'test=x&test2=y');
-        $this->assertSame($uri->query('id'), null);
-        $this->assertSame($uri->query('test'), 'x');
-        $this->assertSame($uri->query('test2'), 'y');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($uri->query(), 'test=x&test2=y&test3=x&test4=y');
-        $this->assertSame($uri->query('id'), null);
-        $this->assertSame($uri->query('test'), 'x');
-        $this->assertSame($uri->query('test2'), 'y');
-        $this->assertSame($uri->query('test4'), 'y');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertSame($this->uri->query(), '');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertSame($this->uri->query(), '');
+        $this->assertSame($this->uri->query('id'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
+        $this->assertSame($this->uri->query(), 'test=x');
+        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame($this->uri->query('test'), 'x');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
+        $this->assertSame($this->uri->query(), 'test=x&test2=y');
+        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame($this->uri->query('test'), 'x');
+        $this->assertSame($this->uri->query('test2'), 'y');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
+        $this->assertSame($this->uri->query(), 'test=x&test2=y&test3=x&test4=y');
+        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame($this->uri->query('test'), 'x');
+        $this->assertSame($this->uri->query('test2'), 'y');
+        $this->assertSame($this->uri->query('test4'), 'y');
         //Test all after the ? is encoded in the query
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($uri->query(), 'test=x&test2=y&test3=x&test4=y%2Ftest');
-        $this->assertSame($uri->query('id'), null);
-        $this->assertSame($uri->query('test'), 'x');
-        $this->assertSame($uri->query('test2'), 'y');
-        $this->assertSame($uri->query('test4'), 'y/test');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($uri->query(), '');
-        $this->assertSame($uri->query('id'), null);
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($uri->query(), '');
-        $this->assertSame($uri->query('id'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
+        $this->assertSame($this->uri->query(), 'test=x&test2=y&test3=x&test4=y%2Ftest');
+        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame($this->uri->query('test'), 'x');
+        $this->assertSame($this->uri->query('test2'), 'y');
+        $this->assertSame($this->uri->query('test4'), 'y/test');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
+        $this->assertSame($this->uri->query(), '');
+        $this->assertSame($this->uri->query('id'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
+        $this->assertSame($this->uri->query(), '');
+        $this->assertSame($this->uri->query('id'), null);
     }
 
     public function testParams()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($uri->params(), null);
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($uri->params(), '/ueper:xxx');
-        $this->assertSame($uri->params('ueper'), '/ueper:xxx');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($uri->params(), '/ueper:xxx/test:yyy');
-        $this->assertSame($uri->params('ueper'), '/ueper:xxx');
-        $this->assertSame($uri->params('test'), '/test:yyy');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($uri->params(), null);
-        $this->assertSame($uri->params('ueper'), null);
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($uri->params(), null);
-        $this->assertSame($uri->params('ueper'), null);
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($uri->params(), null);
-        $this->assertSame($uri->params('ueper'), null);
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($uri->params(), null);
-        $this->assertSame($uri->params('ueper'), null);
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($uri->params(), null);
-        $this->assertSame($uri->params('ueper'), null);
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($uri->params(), null);
-        $this->assertSame($uri->params('ueper'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertSame($this->uri->params(), null);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertSame($this->uri->params(), '/ueper:xxx');
+        $this->assertSame($this->uri->params('ueper'), '/ueper:xxx');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
+        $this->assertSame($this->uri->params(), '/ueper:xxx/test:yyy');
+        $this->assertSame($this->uri->params('ueper'), '/ueper:xxx');
+        $this->assertSame($this->uri->params('test'), '/test:yyy');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
+        $this->assertSame($this->uri->params(), null);
+        $this->assertSame($this->uri->params('ueper'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
+        $this->assertSame($this->uri->params(), null);
+        $this->assertSame($this->uri->params('ueper'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
+        $this->assertSame($this->uri->params(), null);
+        $this->assertSame($this->uri->params('ueper'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
+        $this->assertSame($this->uri->params(), null);
+        $this->assertSame($this->uri->params('ueper'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
+        $this->assertSame($this->uri->params(), null);
+        $this->assertSame($this->uri->params('ueper'), null);
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
+        $this->assertSame($this->uri->params(), null);
+        $this->assertSame($this->uri->params('ueper'), null);
     }
 
     public function testParam()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($uri->param('ueper'), 'xxx');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($uri->param('ueper'), 'xxx');
-        $this->assertSame($uri->param('test'), 'yyy');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertSame($this->uri->param('ueper'), 'xxx');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
+        $this->assertSame($this->uri->param('ueper'), 'xxx');
+        $this->assertSame($this->uri->param('test'), 'yyy');
     }
 
     public function testUrl()
     {
-        $uri = $this->getURI();
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($uri->url(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($uri->url(), '/grav/it');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($uri->url(), '/grav/it');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($uri->url(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($uri->url(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($uri->url(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($uri->url(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($uri->url(), '/a/b/c/d');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($uri->url(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertSame($this->uri->url(), '/grav/it');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
+        $this->assertSame($this->uri->url(), '/grav/it');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
+        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
+        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
+        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
+        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
+        $this->assertSame($this->uri->url(), '/a/b/c/d');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
+        $this->assertSame($this->uri->url(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
     }
 
     public function testPath()
     {
-        $uri = $this->getURI();
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($uri->path(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($uri->path(), '/grav/it');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($uri->path(), '/grav/it');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($uri->path(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($uri->path(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($uri->path(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($uri->path(), '/grav/it/ueper');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($uri->path(), '/a/b/c/d');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($uri->path(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
-        $uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($uri->path(), '/');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertSame($this->uri->path(), '/grav/it');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
+        $this->assertSame($this->uri->path(), '/grav/it');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
+        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
+        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
+        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
+        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
+        $this->assertSame($this->uri->path(), '/a/b/c/d');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
+        $this->assertSame($this->uri->path(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->uri->initializeWithURL('http://localhost/')->init();
+        $this->assertSame($this->uri->path(), '/');
     }
 
     public function testExtension()
     {
-        $uri = $this->getURI();
-        $uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($uri->extension(), null);
-        $uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($uri->extension('x'), 'x');
-        $uri->initializeWithURL('http://localhost/a-page.html')->init();
-        $this->assertSame($uri->extension(), 'html');
-        $uri->initializeWithURL('http://localhost/a-page.xml')->init();
-        $this->assertSame($uri->extension(), 'xml');
-        $uri->initializeWithURL('http://localhost/a-page.foo')->init();
-        $this->assertSame($uri->extension(), 'foo');
+        $this->uri->initializeWithURL('http://localhost/a-page')->init();
+        $this->assertSame($this->uri->extension(), null);
+        $this->uri->initializeWithURL('http://localhost/a-page')->init();
+        $this->assertSame($this->uri->extension('x'), 'x');
+        $this->uri->initializeWithURL('http://localhost/a-page.html')->init();
+        $this->assertSame($this->uri->extension(), 'html');
+        $this->uri->initializeWithURL('http://localhost/a-page.xml')->init();
+        $this->assertSame($this->uri->extension(), 'xml');
+        $this->uri->initializeWithURL('http://localhost/a-page.foo')->init();
+        $this->assertSame($this->uri->extension(), 'foo');
     }
 
     public function testHost()
     {
-        $uri = $this->getURI();
-
         $address = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '::1';
-        if ($uri->host() == 'localhost' || $address == '::1' || $address == '127.0.0.1') {
+        if ($this->uri->host() == 'localhost' || $address == '::1' || $address == '127.0.0.1') {
             $address = 'localhost';
         }
 
-        $uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($uri->host(), $address);
-        $uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($uri->host(), $address);
+        $this->uri->initializeWithURL('http://localhost/a-page')->init();
+        $this->assertSame($this->uri->host(), $address);
+        $this->uri->initializeWithURL('http://localhost/')->init();
+        $this->assertSame($this->uri->host(), $address);
         //Host is set to localhost when running from local
-        $uri->initializeWithURL('http://google.com/')->init();
-        $this->assertSame($uri->host(), $address);
+        $this->uri->initializeWithURL('http://google.com/')->init();
+        $this->assertSame($this->uri->host(), $address);
     }
 
     public function testPort()
     {
-        $uri = $this->getURI();
-        $uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($uri->port(), '80');
-        $uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($uri->port(), 8080);
-        $uri->initializeWithURL('http://localhost:443/a-page')->init();
-        $this->assertSame($uri->port(), 443);
-        $uri->initializeWithURL('https://localhost/a-page')->init();
-        $this->assertSame($uri->port(), '80');
+        $this->uri->initializeWithURL('http://localhost/a-page')->init();
+        $this->assertSame($this->uri->port(), '80');
+        $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
+        $this->assertSame($this->uri->port(), 8080);
+        $this->uri->initializeWithURL('http://localhost:443/a-page')->init();
+        $this->assertSame($this->uri->port(), 443);
+        $this->uri->initializeWithURL('https://localhost/a-page')->init();
+        $this->assertSame($this->uri->port(), '80');
     }
 
     public function testEnvironment()
     {
-        $uri = $this->getURI();
-
         $address = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : '::1';
-        if ($uri->host() == 'localhost' || $address == '::1' || $address == '127.0.0.1') {
+        if ($this->uri->host() == 'localhost' || $address == '::1' || $address == '127.0.0.1') {
             $address = 'localhost';
         }
 
-        $uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($uri->environment(), $address);
-        $uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($uri->environment(), $address);
-        $uri->initializeWithURL('http://foobar.it:443/a-page')->init();
-        $this->assertSame($uri->environment(), $address);
-        $uri->initializeWithURL('https://google.com/a-page')->init();
-        $this->assertSame($uri->environment(), $address);
+        $this->uri->initializeWithURL('http://localhost/a-page')->init();
+        $this->assertSame($this->uri->environment(), $address);
+        $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
+        $this->assertSame($this->uri->environment(), $address);
+        $this->uri->initializeWithURL('http://foobar.it:443/a-page')->init();
+        $this->assertSame($this->uri->environment(), $address);
+        $this->uri->initializeWithURL('https://google.com/a-page')->init();
+        $this->assertSame($this->uri->environment(), $address);
     }
 
     public function testBasename()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($uri->basename(), 'ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($uri->basename(), 'it');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($uri->basename(), 'it');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($uri->basename(), 'ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($uri->basename(), 'ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($uri->basename(), 'ueper');
-        $uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($uri->basename(), 'ueper');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($uri->basename(), 'd');
-        $uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($uri->basename(), 'f');
-        $uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($uri->basename(), '');
-        $uri->initializeWithURL('http://localhost/test.xml')->init();
-        $this->assertSame($uri->basename(), 'test.xml');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
+        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
+        $this->assertSame($this->uri->basename(), 'it');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
+        $this->assertSame($this->uri->basename(), 'it');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
+        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
+        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
+        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
+        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
+        $this->assertSame($this->uri->basename(), 'd');
+        $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
+        $this->assertSame($this->uri->basename(), 'f');
+        $this->uri->initializeWithURL('http://localhost/')->init();
+        $this->assertSame($this->uri->basename(), '');
+        $this->uri->initializeWithURL('http://localhost/test.xml')->init();
+        $this->assertSame($this->uri->basename(), 'test.xml');
     }
 
     public function testBase()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($uri->base(), 'http://localhost');
-        $uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($uri->base(), 'http://localhost:8080');
-        $uri->initializeWithURL('http://foobar.it:80/a-page')->init();
-        $this->assertSame($uri->base(), 'http://foobar.it');
-        $uri->initializeWithURL('https://google.com/a-page')->init();
-        $this->assertSame($uri->base(), 'http://google.com');
+        $this->uri->initializeWithURL('http://localhost/a-page')->init();
+        $this->assertSame($this->uri->base(), 'http://localhost');
+        $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
+        $this->assertSame($this->uri->base(), 'http://localhost:8080');
+        $this->uri->initializeWithURL('http://foobar.it:80/a-page')->init();
+        $this->assertSame($this->uri->base(), 'http://foobar.it');
+        $this->uri->initializeWithURL('https://google.com/a-page')->init();
+        $this->assertSame($this->uri->base(), 'http://google.com');
     }
 
     public function testRootUrl()
     {
-        $uri = $this->getURI();
-
         //Without explicitly adding the root path via `initializeWithUrlAndRootPath`,
         //tests always default to the base empty root path
-        $uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($uri->rootUrl(true), 'http://localhost');
-        $uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($uri->rootUrl(true), 'http://localhost:8080');
-        $uri->initializeWithURL('http://foobar.it:80/a-page')->init();
-        $this->assertSame($uri->rootUrl(true), 'http://foobar.it');
-        $uri->initializeWithURL('https://google.com/a-page/xxx')->init();
-        $this->assertSame($uri->rootUrl(true), 'http://google.com');
+        $this->uri->initializeWithURL('http://localhost/a-page')->init();
+        $this->assertSame($this->uri->rootUrl(true), 'http://localhost');
+        $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
+        $this->assertSame($this->uri->rootUrl(true), 'http://localhost:8080');
+        $this->uri->initializeWithURL('http://foobar.it:80/a-page')->init();
+        $this->assertSame($this->uri->rootUrl(true), 'http://foobar.it');
+        $this->uri->initializeWithURL('https://google.com/a-page/xxx')->init();
+        $this->assertSame($this->uri->rootUrl(true), 'http://google.com');
 
-        $uri->initializeWithUrlAndRootPath('https://localhost/grav/page-foo', '/grav')->init();
-        $this->assertSame($uri->rootUrl(), '/grav');
-        $this->assertSame($uri->rootUrl(true), 'http://localhost/grav');
+        $this->uri->initializeWithUrlAndRootPath('https://localhost/grav/page-foo', '/grav')->init();
+        $this->assertSame($this->uri->rootUrl(), '/grav');
+        $this->assertSame($this->uri->rootUrl(true), 'http://localhost/grav');
     }
 
     public function testCurrentPage()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($uri->currentPage(), 'test');
-        $uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($uri->currentPage(), 1);
-        $uri->initializeWithURL('http://localhost:8080/a-page/page:2')->init();
-        $this->assertSame($uri->currentPage(), '2');
-        $uri->initializeWithURL('http://localhost:8080/a-page/page:x')->init();
-        $this->assertSame($uri->currentPage(), 'x');
-        $uri->initializeWithURL('http://localhost:8080/a-page/page:')->init();
-        $this->assertSame($uri->currentPage(), '');
+        $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
+        $this->assertSame($this->uri->currentPage(), 'test');
+        $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
+        $this->assertSame($this->uri->currentPage(), 1);
+        $this->uri->initializeWithURL('http://localhost:8080/a-page/page:2')->init();
+        $this->assertSame($this->uri->currentPage(), '2');
+        $this->uri->initializeWithURL('http://localhost:8080/a-page/page:x')->init();
+        $this->assertSame($this->uri->currentPage(), 'x');
+        $this->uri->initializeWithURL('http://localhost:8080/a-page/page:')->init();
+        $this->assertSame($this->uri->currentPage(), '');
     }
 
     public function testReferrer()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($uri->referrer(), '/foo');
-        $uri->initializeWithURL('http://localhost/foo/bar/page:test')->init();
-        $this->assertSame($uri->referrer(), '/foo/bar');
+        $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
+        $this->assertSame($this->uri->referrer(), '/foo');
+        $this->uri->initializeWithURL('http://localhost/foo/bar/page:test')->init();
+        $this->assertSame($this->uri->referrer(), '/foo/bar');
     }
 
     public function testIp()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($uri->ip(), 'UNKNOWN');
+        $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
+        $this->assertSame($this->uri->ip(), 'UNKNOWN');
     }
 
     public function testIsExternal()
     {
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL('http://localhost/')->init();
-        $this->assertFalse($uri->isExternal('/test'));
-        $this->assertFalse($uri->isExternal('/foo/bar'));
-        $this->assertTrue($uri->isExternal('http://localhost/test'));
-        $this->assertTrue($uri->isExternal('http://google.it/test'));
+        $this->uri->initializeWithURL('http://localhost/')->init();
+        $this->assertFalse($this->uri->isExternal('/test'));
+        $this->assertFalse($this->uri->isExternal('/foo/bar'));
+        $this->assertTrue($this->uri->isExternal('http://localhost/test'));
+        $this->assertTrue($this->uri->isExternal('http://google.it/test'));
     }
 
     public function testBuildUrl()
@@ -447,11 +398,9 @@ class UriTest extends \Codeception\TestCase\Test
         $this->assertStringStartsWith($url, Uri::addNonce($url, 'test-action'));
         $this->assertStringStartsWith($url . '/nonce:', Uri::addNonce($url, 'test-action'));
 
-        $uri = $this->getURI();
-
-        $uri->initializeWithURL(Uri::addNonce($url, 'test-action'))->init();
-        $this->assertTrue(is_string($uri->param('nonce')));
-        $this->assertSame($uri->param('nonce'), Utils::getNonce('test-action'));
+        $this->uri->initializeWithURL(Uri::addNonce($url, 'test-action'))->init();
+        $this->assertTrue(is_string($this->uri->param('nonce')));
+        $this->assertSame($this->uri->param('nonce'), Utils::getNonce('test-action'));
     }
 }
 
diff --git a/tests/unit/Grav/Common/UtilsTest.php b/tests/unit/Grav/Common/UtilsTest.php
index 6db1e6b0d..57786e952 100644
--- a/tests/unit/Grav/Common/UtilsTest.php
+++ b/tests/unit/Grav/Common/UtilsTest.php
@@ -5,25 +5,15 @@ use Grav\Common\Utils;
 
 class UtilsTest extends \Codeception\TestCase\Test
 {
-    /**
-     * @var \UnitTester
-     */
-    protected $tester;
-
     protected function _before()
     {
+        $this->grav = Fixtures::get('grav');
     }
 
     protected function _after()
     {
     }
 
-    public function grav()
-    {
-        $grav = Fixtures::get('grav');
-        return $grav;
-    }
-
     public function testStartsWith()
     {
         $this->assertTrue(Utils::startsWith('english', 'en'));
@@ -84,12 +74,11 @@ class UtilsTest extends \Codeception\TestCase\Test
 
     public function testDateFormats()
     {
-        $grav = $this->grav();
         $dateFormats = Utils::dateFormats();
         $this->assertTrue(is_array($dateFormats));
         $this->assertContainsOnly('string', $dateFormats);
 
-        $default_format = $grav['config']->get('system.pages.dateformat.default');
+        $default_format = $this->grav['config']->get('system.pages.dateformat.default');
 
         if ($default_format !== null) {
             $this->assertTrue(isset($dateFormats[$default_format]));
@@ -193,7 +182,7 @@ class UtilsTest extends \Codeception\TestCase\Test
 
     public function testPathPrefixedByLangCode()
     {
-        $languagesEnabled = $this->grav()['config']->get('system.languages.supported', []);
+        $languagesEnabled = $this->grav['config']->get('system.languages.supported', []);
         $arrayOfLanguages = ['en', 'de', 'it', 'es', 'dk', 'el'];
         $languagesNotEnabled = array_diff($arrayOfLanguages, $languagesEnabled);
         $oneLanguageNotEnabled = reset($languagesNotEnabled);

From c307f63e1ff5508f7d0e5eca9644544c2a5ef5ea Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 09:54:14 +0100
Subject: [PATCH 06/48] :white_check_mark: Cleanup tests

---
 tests/unit/Grav/Common/AssetsTest.php   | 82 +++++++++++++++----------
 tests/unit/Grav/Common/BrowserTest.php  | 27 ++++++--
 tests/unit/Grav/Common/MarkdownTest.php | 48 +++++++++------
 tests/unit/Grav/Common/UriTest.php      | 31 +++++++---
 tests/unit/Grav/Common/UtilsTest.php    | 36 +++++++----
 5 files changed, 146 insertions(+), 78 deletions(-)

diff --git a/tests/unit/Grav/Common/AssetsTest.php b/tests/unit/Grav/Common/AssetsTest.php
index a034a7518..353835f2b 100644
--- a/tests/unit/Grav/Common/AssetsTest.php
+++ b/tests/unit/Grav/Common/AssetsTest.php
@@ -1,12 +1,20 @@
 <?php
 
 use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
+use Grav\Common\Assets;
 
 /**
  * Class AssetsTest
  */
 class AssetsTest extends \Codeception\TestCase\Test
 {
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var Assets $assets */
+    protected $assets;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
@@ -27,11 +35,11 @@ class AssetsTest extends \Codeception\TestCase\Test
 
         $array = $this->assets->getCss();
         $this->assertSame(reset($array), [
-            'asset' => '/test.css',
+            'asset'    => '/test.css',
             'priority' => 10,
-            'order' => 0,
+            'order'    => 0,
             'pipeline' => true,
-            'group' => 'head'
+            'group'    => 'head'
         ]);
 
         $this->assets->add('test.js');
@@ -40,11 +48,11 @@ class AssetsTest extends \Codeception\TestCase\Test
 
         $array = $this->assets->getCss();
         $this->assertSame(reset($array), [
-            'asset' => '/test.css',
+            'asset'    => '/test.css',
             'priority' => 10,
-            'order' => 0,
+            'order'    => 0,
             'pipeline' => true,
-            'group' => 'head'
+            'group'    => 'head'
         ]);
 
         //test addCss(). Test adding asset to a separate group
@@ -55,11 +63,11 @@ class AssetsTest extends \Codeception\TestCase\Test
 
         $array = $this->assets->getCss();
         $this->assertSame(reset($array), [
-            'asset' => '/test.css',
+            'asset'    => '/test.css',
             'priority' => 10,
-            'order' => 0,
+            'order'    => 0,
             'pipeline' => true,
-            'group' => 'head'
+            'group'    => 'head'
         ]);
 
         //test addJs()
@@ -70,12 +78,12 @@ class AssetsTest extends \Codeception\TestCase\Test
 
         $array = $this->assets->getJs();
         $this->assertSame(reset($array), [
-            'asset' => '/test.js',
+            'asset'    => '/test.js',
             'priority' => 10,
-            'order' => 0,
+            'order'    => 0,
             'pipeline' => true,
-            'loading' => '',
-            'group' => 'head'
+            'loading'  => '',
+            'group'    => 'head'
         ]);
 
         //Test CSS Groups
@@ -88,11 +96,11 @@ class AssetsTest extends \Codeception\TestCase\Test
 
         $array = $this->assets->getCss();
         $this->assertSame(reset($array), [
-            'asset' => '/test.css',
+            'asset'    => '/test.css',
             'priority' => 10,
-            'order' => 0,
+            'order'    => 0,
             'pipeline' => true,
-            'group' => 'footer'
+            'group'    => 'footer'
         ]);
 
         //Test JS Groups
@@ -105,12 +113,12 @@ class AssetsTest extends \Codeception\TestCase\Test
 
         $array = $this->assets->getJs();
         $this->assertSame(reset($array), [
-            'asset' => '/test.js',
+            'asset'    => '/test.js',
             'priority' => 10,
-            'order' => 0,
+            'order'    => 0,
             'pipeline' => true,
-            'loading' => '',
-            'group' => 'footer'
+            'loading'  => '',
+            'group'    => 'footer'
         ]);
 
         //Test async / defer
@@ -121,12 +129,12 @@ class AssetsTest extends \Codeception\TestCase\Test
 
         $array = $this->assets->getJs();
         $this->assertSame(reset($array), [
-            'asset' => '/test.js',
+            'asset'    => '/test.js',
             'priority' => 10,
-            'order' => 0,
+            'order'    => 0,
             'pipeline' => true,
-            'loading' => 'async',
-            'group' => 'head'
+            'loading'  => 'async',
+            'group'    => 'head'
         ]);
 
         $this->assets->reset();
@@ -136,12 +144,12 @@ class AssetsTest extends \Codeception\TestCase\Test
 
         $array = $this->assets->getJs();
         $this->assertSame(reset($array), [
-            'asset' => '/test.js',
+            'asset'    => '/test.js',
             'priority' => 10,
-            'order' => 0,
+            'order'    => 0,
             'pipeline' => true,
-            'loading' => 'defer',
-            'group' => 'head'
+            'loading'  => 'defer',
+            'group'    => 'head'
         ]);
     }
 
@@ -162,7 +170,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async']);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame($js,
+            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
 
         //Test priority too
         $this->assets->reset();
@@ -179,7 +188,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $js = $this->assets->js();
         $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
         $js = $this->assets->js('footer');
-        $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame($js,
+            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
 
         //Test adding array of assets
         //Test priority too
@@ -187,7 +197,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->addJs(['jquery', 'test.js'], ['loading' => 'async']);
         $js = $this->assets->js();
 
-        $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL .
+        $this->assertSame($js,
+            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL .
             '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
     }
 
@@ -274,7 +285,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addAsyncJs('jquery');
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame($js,
+            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
     }
 
     public function testAddDeferJs()
@@ -282,7 +294,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addDeferJs('jquery');
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" defer></script>' . PHP_EOL);
+        $this->assertSame($js,
+            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" defer></script>' . PHP_EOL);
     }
 
     public function testAddInlineCss()
@@ -290,7 +303,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addInlineCss('body { color: black }');
         $css = $this->assets->css();
-        $this->assertSame($css, PHP_EOL. '<style>' .PHP_EOL . 'body { color: black }' . PHP_EOL.PHP_EOL .'</style>' . PHP_EOL);
+        $this->assertSame($css,
+            PHP_EOL . '<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . PHP_EOL . '</style>' . PHP_EOL);
     }
 
     public function testAddInlineJs()
diff --git a/tests/unit/Grav/Common/BrowserTest.php b/tests/unit/Grav/Common/BrowserTest.php
index 1825c93b1..e5aca9923 100644
--- a/tests/unit/Grav/Common/BrowserTest.php
+++ b/tests/unit/Grav/Common/BrowserTest.php
@@ -1,23 +1,40 @@
 <?php
 
 use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
 
+/**
+ * Class BrowserTest
+ */
 class BrowserTest extends \Codeception\TestCase\Test
 {
+    /** @var Grav $grav */
+    protected $grav;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
-        $this->assets = $this->grav['assets'];
     }
 
     protected function _after()
     {
     }
 
-    public function testGetBrowser() { /* Already covered by PhpUserAgent tests */ }
-    public function testGetPlatform() { /* Already covered by PhpUserAgent tests */ }
-    public function testGetLongVersion() { /* Already covered by PhpUserAgent tests */ }
-    public function testGetVersion() { /* Already covered by PhpUserAgent tests */ }
+    public function testGetBrowser()
+    { /* Already covered by PhpUserAgent tests */
+    }
+
+    public function testGetPlatform()
+    { /* Already covered by PhpUserAgent tests */
+    }
+
+    public function testGetLongVersion()
+    { /* Already covered by PhpUserAgent tests */
+    }
+
+    public function testGetVersion()
+    { /* Already covered by PhpUserAgent tests */
+    }
 
     public function testIsHuman()
     {
diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index d14d30cb1..ba8890aa6 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -1,22 +1,29 @@
 <?php
 
 use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
 
 /**
  * Class AssetsTest
  */
 class MarkdownTest extends \Codeception\TestCase\Test
 {
+    /** @var Parsedown $parsedown */
     protected $parsedown;
 
+    /** @var Grav $grav */
+    protected $grav;
+
     protected function _before()
     {
+        $this->grav = Fixtures::get('grav');
+
         $defaults = [
-            'extra' => false,
+            'extra'            => false,
             'auto_line_breaks' => false,
-            'auto_url_links' => false,
-            'escape_markup' => false,
-            'special_chars' => ['>' => 'gt', '<' => 'lt'],
+            'auto_url_links'   => false,
+            'escape_markup'    => false,
+            'special_chars'    => ['>' => 'gt', '<' => 'lt'],
         ];
         $page = new \Grav\Common\Page\Page();
 
@@ -27,24 +34,26 @@ class MarkdownTest extends \Codeception\TestCase\Test
     {
     }
 
-    public function grav()
-    {
-        $grav = Fixtures::get('grav');
-        return $grav;
-    }
-
+    /**
+     * @param $string
+     *
+     * @return mixed
+     */
     public function stripLeadingWhitespace($string)
     {
         return preg_replace('/^\s*(.*)/', '', $string);
     }
 
-
     public function testMarkdownSpecialProtocols()
     {
-        $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'), '<p><a href="mailto:user@domain.com">mailto</a></p>');
-        $this->assertSame($this->parsedown->text('[xmpp](xmpp:xyx@domain.com)'), '<p><a href="xmpp:xyx@domain.com">xmpp</a></p>');
-        $this->assertSame($this->parsedown->text('[tel](tel:123-555-12345)'), '<p><a href="tel:123-555-12345">tel</a></p>');
-        $this->assertSame($this->parsedown->text('[sms](sms:123-555-12345)'), '<p><a href="sms:123-555-12345">sms</a></p>');
+        $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'),
+            '<p><a href="mailto:user@domain.com">mailto</a></p>');
+        $this->assertSame($this->parsedown->text('[xmpp](xmpp:xyx@domain.com)'),
+            '<p><a href="xmpp:xyx@domain.com">xmpp</a></p>');
+        $this->assertSame($this->parsedown->text('[tel](tel:123-555-12345)'),
+            '<p><a href="tel:123-555-12345">tel</a></p>');
+        $this->assertSame($this->parsedown->text('[sms](sms:123-555-12345)'),
+            '<p><a href="sms:123-555-12345">sms</a></p>');
     }
 
     public function testMarkdownReferenceLinks()
@@ -55,7 +64,8 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
         $sample = '[absolute link][r_absolute]
                    [r_absolute]: /blog/focus-and-blur#blah';
-        $this->assertSame($this->parsedown->text($sample), '<p><a href="/blog/focus-and-blur#blah">absolute link</a></p>');
+        $this->assertSame($this->parsedown->text($sample),
+            '<p><a href="/blog/focus-and-blur#blah">absolute link</a></p>');
 
         $sample = '[external link][r_external]
                    [r_external]: http://www.cnn.com';
@@ -64,7 +74,9 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
     public function testMarkdownExternalLinks()
     {
-        $this->assertSame($this->parsedown->text('[cnn.com](http://www.cnn.com)'), '<p><a href="http://www.cnn.com">cnn.com</a></p>');
-        $this->assertSame($this->parsedown->text('[google.com](https://www.google.com)'), '<p><a href="https://www.google.com">google.com</a></p>');
+        $this->assertSame($this->parsedown->text('[cnn.com](http://www.cnn.com)'),
+            '<p><a href="http://www.cnn.com">cnn.com</a></p>');
+        $this->assertSame($this->parsedown->text('[google.com](https://www.google.com)'),
+            '<p><a href="https://www.google.com">google.com</a></p>');
     }
 }
diff --git a/tests/unit/Grav/Common/UriTest.php b/tests/unit/Grav/Common/UriTest.php
index ed75871e2..1236ceba5 100644
--- a/tests/unit/Grav/Common/UriTest.php
+++ b/tests/unit/Grav/Common/UriTest.php
@@ -1,11 +1,21 @@
 <?php
 
 use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
 use Grav\Common\Uri;
 use Grav\Common\Utils;
 
+/**
+ * Class UriTest
+ */
 class UriTest extends \Codeception\TestCase\Test
 {
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var Uri $uri */
+    protected $uri;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
@@ -71,7 +81,8 @@ class UriTest extends \Codeception\TestCase\Test
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
         $this->assertSame($this->uri->paths(), ['a', 'b', 'c', 'd']);
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->paths(), ['a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f']);
+        $this->assertSame($this->uri->paths(),
+            ['a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f']);
     }
 
     public function testRoute()
@@ -367,20 +378,20 @@ class UriTest extends \Codeception\TestCase\Test
     {
         $parsed_url = [
             'scheme' => 'http',
-            'host' => 'localhost',
-            'port' => '8080',
+            'host'   => 'localhost',
+            'port'   => '8080',
         ];
 
         $this->assertSame(Uri::buildUrl($parsed_url), 'http://localhost:8080');
 
         $parsed_url = [
-            'scheme' => 'http',
-            'host' => 'localhost',
-            'port' => '8080',
-            'user' => 'foo',
-            'pass' => 'bar',
-            'path' => '/test',
-            'query' => 'x=2',
+            'scheme'   => 'http',
+            'host'     => 'localhost',
+            'port'     => '8080',
+            'user'     => 'foo',
+            'pass'     => 'bar',
+            'path'     => '/test',
+            'query'    => 'x=2',
             'fragment' => 'xxx',
         ];
 
diff --git a/tests/unit/Grav/Common/UtilsTest.php b/tests/unit/Grav/Common/UtilsTest.php
index 57786e952..c6dbec24e 100644
--- a/tests/unit/Grav/Common/UtilsTest.php
+++ b/tests/unit/Grav/Common/UtilsTest.php
@@ -1,10 +1,17 @@
 <?php
 
 use Codeception\Util\Fixtures;
+use Grav\Common\Grav;
 use Grav\Common\Utils;
 
+/**
+ * Class UtilsTest
+ */
 class UtilsTest extends \Codeception\TestCase\Test
 {
+    /** @var Grav $grav */
+    protected $grav;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
@@ -19,12 +26,14 @@ class UtilsTest extends \Codeception\TestCase\Test
         $this->assertTrue(Utils::startsWith('english', 'en'));
         $this->assertTrue(Utils::startsWith('English', 'En'));
         $this->assertTrue(Utils::startsWith('ENGLISH', 'EN'));
-        $this->assertTrue(Utils::startsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH', 'EN'));
+        $this->assertTrue(Utils::startsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'EN'));
 
         $this->assertFalse(Utils::startsWith('english', 'En'));
         $this->assertFalse(Utils::startsWith('English', 'EN'));
         $this->assertFalse(Utils::startsWith('ENGLISH', 'en'));
-        $this->assertFalse(Utils::startsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH', 'e'));
+        $this->assertFalse(Utils::startsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'e'));
     }
 
     public function testEndsWith()
@@ -32,12 +41,14 @@ class UtilsTest extends \Codeception\TestCase\Test
         $this->assertTrue(Utils::endsWith('english', 'sh'));
         $this->assertTrue(Utils::endsWith('EngliSh', 'Sh'));
         $this->assertTrue(Utils::endsWith('ENGLISH', 'SH'));
-        $this->assertTrue(Utils::endsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH', 'ENGLISH'));
+        $this->assertTrue(Utils::endsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'ENGLISH'));
 
         $this->assertFalse(Utils::endsWith('english', 'de'));
         $this->assertFalse(Utils::endsWith('EngliSh', 'sh'));
         $this->assertFalse(Utils::endsWith('ENGLISH', 'Sh'));
-        $this->assertFalse(Utils::endsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH', 'DEUSTCH'));
+        $this->assertFalse(Utils::endsWith('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'DEUSTCH'));
     }
 
     public function testContains()
@@ -45,11 +56,14 @@ class UtilsTest extends \Codeception\TestCase\Test
         $this->assertTrue(Utils::contains('english', 'nglis'));
         $this->assertTrue(Utils::contains('EngliSh', 'gliSh'));
         $this->assertTrue(Utils::contains('ENGLISH', 'ENGLI'));
-        $this->assertTrue(Utils::contains('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH', 'ENGLISH'));
+        $this->assertTrue(Utils::contains('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'ENGLISH'));
 
-        $this->assertFalse(Utils::contains('EngliSh', 'GLI'));        $this->assertFalse(Utils::contains('EngliSh', 'English'));
+        $this->assertFalse(Utils::contains('EngliSh', 'GLI'));
+        $this->assertFalse(Utils::contains('EngliSh', 'English'));
         $this->assertFalse(Utils::contains('ENGLISH', 'SCH'));
-        $this->assertFalse(Utils::contains('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH', 'DEUSTCH'));
+        $this->assertFalse(Utils::contains('ENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISHENGLISH',
+            'DEUSTCH'));
     }
 
     public function testSubstrToString()
@@ -166,13 +180,13 @@ class UtilsTest extends \Codeception\TestCase\Test
     public function testArrayFilterRecursive()
     {
         $array = [
-            'test' => '',
+            'test'  => '',
             'test2' => 'test2'
         ];
 
-        $array = Utils::arrayFilterRecursive($array, function($k, $v) {
-                    return !(is_null($v) || $v === '');
-                });
+        $array = Utils::arrayFilterRecursive($array, function ($k, $v) {
+            return !(is_null($v) || $v === '');
+        });
 
         $this->assertContainsOnly('string', $array);
         $this->assertFalse(isset($array['test']));

From aa4fb96b8b60271f4cb281b726647681c32c0e6f Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 15:35:50 +0100
Subject: [PATCH 07/48] Drop generated files, ignored

---
 .../_generated/AcceptanceTesterActions.php    | 2172 -----------------
 .../_generated/FunctionalTesterActions.php    |   18 -
 .../_support/_generated/UnitTesterActions.php |  348 ---
 3 files changed, 2538 deletions(-)
 delete mode 100644 tests/_support/_generated/AcceptanceTesterActions.php
 delete mode 100644 tests/_support/_generated/FunctionalTesterActions.php
 delete mode 100644 tests/_support/_generated/UnitTesterActions.php

diff --git a/tests/_support/_generated/AcceptanceTesterActions.php b/tests/_support/_generated/AcceptanceTesterActions.php
deleted file mode 100644
index 06a32674a..000000000
--- a/tests/_support/_generated/AcceptanceTesterActions.php
+++ /dev/null
@@ -1,2172 +0,0 @@
-<?php  //[STAMP] d2bdd51f4bbf082434dc36c332acdb20
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\PhpBrowser;
-use Helper\Acceptance;
-
-trait AcceptanceTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets the HTTP header to the passed value - which is used on
-     * subsequent HTTP requests through PhpBrowser.
-     *
-     * Example:
-     * ```php
-     * <?php
-     * $I->setHeader('X-Requested-With', 'Codeception');
-     * $I->amOnPage('test-headers.php');
-     * ?>
-     * ```
-     *
-     * @param string $name the name of the request header
-     * @param string $value the value to set it to for subsequent
-     *        requests
-     * @see \Codeception\Module\PhpBrowser::setHeader()
-     */
-    public function setHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes the header with the passed name.  Subsequent requests
-     * will not have the deleted header in its request.
-     *
-     * Example:
-     * ```php
-     * <?php
-     * $I->setHeader('X-Requested-With', 'Codeception');
-     * $I->amOnPage('test-headers.php');
-     * // ...
-     * $I->deleteHeader('X-Requested-With');
-     * $I->amOnPage('some-other-page.php');
-     * ?>
-     * ```
-     * 
-     * @param string $name the name of the header to delete.
-     * @see \Codeception\Module\PhpBrowser::deleteHeader()
-     */
-    public function deleteHeader($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Authenticates user for HTTP_AUTH
-     *
-     * @param $username
-     * @param $password
-     * @see \Codeception\Module\PhpBrowser::amHttpAuthenticated()
-     */
-    public function amHttpAuthenticated($username, $password) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Open web page at the given absolute URL and sets its hostname as the base host.
-     *
-     * ``` php
-     * <?php
-     * $I->amOnUrl('http://codeception.com');
-     * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart
-     * ?>
-     * ```
-     * @see \Codeception\Module\PhpBrowser::amOnUrl()
-     */
-    public function amOnUrl($url) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Changes the subdomain for the 'url' configuration parameter.
-     * Does not open a page; use `amOnPage` for that.
-     *
-     * ``` php
-     * <?php
-     * // If config is: 'http://mysite.com'
-     * // or config is: 'http://www.mysite.com'
-     * // or config is: 'http://company.mysite.com'
-     *
-     * $I->amOnSubdomain('user');
-     * $I->amOnPage('/');
-     * // moves to http://user.mysite.com/
-     * ?>
-     * ```
-     *
-     * @param $subdomain
-     *
-     * @return mixed
-     * @see \Codeception\Module\PhpBrowser::amOnSubdomain()
-     */
-    public function amOnSubdomain($subdomain) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Low-level API method.
-     * If Codeception commands are not enough, use [Guzzle HTTP Client](http://guzzlephp.org/) methods directly
-     *
-     * Example:
-     *
-     * ``` php
-     * <?php
-     * $I->executeInGuzzle(function (\GuzzleHttp\Client $client) {
-     *      $client->get('/get', ['query' => ['foo' => 'bar']]);
-     * });
-     * ?>
-     * ```
-     *
-     * It is not recommended to use this command on a regular basis.
-     * If Codeception lacks important Guzzle Client methods, implement them and submit patches.
-     *
-     * @param callable $function
-     * @see \Codeception\Module\PhpBrowser::executeInGuzzle()
-     */
-    public function executeInGuzzle($function) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opens the page for the given relative URI.
-     *
-     * ``` php
-     * <?php
-     * // opens front page
-     * $I->amOnPage('/');
-     * // opens /register page
-     * $I->amOnPage('/register');
-     * ```
-     *
-     * @param $page
-     * @see \Codeception\Lib\InnerBrowser::amOnPage()
-     */
-    public function amOnPage($page) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Perform a click on a link or a button, given by a locator.
-     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
-     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
-     * For links, the link text is searched.
-     * For images, the "alt" attribute and inner text of any parent links are searched.
-     *
-     * The second parameter is a context (CSS or XPath locator) to narrow the search.
-     *
-     * Note that if the locator matches a button of type `submit`, the form will be submitted.
-     *
-     * ``` php
-     * <?php
-     * // simple link
-     * $I->click('Logout');
-     * // button of form
-     * $I->click('Submit');
-     * // CSS button
-     * $I->click('#form input[type=submit]');
-     * // XPath
-     * $I->click('//form/*[@type=submit]');
-     * // link in context
-     * $I->click('Logout', '#nav');
-     * // using strict locator
-     * $I->click(['link' => 'Login']);
-     * ?>
-     * ```
-     *
-     * @param $link
-     * @param $context
-     * @see \Codeception\Lib\InnerBrowser::click()
-     */
-    public function click($link, $context = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string (case insensitive).
-     * 
-     * You can specify a specific HTML element (via CSS or XPath) as the second 
-     * parameter to only search within that element.
-     *
-     * ``` php
-     * <?php
-     * $I->see('Logout');                 // I can suppose user is logged in
-     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
-     * $I->see('Sign Up', '//body/h1');   // with XPath
-     * ```
-     * 
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->see('strong')` will return true for strings like:
-     * 
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     * 
-     * But will *not* be true for strings like:
-     * 
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     * 
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::see()
-     */
-    public function canSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string (case insensitive).
-     * 
-     * You can specify a specific HTML element (via CSS or XPath) as the second 
-     * parameter to only search within that element.
-     *
-     * ``` php
-     * <?php
-     * $I->see('Logout');                 // I can suppose user is logged in
-     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
-     * $I->see('Sign Up', '//body/h1');   // with XPath
-     * ```
-     * 
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->see('strong')` will return true for strings like:
-     * 
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     * 
-     * But will *not* be true for strings like:
-     * 
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     * 
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * @see \Codeception\Lib\InnerBrowser::see()
-     */
-    public function see($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page doesn't contain the text specified (case insensitive).
-     * Give a locator as the second parameter to match a specific region.
-     *
-     * ```php
-     * <?php
-     * $I->dontSee('Login');                    // I can suppose user is already logged in
-     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
-     * $I->dontSee('Sign Up','//body/h1');      // with XPath
-     * ```
-     * 
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->dontSee('strong')` will fail on strings like:
-     * 
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     * 
-     * But will ignore strings like:
-     * 
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     * 
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSee()
-     */
-    public function cantSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page doesn't contain the text specified (case insensitive).
-     * Give a locator as the second parameter to match a specific region.
-     *
-     * ```php
-     * <?php
-     * $I->dontSee('Login');                    // I can suppose user is already logged in
-     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
-     * $I->dontSee('Sign Up','//body/h1');      // with XPath
-     * ```
-     * 
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->dontSee('strong')` will fail on strings like:
-     * 
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     * 
-     * But will ignore strings like:
-     * 
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     * 
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * @see \Codeception\Lib\InnerBrowser::dontSee()
-     */
-    public function dontSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInSource()
-     */
-    public function canSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * @see \Codeception\Lib\InnerBrowser::seeInSource()
-     */
-    public function seeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
-     */
-    public function cantSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
-     */
-    public function dontSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
-     *
-     * ``` php
-     * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="/logout">Logout</a>
-     * ?>
-     * ```
-     *
-     * @param      $text
-     * @param null $url
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeLink()
-     */
-    public function canSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
-     *
-     * ``` php
-     * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="/logout">Logout</a>
-     * ?>
-     * ```
-     *
-     * @param      $text
-     * @param null $url
-     * @see \Codeception\Lib\InnerBrowser::seeLink()
-     */
-    public function seeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @param null $url
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
-     */
-    public function cantSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @param null $url
-     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
-     */
-    public function dontSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current URI contains the given string.
-     *
-     * ``` php
-     * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
-     */
-    public function canSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current URI contains the given string.
-     *
-     * ``` php
-     * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
-     */
-    public function seeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URI doesn't contain the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
-     */
-    public function cantSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URI doesn't contain the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
-     */
-    public function dontSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
-     */
-    public function canSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
-     */
-    public function seeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
-     */
-    public function cantSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
-     */
-    public function dontSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL matches the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
-     */
-    public function canSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL matches the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
-     */
-    public function seeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current url doesn't match the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
-     */
-    public function cantSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current url doesn't match the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
-     */
-    public function dontSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Executes the given regular expression against the current URI and returns the first match.
-     * If no parameters are provided, the full URI is returned.
-     *
-     * ``` php
-     * <?php
-     * $user_id = $I->grabFromCurrentUrl('~$/user/(\d+)/~');
-     * $uri = $I->grabFromCurrentUrl();
-     * ?>
-     * ```
-     *
-     * @param null $uri
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
-     */
-    public function grabFromCurrentUrl($uri = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the specified checkbox is checked.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
-     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
-     */
-    public function canSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the specified checkbox is checked.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
-     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
-     */
-    public function seeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Check that the specified checkbox is unchecked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
-     */
-    public function cantSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Check that the specified checkbox is unchecked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
-     */
-    public function dontSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given input field or textarea contains the given value.
-     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInField('Body','Type your comment here');
-     * $I->seeInField('form textarea[name=body]','Type your comment here');
-     * $I->seeInField('form input[type=hidden]','hidden_value');
-     * $I->seeInField('#searchform input','Search');
-     * $I->seeInField('//form/*[@name=search]','Search');
-     * $I->seeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInField()
-     */
-    public function canSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given input field or textarea contains the given value.
-     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInField('Body','Type your comment here');
-     * $I->seeInField('form textarea[name=body]','Type your comment here');
-     * $I->seeInField('form input[type=hidden]','hidden_value');
-     * $I->seeInField('#searchform input','Search');
-     * $I->seeInField('//form/*[@name=search]','Search');
-     * $I->seeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::seeInField()
-     */
-    public function seeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that an input field or textarea doesn't contain the given value.
-     * For fuzzy locators, the field is matched by label text, CSS and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInField('Body','Type your comment here');
-     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
-     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
-     * $I->dontSeeInField('#searchform input','Search');
-     * $I->dontSeeInField('//form/*[@name=search]','Search');
-     * $I->dontSeeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
-     */
-    public function cantSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that an input field or textarea doesn't contain the given value.
-     * For fuzzy locators, the field is matched by label text, CSS and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInField('Body','Type your comment here');
-     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
-     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
-     * $I->dontSeeInField('#searchform input','Search');
-     * $I->dontSeeInField('//form/*[@name=search]','Search');
-     * $I->dontSeeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
-     */
-    public function dontSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are set on the form matched with the
-     * passed selector.
-     * 
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('form[name=myform]', [
-     *      'input1' => 'value',
-     *      'input2' => 'other value',
-     * ]);
-     * ?>
-     * ```
-     * 
-     * For multi-select elements, or to check values of multiple elements with the same name, an
-     * array may be passed:
-     * 
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('.form-class', [
-     *      'multiselect' => [
-     *          'value1',
-     *          'value2',
-     *      ],
-     *      'checkbox[]' => [
-     *          'a checked value',
-     *          'another checked value',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     * 
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // passes if checked
-     *      'checkbox2' => false,       // passes if unchecked
-     * ]);
-     * ?>
-     * ```
-     * 
-     * Pair this with submitForm for quick testing magic.
-     * 
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     * 
-     * @param $formSelector
-     * @param $params
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
-     */
-    public function canSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are set on the form matched with the
-     * passed selector.
-     * 
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('form[name=myform]', [
-     *      'input1' => 'value',
-     *      'input2' => 'other value',
-     * ]);
-     * ?>
-     * ```
-     * 
-     * For multi-select elements, or to check values of multiple elements with the same name, an
-     * array may be passed:
-     * 
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('.form-class', [
-     *      'multiselect' => [
-     *          'value1',
-     *          'value2',
-     *      ],
-     *      'checkbox[]' => [
-     *          'a checked value',
-     *          'another checked value',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     * 
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // passes if checked
-     *      'checkbox2' => false,       // passes if unchecked
-     * ]);
-     * ?>
-     * ```
-     * 
-     * Pair this with submitForm for quick testing magic.
-     * 
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     * 
-     * @param $formSelector
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
-     */
-    public function seeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are not set on the form matched with
-     * the passed selector.
-     * 
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('form[name=myform]', [
-     *      'input1' => 'non-existent value',
-     *      'input2' => 'other non-existent value',
-     * ]);
-     * ?>
-     * ```
-     * 
-     * To check that an element hasn't been assigned any one of many values, an array can be passed
-     * as the value:
-     * 
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('.form-class', [
-     *      'fieldName' => [
-     *          'This value shouldn\'t be set',
-     *          'And this value shouldn\'t be set',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     * 
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // fails if checked
-     *      'checkbox2' => false,       // fails if unchecked
-     * ]);
-     * ?>
-     * ```
-     * 
-     * @param $formSelector
-     * @param $params
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
-     */
-    public function cantSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are not set on the form matched with
-     * the passed selector.
-     * 
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('form[name=myform]', [
-     *      'input1' => 'non-existent value',
-     *      'input2' => 'other non-existent value',
-     * ]);
-     * ?>
-     * ```
-     * 
-     * To check that an element hasn't been assigned any one of many values, an array can be passed
-     * as the value:
-     * 
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('.form-class', [
-     *      'fieldName' => [
-     *          'This value shouldn\'t be set',
-     *          'And this value shouldn\'t be set',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     * 
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // fails if checked
-     *      'checkbox2' => false,       // fails if unchecked
-     * ]);
-     * ?>
-     * ```
-     * 
-     * @param $formSelector
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
-     */
-    public function dontSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Submits the given form on the page, optionally with the given form
-     * values.  Give the form fields values as an array.
-     *
-     * Although this function can be used as a short-hand version of 
-     * `fillField()`, `selectOption()`, `click()` etc. it has some important 
-     * differences:
-     * 
-     *  * Only field *names* may be used, not CSS/XPath selectors nor field labels
-     *  * If a field is sent to this function that does *not* exist on the page,
-     *    it will silently be added to the HTTP request.  This is helpful for testing
-     *    some types of forms, but be aware that you will *not* get an exception
-     *    like you would if you called `fillField()` or `selectOption()` with
-     *    a missing field.
-     * 
-     * Fields that are not provided will be filled by their values from the page, 
-     * or from any previous calls to `fillField()`, `selectOption()` etc.
-     * You don't need to click the 'Submit' button afterwards.
-     * This command itself triggers the request to form's action.
-     *
-     * You can optionally specify which button's value to include
-     * in the request with the last parameter (as an alternative to
-     * explicitly setting its value in the second parameter), as
-     * button values are not otherwise included in the request.
-     *
-     * Examples:
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ]);
-     * // or
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ], 'submitButtonName');
-     *
-     * ```
-     *
-     * For example, given this sample "Sign Up" form:
-     *
-     * ``` html
-     * <form action="/sign_up">
-     *     Login:
-     *     <input type="text" name="user[login]" /><br/>
-     *     Password:
-     *     <input type="password" name="user[password]" /><br/>
-     *     Do you agree to our terms?
-     *     <input type="checkbox" name="user[agree]" /><br/>
-     *     Select pricing plan:
-     *     <select name="plan">
-     *         <option value="1">Free</option>
-     *         <option value="2" selected="selected">Paid</option>
-     *     </select>
-     *     <input type="submit" name="submitButton" value="Submit" />
-     * </form>
-     * ```
-     *
-     * You could write the following to submit it:
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user' => [
-     *             'login' => 'Davert',
-     *             'password' => '123456',
-     *             'agree' => true
-     *         ]
-     *     ],
-     *     'submitButton'
-     * );
-     * ```
-     * Note that "2" will be the submitted value for the "plan" field, as it is
-     * the selected option.
-     * 
-     * You can also emulate a JavaScript submission by not specifying any
-     * buttons in the third parameter to submitForm.
-     * 
-     * ```php
-     * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user' => [
-     *             'login' => 'Davert',
-     *             'password' => '123456',
-     *             'agree' => true
-     *         ]
-     *     ]
-     * );
-     * ```
-     * 
-     * This function works well when paired with `seeInFormFields()` 
-     * for quickly testing CRUD interfaces and form validation logic.
-     * 
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('#my-form', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('#my-form', $form);
-     * ```
-     *
-     * Parameter values can be set to arrays for multiple input fields
-     * of the same name, or multi-select combo boxes.  For checkboxes,
-     * you can use either the string value or boolean `true`/`false` which will
-     * be replaced by the checkbox's value in the DOM.
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#my-form', [
-     *      'field1' => 'value',
-     *      'checkbox' => [
-     *          'value of first checkbox',
-     *          'value of second checkbox',
-     *      ],
-     *      'otherCheckboxes' => [
-     *          true,
-     *          false,
-     *          false
-     *      ],
-     *      'multiselect' => [
-     *          'first option value',
-     *          'second option value'
-     *      ]
-     * ]);
-     * ```
-     *
-     * Mixing string and boolean values for a checkbox's value is not supported
-     * and may produce unexpected results.
-     * 
-     * Field names ending in `[]` must be passed without the trailing square 
-     * bracket characters, and must contain an array for its value.  This allows
-     * submitting multiple values with the same name, consider:
-     * 
-     * ```php
-     * <?php
-     * // This will NOT work correctly
-     * $I->submitForm('#my-form', [
-     *     'field[]' => 'value',
-     *     'field[]' => 'another value',  // 'field[]' is already a defined key
-     * ]);
-     * ```
-     * 
-     * The solution is to pass an array value:
-     * 
-     * ```php
-     * <?php
-     * // This way both values are submitted
-     * $I->submitForm('#my-form', [
-     *     'field' => [
-     *         'value',
-     *         'another value',
-     *     ]
-     * ]);
-     * ```
-     * 
-     * @param $selector
-     * @param $params
-     * @param $button
-     * @see \Codeception\Lib\InnerBrowser::submitForm()
-     */
-    public function submitForm($selector, $params, $button = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fills a text field or textarea with the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->fillField("//input[@type='text']", "Hello World!");
-     * $I->fillField(['name' => 'email'], 'jon@mail.com');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::fillField()
-     */
-    public function fillField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Selects an option in a select tag or in radio button group.
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('form select[name=account]', 'Premium');
-     * $I->selectOption('form input[name=payment]', 'Monthly');
-     * $I->selectOption('//form/select[@name=account]', 'Monthly');
-     * ?>
-     * ```
-     *
-     * Provide an array for the second argument to select multiple options:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
-     * ?>
-     * ```
-     *
-     * @param $select
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::selectOption()
-     */
-    public function selectOption($select, $option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Ticks a checkbox. For radio buttons, use the `selectOption` method instead.
-     *
-     * ``` php
-     * <?php
-     * $I->checkOption('#agree');
-     * ?>
-     * ```
-     *
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::checkOption()
-     */
-    public function checkOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Unticks a checkbox.
-     *
-     * ``` php
-     * <?php
-     * $I->uncheckOption('#notify');
-     * ?>
-     * ```
-     *
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::uncheckOption()
-     */
-    public function uncheckOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Attaches a file relative to the Codeception data directory to the given file upload field.
-     *
-     * ``` php
-     * <?php
-     * // file is stored in 'tests/_data/prices.xls'
-     * $I->attachFile('input[@type="file"]', 'prices.xls');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $filename
-     * @see \Codeception\Lib\InnerBrowser::attachFile()
-     */
-    public function attachFile($field, $filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends a GET ajax request with specified params.
-     *
-     * See ->sendAjaxPostRequest for examples.
-     *
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
-     */
-    public function sendAjaxGetRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends a POST ajax request with specified params.
-     * Additional params can be passed as array.
-     *
-     * Example:
-     *
-     * Imagine that by clicking checkbox you trigger ajax request which updates user settings.
-     * We emulate that click by running this ajax request manually.
-     *
-     * ``` php
-     * <?php
-     * $I->sendAjaxPostRequest('/updateSettings', array('notifications' => true)); // POST
-     * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true)); // GET
-     *
-     * ```
-     *
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
-     */
-    public function sendAjaxPostRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends an ajax request with specified method and params.
-     *
-     * Example:
-     *
-     * You need to perform an ajax request specifying the HTTP method.
-     *
-     * ``` php
-     * <?php
-     * $I->sendAjaxRequest('PUT', '/posts/7', array('title' => 'new title'));
-     *
-     * ```
-     *
-     * @param $method
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
-     */
-    public function sendAjaxRequest($method, $uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Finds and returns the text contents of the given element.
-     * If a fuzzy locator is used, the element is found using CSS, XPath, and by matching the full page source by regular expression.
-     *
-     * ``` php
-     * <?php
-     * $heading = $I->grabTextFrom('h1');
-     * $heading = $I->grabTextFrom('descendant-or-self::h1');
-     * $value = $I->grabTextFrom('~<input value=(.*?)]~sgi'); // match with a regex
-     * ?>
-     * ```
-     *
-     * @param $cssOrXPathOrRegex
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
-     */
-    public function grabTextFrom($cssOrXPathOrRegex) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs the value of the given attribute value from the given element.
-     * Fails if element is not found.
-     *
-     * ``` php
-     * <?php
-     * $I->grabAttributeFrom('#tooltip', 'title');
-     * ?>
-     * ```
-     *
-     *
-     * @param $cssOrXpath
-     * @param $attribute
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
-     */
-    public function grabAttributeFrom($cssOrXpath, $attribute) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs either the text content, or attribute values, of nodes
-     * matched by $cssOrXpath and returns them as an array.
-     * 
-     * ```html
-     * <a href="#first">First</a>
-     * <a href="#second">Second</a>
-     * <a href="#third">Third</a>
-     * ```
-     * 
-     * ```php
-     * <?php
-     * // would return ['First', 'Second', 'Third']
-     * $aLinkText = $I->grabMultiple('a');
-     * 
-     * // would return ['#first', '#second', '#third']
-     * $aLinks = $I->grabMultiple('a', 'href');
-     * ?>
-     * ```
-     * 
-     * @param $cssOrXpath
-     * @param $attribute
-     * @return string[]
-     * @see \Codeception\Lib\InnerBrowser::grabMultiple()
-     */
-    public function grabMultiple($cssOrXpath, $attribute = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $field
-     *
-     * @return array|mixed|null|string
-     * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
-     */
-    public function grabValueFrom($field) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets a cookie with the given name and value.
-     * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
-     * ?>
-     * ```
-     *
-     * @param $name
-     * @param $val
-     * @param array $params
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::setCookie()
-     */
-    public function setCookie($name, $val, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs a cookie value.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabCookie()
-     */
-    public function grabCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCookie('PHPSESSID');
-     * ?>
-     * ```
-     *
-     * @param $cookie
-     * @param array $params
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCookie()
-     */
-    public function canSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCookie('PHPSESSID');
-     * ?>
-     * ```
-     *
-     * @param $cookie
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeCookie()
-     */
-    public function seeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
-     */
-    public function cantSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
-     */
-    public function dontSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Unsets cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::resetCookie()
-     */
-    public function resetCookie($name, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeElement()
-     */
-    public function canSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * @see \Codeception\Lib\InnerBrowser::seeElement()
-     */
-    public function seeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
-     */
-    public function cantSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
-     */
-    public function dontSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
-     * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
-     */
-    public function canSeeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
-     * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
-     */
-    public function seeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is selected.
-     *
-     * ``` php
-     * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
-     */
-    public function canSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is selected.
-     *
-     * ``` php
-     * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
-     */
-    public function seeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is not selected.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
-     */
-    public function cantSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is not selected.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
-     */
-    public function dontSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that current page has 404 response status code.
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
-     */
-    public function canSeePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that current page has 404 response status code.
-     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
-     */
-    public function seePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * @param $code
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
-     */
-    public function canSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * @param $code
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
-     */
-    public function seeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title contains the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInTitle('Blog - Post #1');
-     * ?>
-     * ```
-     *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
-     */
-    public function canSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title contains the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInTitle('Blog - Post #1');
-     * ?>
-     * ```
-     *
-     * @param $title
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
-     */
-    public function seeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title does not contain the given string.
-     *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
-     */
-    public function cantSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title does not contain the given string.
-     *
-     * @param $title
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
-     */
-    public function dontSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Switch to iframe or frame on the page.
-     *
-     * Example:
-     * ``` html
-     * <iframe name="another_frame" src="http://example.com">
-     * ```
-     *
-     * ``` php
-     * <?php
-     * # switch to iframe
-     * $I->switchToIframe("another_frame");
-     * ```
-     *
-     * @param string $name
-     * @see \Codeception\Lib\InnerBrowser::switchToIframe()
-     */
-    public function switchToIframe($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Moves back in history.
-     * 
-     * @param int $numberOfSteps (default value 1)
-     * @see \Codeception\Lib\InnerBrowser::moveBack()
-     */
-    public function moveBack($numberOfSteps = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
-    }
-}
diff --git a/tests/_support/_generated/FunctionalTesterActions.php b/tests/_support/_generated/FunctionalTesterActions.php
deleted file mode 100644
index b1dc90958..000000000
--- a/tests/_support/_generated/FunctionalTesterActions.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php  //[STAMP] 217732cfcf1663b385a9cfd121bbeed3
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Helper\Functional;
-
-trait FunctionalTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-}
diff --git a/tests/_support/_generated/UnitTesterActions.php b/tests/_support/_generated/UnitTesterActions.php
deleted file mode 100644
index 2ea791802..000000000
--- a/tests/_support/_generated/UnitTesterActions.php
+++ /dev/null
@@ -1,348 +0,0 @@
-<?php  //[STAMP] 8c2b6acdd1e147b7717797f40c58c89c
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\Asserts;
-use Helper\Unit;
-
-trait UnitTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are equal.
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     *
-     * @return mixed
-     * @see \Codeception\Module\Asserts::assertEquals()
-     */
-    public function assertEquals($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are not equal
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotEquals()
-     */
-    public function assertNotEquals($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are same
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     *
-     * @return mixed
-     * @see \Codeception\Module\Asserts::assertSame()
-     */
-    public function assertSame($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSame', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are not same
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotSame()
-     */
-    public function assertNotSame($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSame', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is greater than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertGreaterThan()
-     */
-    public function assertGreaterThan($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @deprecated
-     * @see \Codeception\Module\Asserts::assertGreaterThen()
-     */
-    public function assertGreaterThen($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThen', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is greater or equal than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertGreaterThanOrEqual()
-     */
-    public function assertGreaterThanOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @deprecated
-     * @see \Codeception\Module\Asserts::assertGreaterThenOrEqual()
-     */
-    public function assertGreaterThenOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThenOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is less than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertLessThan()
-     */
-    public function assertLessThan($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is less or equal than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertLessThanOrEqual()
-     */
-    public function assertLessThanOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that haystack contains needle
-     *
-     * @param        $needle
-     * @param        $haystack
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertContains()
-     */
-    public function assertContains($needle, $haystack, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that haystack doesn't contain needle.
-     *
-     * @param        $needle
-     * @param        $haystack
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotContains()
-     */
-    public function assertNotContains($needle, $haystack, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that string match with pattern
-     *
-     * @param string $pattern
-     * @param string $string
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertRegExp()
-     */
-    public function assertRegExp($pattern, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertRegExp', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that string not match with pattern
-     *
-     * @param string $pattern
-     * @param string $string
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotRegExp()
-     */
-    public function assertNotRegExp($pattern, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotRegExp', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is empty.
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertEmpty()
-     */
-    public function assertEmpty($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is not empty.
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotEmpty()
-     */
-    public function assertNotEmpty($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is NULL
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNull()
-     */
-    public function assertNull($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is not NULL
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotNull()
-     */
-    public function assertNotNull($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that condition is positive.
-     *
-     * @param        $condition
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertTrue()
-     */
-    public function assertTrue($condition, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that condition is negative.
-     *
-     * @param        $condition
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFalse()
-     */
-    public function assertFalse($condition, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file exists
-     *  
-     * @param string $filename
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFileExists()
-     */
-    public function assertFileExists($filename, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileExists', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file doesn't exist
-     *  
-     * @param string $filename
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFileNotExists()
-     */
-    public function assertFileNotExists($filename, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotExists', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fails the test with message.
-     *
-     * @param $message
-     * @see \Codeception\Module\Asserts::fail()
-     */
-    public function fail($message) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
-    }
-}

From e2d00bec414b70cbe7d826111f1dda1d22419c42 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 18:18:09 +0100
Subject: [PATCH 08/48] :white_check_mark: Add tear down method

---
 tests/_support/Helper/Unit.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php
index 6064d3732..41fc4d1c5 100644
--- a/tests/_support/Helper/Unit.php
+++ b/tests/_support/Helper/Unit.php
@@ -6,5 +6,8 @@ namespace Helper;
 
 class Unit extends \Codeception\Module
 {
-
+    public function _afterSuite()
+    {
+        // Tear down after test suite
+    }
 }

From 3fb684d608e61c037ccad945979547fb97c3d0d7 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 18:28:38 +0100
Subject: [PATCH 09/48] :construction: Add error log for tests

---
 .gitignore           | 3 ++-
 tests/_bootstrap.php | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 80720c0b6..221f41099 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,4 +39,5 @@ user/config/security.yaml
 
 tests/_output/*
 tests/_support/_generated/*
-tests/cache/*
\ No newline at end of file
+tests/cache/*
+tests/error.log
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 725400db8..836de7ea2 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -6,6 +6,8 @@ namespace Grav;
 use Codeception\Util\Fixtures;
 use Faker\Factory;
 
+ini_set('error_log', __DIR__ . '/error.log');
+
 // Ensure vendor libraries exist
 $autoload = __DIR__ . '/../vendor/autoload.php';
 

From 4108c7710bb8ed8ea0e084784132fb00ae2ed681 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 18:29:40 +0100
Subject: [PATCH 10/48] :white_check_mark: First Pages testing in place with
 first simple site stub structure provided under tests/fake

---
 .../simple-site/user/pages/01.home/default.md |  1 +
 .../user/pages/02.blog/post-one/item.md       |  1 +
 .../user/pages/02.blog/post-two/item.md       |  1 +
 .../user/pages/03.about/default.md            |  5 ++
 tests/unit/Grav/Common/Page/PagesTest.php     | 49 +++++++++++++++++++
 5 files changed, 57 insertions(+)
 create mode 100644 tests/fake/simple-site/user/pages/01.home/default.md
 create mode 100644 tests/fake/simple-site/user/pages/02.blog/post-one/item.md
 create mode 100644 tests/fake/simple-site/user/pages/02.blog/post-two/item.md
 create mode 100644 tests/fake/simple-site/user/pages/03.about/default.md
 create mode 100644 tests/unit/Grav/Common/Page/PagesTest.php

diff --git a/tests/fake/simple-site/user/pages/01.home/default.md b/tests/fake/simple-site/user/pages/01.home/default.md
new file mode 100644
index 000000000..8318c86b3
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/01.home/default.md
@@ -0,0 +1 @@
+Test
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/02.blog/post-one/item.md b/tests/fake/simple-site/user/pages/02.blog/post-one/item.md
new file mode 100644
index 000000000..8318c86b3
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/02.blog/post-one/item.md
@@ -0,0 +1 @@
+Test
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/02.blog/post-two/item.md b/tests/fake/simple-site/user/pages/02.blog/post-two/item.md
new file mode 100644
index 000000000..8318c86b3
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/02.blog/post-two/item.md
@@ -0,0 +1 @@
+Test
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/03.about/default.md b/tests/fake/simple-site/user/pages/03.about/default.md
new file mode 100644
index 000000000..43bfdf031
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/03.about/default.md
@@ -0,0 +1,5 @@
+---
+title: test
+---
+
+# Test
\ No newline at end of file
diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
new file mode 100644
index 000000000..5225f35b7
--- /dev/null
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -0,0 +1,49 @@
+<?php
+
+use Codeception\Util\Fixtures;
+use Codeception\Util\Stub;
+use Grav\Common\Grav;
+use Grav\Common\Page\Pages;
+use Grav\Common\Page\Page;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
+
+/**
+ * Class PagesTest
+ */
+class PagesTest extends \Codeception\TestCase\Test
+{
+    /** @var Grav $grav */
+    protected $grav;
+
+    /** @var Pages $pages */
+    protected $pages;
+
+    /** @var Page $root_page */
+    protected $root_page;
+
+    protected function _before()
+    {
+        $this->grav = Fixtures::get('grav');
+        $this->pages = $this->grav['pages'];
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+        $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
+        $this->pages->init();
+    }
+
+    public function testAll()
+    {
+        $this->assertTrue(is_object($this->pages->all()));
+        $this->assertTrue(is_array($this->pages->all()->toArray()));
+        $this->assertInstanceOf('Grav\Common\Page\Page', $this->pages->all()->first());
+    }
+
+    public function testGetList()
+    {
+        $list = $this->pages->getList();
+        $this->assertTrue(is_array($list));
+        $this->assertSame($list['/'], 'Home');
+        $this->assertSame($list['/blog'], 'Blog');
+    }
+}

From bb1e49dd8e7c2f208af79731e0e9e980469a08ce Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 18:30:13 +0100
Subject: [PATCH 11/48] :sparkles: Return $this in Page constructor and
 Page::init() to allow method chaining

---
 system/src/Grav/Common/Page/Page.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 67bfe1db8..79ad0b16e 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -100,6 +100,8 @@ class Page
 
     /**
      * Page Object Constructor
+     *
+     * @return $this
      */
     public function __construct()
     {
@@ -109,6 +111,8 @@ class Page
         $this->taxonomy = [];
         $this->process = $config->get('system.pages.process');
         $this->published = true;
+
+        return $this;
     }
 
     /**
@@ -116,6 +120,8 @@ class Page
      *
      * @param  \SplFileInfo $file The file information for the .md file that the page represents
      * @param  string       $extension
+     *
+     * @return $this
      */
     public function init(\SplFileInfo $file, $extension = null)
     {
@@ -147,6 +153,8 @@ class Page
         // extract page language from page extension
         $language = trim(basename($this->extension(), 'md'), '.') ?: null;
         $this->language($language);
+
+        return $this;
     }
 
     /**

From 793f14c3e083f336f9288f7bce83cb9b9068cfc7 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 18:30:45 +0100
Subject: [PATCH 12/48] :books: PHPDoc

---
 system/src/Grav/Common/Page/Pages.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index df5259899..3d3fd3587 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -16,7 +16,7 @@ use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 use Whoops\Exception\ErrorException;
 
 /**
- * GravPages is the class that is the entry point into the hierarchy of pages
+ * Pages is the class that is the entry point into the hierarchy of pages
  *
  * @author  RocketTheme
  * @license MIT
@@ -63,8 +63,19 @@ class Pages
      */
     protected $last_modified;
 
+    /**
+     * @var array|string[]
+     */
     protected $ignore_files;
+
+    /**
+     * @var array|string[]
+     */
     protected $ignore_folders;
+
+    /**
+     * @var bool
+     */
     protected $ignore_hidden;
 
     /**
@@ -72,6 +83,9 @@ class Pages
      */
     static protected $types;
 
+    /**
+     * @var string
+     */
     static protected $home_route;
 
     /**
@@ -351,7 +365,6 @@ class Pages
     {
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
-
         return $this->instances[rtrim($locator->findResource('page://'), DS)];
     }
 

From 60ab5cefd09cee85fc07cf4d0ab8416c02b15fdc Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 29 Jan 2016 18:32:46 +0100
Subject: [PATCH 13/48] :construction: Reset instances, children and routes
 properties in Pages::init() prior to calling buildPages()

Useful when calling Pages::init() multiple times, or the properties are
never reset and the subsequent buildPages() calls fail
---
 system/src/Grav/Common/Page/Pages.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php
index 3d3fd3587..307bf8d61 100644
--- a/system/src/Grav/Common/Page/Pages.php
+++ b/system/src/Grav/Common/Page/Pages.php
@@ -126,6 +126,10 @@ class Pages
         $this->ignore_folders = $config->get('system.pages.ignore_folders');
         $this->ignore_hidden = $config->get('system.pages.ignore_hidden');
 
+        $this->instances = [];
+        $this->children = [];
+        $this->routes = [];
+
         $this->buildPages();
     }
 

From 0bce4a95b721b61817d9e8776227f67ddab3b9d0 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 10:13:14 -0800
Subject: [PATCH 14/48] Refractored Metadata generator. [BC included]

Metadata are now only flat array. To use social metas, such as open graph, specify the key property with the separator in it (ie, 'og:title'). Grav will automatically treat it as social media and render with both `property` and `name`.
Any other meta will be regularly treated as `name` (ie, 'title' or 'description')
---
 CHANGELOG.md                         | 12 +++++++++---
 system/src/Grav/Common/Page/Page.php | 25 ++++++++++++++-----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fcbd4e51f..372f52a1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.0.9
+## XX/XX/2016
+
+1. [](#improved)
+    * [BC] Metadata now supports only flat arrays. To use open graph metas and the likes (ie, 'og:title'), simply specify it in the key.
+
 # v1.0.8
 ## 01/08/2016
 
@@ -18,13 +24,13 @@
     * Added support for APCu and PHP7.0 via new Doctrine Cache release
     * Added global setting for `twig_first` processing (false by default)
     * New configuration options for Session settings #553
-1. [](#improved)   
+1. [](#improved)
     * Switched to SSL for GPM calls
     * Use `URI->host()` for session domain
     * Add support for `open_basedir` when installing packages via GPM
     * Improved `Utils::generateNonceString()` method to handle reverse proxies
     * Optimized core thumbnails saving 38% in file size
-    * Added new `bin/gpm index --installed-only` option 
+    * Added new `bin/gpm index --installed-only` option
     * Improved GPM errors to provider more helpful diagnostic of issues
     * Removed old hardcoded PHP version references
     * Moved `onPageContentProcessed()` event so it's fired more reliably
@@ -34,7 +40,7 @@
     * Fixed an issue with cache/config checksum not being set on cache load
     * Fix for page blueprint and theme inheritance issue #534
     * Set `ZipBackup` timeout to 10 minutes if possible
-    * Fix case where we only have inline data for CSS or JS  #565 
+    * Fix case where we only have inline data for CSS or JS  #565
     * Fix `bin/grav sandbox` command to work with new `webserver-config` folder
     * Fix for markdown attributes on external URLs
     * Fixed issue where `data:` page header was acting as `publish_date:`
diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 79ad0b16e..810264830 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -1242,28 +1242,31 @@ class Page
             // Build an array of meta objects..
             foreach ((array)$metadata as $key => $value) {
                 // If this is a property type metadata: "og", "twitter", "facebook" etc
+                // Backward compatibility for nested arrays in metas
                 if (is_array($value)) {
                     foreach ($value as $property => $prop_value) {
-                        $prop_key = $key . ":" . $property;
-                        $this->metadata[$prop_key] = [
-                            'property' => $prop_key,
-                            'content'  => htmlspecialchars($prop_value, ENT_QUOTES)
-                        ];
+                        $prop_key                  = $key . ":" . $property;
+                        $this->metadata[$prop_key] = ['name' => $prop_key, 'property' => $prop_key, 'content' => htmlspecialchars($prop_value, ENT_QUOTES)];
                     }
                     // If it this is a standard meta data type
                 } else {
+                    // If it this is a standard meta data type
                     if ($value) {
                         if (in_array($key, $header_tag_http_equivs)) {
-                            $this->metadata[$key] = [
-                                'http_equiv' => $key,
-                                'content'    => htmlspecialchars($value, ENT_QUOTES)
-                            ];
+                            $this->metadata[$key] = ['http_equiv' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES)];
                         } else {
-                            $this->metadata[$key] = ['name' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES)];
+                            // if it's a social metadata with separator, render as property
+                            $hasSeparator = strpos($key, ':') && $separator < strlen($key) - 1;
+                            $entry        = ['name' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES)];
+
+                            if ($hasSeparator) {
+                                $entry['property'] = $key;
+                            }
+
+                            $this->metadata[$key] = $entry;
                         }
                     }
                 }
-
             }
         }
 

From ae3ca8aa2dfcfa226803a9f29b0bf99a8e4fb665 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 10:26:27 -0800
Subject: [PATCH 15/48] =?UTF-8?q?=F0=9F=98=B1=20Fixed=20missing=20variable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/src/Grav/Common/Page/Page.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php
index 810264830..33c5a9e2c 100644
--- a/system/src/Grav/Common/Page/Page.php
+++ b/system/src/Grav/Common/Page/Page.php
@@ -1248,7 +1248,6 @@ class Page
                         $prop_key                  = $key . ":" . $property;
                         $this->metadata[$prop_key] = ['name' => $prop_key, 'property' => $prop_key, 'content' => htmlspecialchars($prop_value, ENT_QUOTES)];
                     }
-                    // If it this is a standard meta data type
                 } else {
                     // If it this is a standard meta data type
                     if ($value) {
@@ -1256,7 +1255,8 @@ class Page
                             $this->metadata[$key] = ['http_equiv' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES)];
                         } else {
                             // if it's a social metadata with separator, render as property
-                            $hasSeparator = strpos($key, ':') && $separator < strlen($key) - 1;
+                            $separator    = strpos($key, ':');
+                            $hasSeparator = $separator && $separator < strlen($key) - 1;
                             $entry        = ['name' => $key, 'content' => htmlspecialchars($value, ENT_QUOTES)];
 
                             if ($hasSeparator) {

From 11a14aed765f2a26e658662999c923b22d5cf3cd Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 12:06:42 -0800
Subject: [PATCH 16/48] Updated composer.lock

---
 composer.lock | 1515 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 1514 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 4979c3c18..584fd0675 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1133,7 +1133,1520 @@
             "time": "2016-01-25 21:22:18"
         }
     ],
-    "packages-dev": null,
+    "packages-dev": [
+        {
+            "name": "codeception/codeception",
+            "version": "2.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Codeception.git",
+                "reference": "4ee562f421fd404139dd7b73ae46d075396a4baf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Codeception/zipball/4ee562f421fd404139dd7b73ae46d075396a4baf",
+                "reference": "4ee562f421fd404139dd7b73ae46d075396a4baf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "facebook/webdriver": ">=1.0.1",
+                "guzzlehttp/guzzle": ">=4.1.4 <7.0",
+                "guzzlehttp/psr7": "~1.0",
+                "php": ">=5.4.0",
+                "phpunit/phpunit": "~4.8.0",
+                "symfony/browser-kit": ">=2.4|<3.1",
+                "symfony/console": ">=2.4|<3.1",
+                "symfony/css-selector": ">=2.4|<3.1",
+                "symfony/dom-crawler": ">=2.4|<3.1",
+                "symfony/event-dispatcher": ">=2.4|<3.1",
+                "symfony/finder": ">=2.4|<3.1",
+                "symfony/yaml": ">=2.4|<3.1"
+            },
+            "require-dev": {
+                "codeception/specify": "~0.3",
+                "facebook/php-sdk-v4": "~4.0",
+                "flow/jsonpath": "~0.2",
+                "monolog/monolog": "~1.8",
+                "pda/pheanstalk": "~2.0",
+                "videlalvaro/php-amqplib": "~2.4"
+            },
+            "suggest": {
+                "codeception/phpbuiltinserver": "Extension to start and stop PHP built-in web server for your tests",
+                "codeception/specify": "BDD-style code blocks",
+                "codeception/verify": "BDD-style assertions",
+                "monolog/monolog": "Log test steps",
+                "phpseclib/phpseclib": "Extension required to use the SFTP option in the FTP Module."
+            },
+            "bin": [
+                "codecept"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": []
+            },
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src\\Codeception",
+                    "Codeception\\Extension\\": "ext"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@mail.ua",
+                    "homepage": "http://codegyre.com"
+                }
+            ],
+            "description": "BDD-style testing framework",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "acceptance testing",
+                "functional testing",
+                "unit testing"
+            ],
+            "time": "2015-12-20 12:11:42"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
+        {
+            "name": "facebook/webdriver",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/facebook/php-webdriver.git",
+                "reference": "1c98108ba3eb435b681655764de11502a0653705"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/1c98108ba3eb435b681655764de11502a0653705",
+                "reference": "1c98108ba3eb435b681655764de11502a0653705",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.19"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.6.*"
+            },
+            "suggest": {
+                "phpdocumentor/phpdocumentor": "2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Facebook\\WebDriver\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "A PHP client for WebDriver",
+            "homepage": "https://github.com/facebook/php-webdriver",
+            "keywords": [
+                "facebook",
+                "php",
+                "selenium",
+                "webdriver"
+            ],
+            "time": "2015-12-31 15:58:49"
+        },
+        {
+            "name": "fzaninotto/faker",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fzaninotto/Faker.git",
+                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d0190b156bcca848d401fb80f31f504f37141c8d",
+                "reference": "d0190b156bcca848d401fb80f31f504f37141c8d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~1.5"
+            },
+            "suggest": {
+                "ext-intl": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "time": "2015-05-29 06:29:14"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "6.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/c6851d6e48f63b69357cbfa55bca116448140e0c",
+                "reference": "c6851d6e48f63b69357cbfa55bca116448140e0c",
+                "shasum": ""
+            },
+            "require": {
+                "guzzlehttp/promises": "~1.0",
+                "guzzlehttp/psr7": "~1.1",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "phpunit/phpunit": "~4.0",
+                "psr/log": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "6.1-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "homepage": "http://guzzlephp.org/",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "rest",
+                "web service"
+            ],
+            "time": "2015-11-23 00:47:50"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "reference": "b1e1c0d55f8083c71eda2c28c12a228d708294ea",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "time": "2015-10-15 22:28:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5d04bdd2881ac89abde1fb78cc234bce24327bb",
+                "reference": "f5d04bdd2881ac89abde1fb78cc234bce24327bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "PSR-7 message implementation",
+            "keywords": [
+                "http",
+                "message",
+                "stream",
+                "uri"
+            ],
+            "time": "2016-01-23 01:23:02"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "suggest": {
+                "dflydev/markdown": "~1.0",
+                "erusev/parsedown": "~1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "phpDocumentor": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "mike.vanriel@naenius.com"
+                }
+            ],
+            "time": "2015-02-03 12:10:50"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+                "reference": "4745ded9307786b730d7a60df5cb5a6c43cf95f7",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "phpdocumentor/reflection-docblock": "~2.0",
+                "sebastian/comparator": "~1.1"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2015-08-13 10:07:40"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-10-06 15:47:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2015-06-21 13:08:43"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2015-06-21 08:01:12"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-09-15 10:49:45"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.8.21",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "ea76b17bced0500a28098626b84eda12dbcf119c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ea76b17bced0500a28098626b84eda12dbcf119c",
+                "reference": "ea76b17bced0500a28098626b84eda12dbcf119c",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": ">=1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.8.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-12-12 07:45:58"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-10-02 06:51:40"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2015-05-04 20:22:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-07-26 15:48:44"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08 07:14:41"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "6e7133793a8e5a5714a551a8324337374be209df"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6e7133793a8e5a5714a551a8324337374be209df",
+                "reference": "6e7133793a8e5a5714a551a8324337374be209df",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2015-12-02 08:37:27"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/7ae5513327cb536431847bcc0c10edba2701064e",
+                "reference": "7ae5513327cb536431847bcc0c10edba2701064e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2015-06-21 07:55:53"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12 03:26:01"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-11-11 19:50:13"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21 13:59:46"
+        },
+        {
+            "name": "symfony/browser-kit",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/browser-kit.git",
+                "reference": "334a58c0def6dfcbe4bb57c6d2a8c06c6cc77679"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/334a58c0def6dfcbe4bb57c6d2a8c06c6cc77679",
+                "reference": "334a58c0def6dfcbe4bb57c6d2a8c06c6cc77679",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/dom-crawler": "~2.8|~3.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~2.8|~3.0",
+                "symfony/process": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\BrowserKit\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony BrowserKit Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-12-26 13:39:53"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "4613311fd46e146f506403ce2f8a0c71d402d2a3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/4613311fd46e146f506403ce2f8a0c71d402d2a3",
+                "reference": "4613311fd46e146f506403ce2f8a0c71d402d2a3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony CssSelector Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-12-05 17:45:07"
+        },
+        {
+            "name": "symfony/dom-crawler",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "7c622b0c9fb8bdb146d6dfa86c5f91dcbfdbc11d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/7c622b0c9fb8bdb146d6dfa86c5f91dcbfdbc11d",
+                "reference": "7c622b0c9fb8bdb146d6dfa86c5f91dcbfdbc11d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/css-selector": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DomCrawler\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony DomCrawler Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-12-26 13:42:31"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "8617895eb798b6bdb338321ce19453dc113e5675"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/8617895eb798b6bdb338321ce19453dc113e5675",
+                "reference": "8617895eb798b6bdb338321ce19453dc113e5675",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2015-12-05 11:13:14"
+        }
+    ],
     "aliases": [],
     "minimum-stability": "stable",
     "stability-flags": [],

From 4218e3f81bba0374b52863208e6a24dda25ddd85 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 12:10:47 -0800
Subject: [PATCH 17/48] Removed extra quotes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 680635957..a2f32d78c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,7 +46,7 @@ before_install:
   - echo "Travis Date - `date`"
   - git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
   - if [ ! -z "$TRAVIS_TAG" ]; then
-      cd "${RT_DEVTOOLS}";
+      cd ${RT_DEVTOOLS};
       ./build-grav.sh skeletons.txt;
     fi
 script:

From db59caa764fd9dfacd43591801cff7e3c648e976 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 12:34:52 -0800
Subject: [PATCH 18/48] Added automatic Unit Tests runner in Travis

---
 .travis.yml | 28 ++++++++++++++++++++--------
 README.md   |  4 ++--
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a2f32d78c..3ca8c9694 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,12 @@
 language: php
-php: 5.6
+php:
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - hhvm
 branches:
   only:
+    - develop
     - master
     - build_test
 notifications:
@@ -42,15 +47,22 @@ env:
 before_install:
   - export TZ=Pacific/Honolulu
   - composer self-update
-  - go get github.com/aktau/github-release
-  - echo "Travis Date - `date`"
-  - git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
-  - if [ ! -z "$TRAVIS_TAG" ]; then
-      cd ${RT_DEVTOOLS};
-      ./build-grav.sh skeletons.txt;
+  - if [ $TRAVIS_BRANCH == 'develop' ]; then
+        composer install --dev --prefer-dist;
+    fi
+  - if [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == '5.6' ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
+        go get github.com/aktau/github-release;
+        git clone --quiet --depth=50 --branch=master https://${BB_TOKEN}bitbucket.org/rockettheme/grav-devtools.git $RT_DEVTOOLS  &>/dev/null;
+        if [ ! -z "$TRAVIS_TAG" ]; then
+            cd ${RT_DEVTOOLS};
+            ./build-grav.sh skeletons.txt;
+        fi;
     fi
 script:
-  - if [ ! -z "$TRAVIS_TAG" ]; then
+  - if [ $TRAVIS_BRANCH == 'develop' ]; then
+        vendor/bin/codecept run;
+    fi
+  - if [ ! -z "$TRAVIS_TAG" ] && [ $TRAVIS_BRANCH != 'develop' ] && [ $TRAVIS_PHP_VERSION == '5.6' ] && [ $TRAVIS_PULL_REQUEST == "false" ]; then
       FILES="$RT_DEVTOOLS/grav-dist/*.zip";
       for file in ${FILES[@]}; do
         NAME=${file##*/};
diff --git a/README.md b/README.md
index df4706876..6f0cf6241 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav
+# ![](https://avatars1.githubusercontent.com/u/8237355?v=2&s=50) Grav [![Build Status](https://travis-ci.org/getgrav/grav.svg?branch=develop)](https://travis-ci.org/getgrav/grav)
 
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad/mini.png)](https://insight.sensiolabs.com/projects/cfd20465-d0f8-4a0a-8444-467f5b5f16ad) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/getgrav/grav?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
@@ -101,7 +101,7 @@ What you mainly want to know is that:
 * [Install](http://learn.getgrav.org/basics/installation) Grav in few seconds
 * Understand the [Configuration](http://learn.getgrav.org/basics/grav-configuration)
 * Take a peek at our available free [Skeletons](http://getgrav.org/downloads/skeletons)
-* If you have questions, jump on our [Gitter Room](https://gitter.im/getgrav/grav)! 
+* If you have questions, jump on our [Gitter Room](https://gitter.im/getgrav/grav)!
 * Have fun!
 
 # Exploring More

From 7d009418763a6413f457d8b33ea8aa080a1155b3 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 13:23:02 -0800
Subject: [PATCH 19/48] Updated hipchat notification

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3ca8c9694..5da61f408 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ notifications:
     rooms:
       - secure: "bqO0wM1B7bJnQw2fuhquSXEqI9gw6WmFytIh9sEWXzbYTzTUP5t0PcKOd3FT2BNMRaDxPJLVl+vG/oqmqDUBkEmOGcG504IQjeNzZqnMz0tXQMIcCc22Las9tFfc4Jf6RVi/qGomFtHGE9Wgii+TAN4zqZaufbNjwd8SyjO0+W8="
     template:
-      - '%{repository}#%{build_number} (%{branch}): Grav Core and Skeletons packages have been uploaded. (<a href="%{build_url}">Details</a>)'
+      - '%{repository}#%{build_number} (%{branch}): Travis Job Finished [%{duration}] (<a href="%{build_url}">Details</a>)'
     format: html
 env:
   global:

From c2fb252a6ef2a06b7aa01bde72dbb6b2a95242ab Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 13:27:43 -0800
Subject: [PATCH 20/48] Disable xdebug on Travis

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 5da61f408..d567ae94f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -58,6 +58,8 @@ before_install:
             ./build-grav.sh skeletons.txt;
         fi;
     fi
+before_script:
+    - phpenv config-rm xdebug.ini
 script:
   - if [ $TRAVIS_BRANCH == 'develop' ]; then
         vendor/bin/codecept run;

From ee99cb79908421e4960ac08d9970ff42ff2bdd0c Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 13:30:26 -0800
Subject: [PATCH 21/48] Disable xdebug only on non hhvm envs

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d567ae94f..7517fc4a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ before_install:
         fi;
     fi
 before_script:
-    - phpenv config-rm xdebug.ini
+    - [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
 script:
   - if [ $TRAVIS_BRANCH == 'develop' ]; then
         vendor/bin/codecept run;

From 99c16d55144b168020b332ec52c0eee54186138f Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 29 Jan 2016 14:31:57 -0700
Subject: [PATCH 22/48] fixes for merge

---
 .../Common/Markdown/ParsedownGravTrait.php    | 66 +++++++++++++++++--
 system/src/Grav/Common/Twig/TwigExtension.php |  5 ++
 system/src/Grav/Common/Uri.php                | 47 ++++++++-----
 3 files changed, 97 insertions(+), 21 deletions(-)

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index cd5a23a4e..aabcae45f 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -317,7 +317,6 @@ trait ParsedownGravTrait
                     }
                 }
 
-
                 $url['query'] = http_build_query($actions, null, '&', PHP_QUERY_RFC3986);
             }
 
@@ -326,15 +325,72 @@ trait ParsedownGravTrait
                 unset ($url['query']);
             }
 
+            // set path to / if not set
+            if (empty($url['path'])) {
+                $url['path'] = '/';
+            }
+
+            // if special scheme, just return
+            if(isset($url['scheme']) && in_array($url['scheme'], $this->special_protocols)) {
+                return $excerpt;
+            }
+
             // if there is no scheme, the file is local and we'll need to convert that URL
             if (!isset($url['scheme']) && (count($url) > 0)) {
-                $excerpt['element']['attributes']['href'] = Uri::convertUrl($this->page, Uri::buildUrl($url), $type,
+                $url['path'] = Uri::convertUrl($this->page, Uri::buildUrl($url), $type,
                     true);
-            } elseif (in_array($url['scheme'], $this->special_protocols)) {
-                return $excerpt;
             } else {
-                $excerpt['element']['attributes']['href'] = Uri::buildUrl($url);
+                $url['path'] = Uri::convertUrl($this->page, $url['path'], $type, true);
             }
+
+            // if absolute urls enabled, add them
+            if (self::getGrav()['config']->get('system.absolute_urls', false)) {
+                $uri = self::getGrav()['uri'];
+                $url['scheme'] = str_replace('://', '', $uri->scheme());
+                $url['host'] = $uri->host();
+
+                if ($uri->port() != 80 && $uri->port() != 443) {
+                    $url['port'] = $uri->port();
+                }
+
+                // check if page exists for this route, and if so, check if it has SSL enabled
+                $pages = self::getGrav()['pages'];
+                $routes = $pages->routes();
+
+                // if this is an image, get the proper path
+                $url_bits = pathinfo($url['path']);
+                if (isset($url_bits['extension'])) {
+                    $target_path = $url_bits['dirname'];
+                } else {
+                    $target_path = $url['path'];
+                }
+
+                // strip base from this path
+                $target_path = str_replace($uri->rootUrl(), '', $target_path);
+
+                // set to / if root
+                if (empty($target_path)) {
+                    $target_path = '/';
+                }
+
+                // look to see if this page exists and has ssl enabled
+                if (isset($routes[$target_path])) {
+                    $target_page = $pages->get($routes[$target_path]);
+                    if ($target_page) {
+                        $ssl_enabled = $target_page->ssl();
+                        if (isset($ssl_enabled)) {
+                            if ($ssl_enabled) {
+                                $url['scheme'] = 'https';
+                            } else {
+                                $url['scheme'] = 'http';
+                            }
+                        }
+                    }
+                }
+            }
+
+            $excerpt['element']['attributes']['href'] = Uri::buildUrl($url);
+
         }
 
         return $excerpt;
diff --git a/system/src/Grav/Common/Twig/TwigExtension.php b/system/src/Grav/Common/Twig/TwigExtension.php
index 12a1cb633..4d54d4168 100644
--- a/system/src/Grav/Common/Twig/TwigExtension.php
+++ b/system/src/Grav/Common/Twig/TwigExtension.php
@@ -457,6 +457,11 @@ class TwigExtension extends \Twig_Extension
             return false;
         }
 
+        if ($this->grav['config']->get('system.absolute_urls', false)) {
+            $domain = true;
+        }
+
+
         if (strpos((string) $input, '://')) {
             /** @var UniformResourceLocator $locator */
             $locator = $this->grav['locator'];
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 5900622a1..0857238cb 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -24,6 +24,7 @@ class Uri
     protected $params;
     protected $path;
     protected $paths;
+    protected $scheme;
     protected $port;
     protected $query;
     protected $root;
@@ -42,6 +43,7 @@ class Uri
         $this->name         = $this->buildHostname();
         $this->port         = $this->buildPort();
         $this->uri          = $this->buildUri();
+        $this->scheme       = $this->buildScheme();
         $this->base         = $this->buildBaseUrl();
         $this->host         = $this->buildHost();
         $this->root_path    = $this->buildRootPath();
@@ -56,15 +58,15 @@ class Uri
      */
     private function buildHostname()
     {
-        $name = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost');
+        $hostname = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : (isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'localhost');
 
-        // Remove port from HTTP_HOST generated $name
-        $name = Utils::substrToString($name, ':');
+        // Remove port from HTTP_HOST generated $hostname
+        $hostname = Utils::substrToString($hostname, ':');
 
         // Validate the hostname
-        $name = $this->validateHostname($name) ? $name : 'unknown';
+        $hostname = $this->validateHostname($hostname) ? $hostname : 'unknown';
 
-        return $name;
+        return $hostname;
     }
 
     /**
@@ -103,6 +105,18 @@ class Uri
         return $uri;
     }
 
+    private function buildScheme()
+    {
+        // set the base
+        if (isset($_SERVER['HTTPS'])) {
+            $scheme = (strtolower(@$_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';
+        } else {
+            $scheme = 'http://';
+        }
+
+        return $scheme;
+    }
+
     /**
      * Get the base URI with port if needed
      *
@@ -110,17 +124,7 @@ class Uri
      */
     private function buildBaseUrl()
     {
-        // set the base
-        if (isset($_SERVER['HTTPS'])) {
-            $base = (strtolower(@$_SERVER['HTTPS']) == 'on') ? 'https://' : 'http://';
-        } else {
-            $base = 'http://';
-        }
-
-        // add the server name
-        $base .= $this->name;
-
-        return $base;
+        return $this->scheme . $this->name;
     }
 
     /**
@@ -483,6 +487,17 @@ class Uri
         return $this->extension;
     }
 
+    /**
+     * Return the scheme of the URI
+     *
+     * @return String The scheme of the URI
+     */
+    public function scheme()
+    {
+        return $this->scheme;
+    }
+
+
     /**
      * Return the host of the URI
      *

From 258551294609c6f574c385eef803808f519b8625 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Fri, 29 Jan 2016 13:33:57 -0800
Subject: [PATCH 23/48] Typo

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7517fc4a8..fa53c78a2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,7 +59,7 @@ before_install:
         fi;
     fi
 before_script:
-    - [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
+    - if [ $TRAVIS_PHP_VERSION != 'hhvm' ]; then phpenv config-rm xdebug.ini; fi
 script:
   - if [ $TRAVIS_BRANCH == 'develop' ]; then
         vendor/bin/codecept run;

From a1dca420e42206e943e6dc4a3c2d133388b869c9 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 29 Jan 2016 17:32:44 -0700
Subject: [PATCH 24/48] More progress with tests using page references.

---
 .../Common/Markdown/ParsedownGravTrait.php    |  4 ++
 .../01.item1-1/01.item1-1-1/default.md        | 10 ++++
 .../01.item1-1/02.item1-1-2/default.md        | 10 ++++
 .../01.item1-1/03.item1-1-3/default.md        | 10 ++++
 .../user/pages/01.item1/01.item1-1/default.md | 10 ++++
 .../02.item1-2/01.item1-2-1/default.md        | 10 ++++
 .../02.item1-2/02.item1-2-2/default.md        | 10 ++++
 .../02.item1-2/03.item1-2-3/default.md        | 10 ++++
 .../user/pages/01.item1/02.item1-2/default.md | 10 ++++
 .../03.item1-3/01.item1-3-1/default.md        | 10 ++++
 .../03.item1-3/02.item1-3-2/default.md        | 10 ++++
 .../03.item1-3/03.item1-3-3/default.md        | 10 ++++
 .../user/pages/01.item1/03.item1-3/default.md | 10 ++++
 .../user/pages/01.item1/default.md            | 10 ++++
 .../01.item2-1/01.item2-1-1/default.md        | 10 ++++
 .../01.item2-1/02.item2-1-2/default.md        | 10 ++++
 .../01.item2-1/03.item2-1-3/default.md        | 10 ++++
 .../user/pages/02.item2/01.item2-1/default.md | 10 ++++
 .../02.item2-2/01.item2-2-1/default.md        | 10 ++++
 .../02.item2-2/02.item2-2-2/default.md        | 10 ++++
 .../02.item2-2/03.item2-2-3/default.md        | 10 ++++
 .../user/pages/02.item2/02.item2-2/default.md | 10 ++++
 .../03.item2-3/01.item2-3-1/default.md        | 10 ++++
 .../03.item2-3/02.item2-3-2/default.md        | 10 ++++
 .../03.item2-3/03.item2-3-3/default.md        | 10 ++++
 .../user/pages/02.item2/03.item2-3/default.md | 10 ++++
 .../user/pages/02.item2/default.md            | 10 ++++
 .../01.item3-1/01.item3-1-1/default.md        | 14 ++++++
 .../01.item3-1/02.item3-1-2/default.md        | 10 ++++
 .../01.item3-1/03.item3-1-3/default.md        | 10 ++++
 .../user/pages/03.item3/01.item3-1/default.md | 10 ++++
 .../02.item3-2/01.item3-2-1/default.md        | 10 ++++
 .../02.item3-2/02.item3-2-2/default.md        | 10 ++++
 .../02.item3-2/03.item3-2-3/default.md        | 10 ++++
 .../user/pages/03.item3/02.item3-2/default.md | 10 ++++
 .../03.item3-3/01.item3-3-1/default.md        | 10 ++++
 .../03.item3-3/02.item3-3-2/default.md        | 10 ++++
 .../03.item3-3/03.item3-3-3/default.md        | 10 ++++
 .../user/pages/03.item3/03.item3-3/default.md | 10 ++++
 .../user/pages/03.item3/default.md            | 10 ++++
 tests/unit/Grav/Common/MarkdownTest.php       | 48 +++++++++++++++++--
 41 files changed, 441 insertions(+), 5 deletions(-)
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/01.item1-1/01.item1-1-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/01.item1-1/02.item1-1-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/01.item1-1/03.item1-1-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/01.item1-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/02.item1-2/01.item1-2-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/02.item1-2/02.item1-2-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/02.item1-2/03.item1-2-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/02.item1-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/03.item1-3/01.item1-3-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/03.item1-3/02.item1-3-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/03.item1-3/03.item1-3-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/03.item1-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/01.item1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/01.item2-1/01.item2-1-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/01.item2-1/02.item2-1-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/01.item2-1/03.item2-1-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/01.item2-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/02.item2-2/01.item2-2-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/02.item2-2/02.item2-2-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/02.item2-2/03.item2-2-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/02.item2-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/03.item2-3/01.item2-3-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/03.item2-3/02.item2-3-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/03.item2-3/03.item2-3-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/03.item2-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/02.item2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/01.item3-1/01.item3-1-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/01.item3-1/02.item3-1-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/01.item3-1/03.item3-1-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/01.item3-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/02.item3-2/01.item3-2-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/02.item3-2/02.item3-2-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/02.item3-2/03.item3-2-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/02.item3-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/03.item3-3/01.item3-3-1/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/03.item3-3/02.item3-3-2/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/03.item3-3/03.item3-3-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/03.item3-3/default.md
 create mode 100644 tests/fake/nested-site/user/pages/03.item3/default.md

diff --git a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
index aabcae45f..7dbaa4e3e 100644
--- a/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
+++ b/system/src/Grav/Common/Markdown/ParsedownGravTrait.php
@@ -343,6 +343,10 @@ trait ParsedownGravTrait
                 $url['path'] = Uri::convertUrl($this->page, $url['path'], $type, true);
             }
 
+            // URL path already has these now so remove them
+            unset($url['query']);
+            unset($url['fragment']);
+
             // if absolute urls enabled, add them
             if (self::getGrav()['config']->get('system.absolute_urls', false)) {
                 $uri = self::getGrav()['uri'];
diff --git a/tests/fake/nested-site/user/pages/01.item1/01.item1-1/01.item1-1-1/default.md b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/01.item1-1-1/default.md
new file mode 100644
index 000000000..14ad70cb4
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/01.item1-1-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-1-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/01.item1-1/02.item1-1-2/default.md b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/02.item1-1-2/default.md
new file mode 100644
index 000000000..2d25766c7
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/02.item1-1-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-1-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/01.item1-1/03.item1-1-3/default.md b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/03.item1-1-3/default.md
new file mode 100644
index 000000000..42f000902
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/03.item1-1-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-1-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/01.item1-1/default.md b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/default.md
new file mode 100644
index 000000000..da8052859
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/01.item1-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/02.item1-2/01.item1-2-1/default.md b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/01.item1-2-1/default.md
new file mode 100644
index 000000000..b07967d1e
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/01.item1-2-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/02.item1-2/02.item1-2-2/default.md b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/02.item1-2-2/default.md
new file mode 100644
index 000000000..ba0603668
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/02.item1-2-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-2-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/02.item1-2/03.item1-2-3/default.md b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/03.item1-2-3/default.md
new file mode 100644
index 000000000..514de19b9
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/03.item1-2-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-2-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/02.item1-2/default.md b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/default.md
new file mode 100644
index 000000000..6f2853032
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/02.item1-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/03.item1-3/01.item1-3-1/default.md b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/01.item1-3-1/default.md
new file mode 100644
index 000000000..c2af57160
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/01.item1-3-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-3-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/03.item1-3/02.item1-3-2/default.md b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/02.item1-3-2/default.md
new file mode 100644
index 000000000..9e0d64cea
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/02.item1-3-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-3-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/03.item1-3/03.item1-3-3/default.md b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/03.item1-3-3/default.md
new file mode 100644
index 000000000..d961ff75d
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/03.item1-3-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-3-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/03.item1-3/default.md b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/default.md
new file mode 100644
index 000000000..b214efa9a
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/03.item1-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/01.item1/default.md b/tests/fake/nested-site/user/pages/01.item1/default.md
new file mode 100644
index 000000000..1019157fe
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/01.item1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/01.item2-1/01.item2-1-1/default.md b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/01.item2-1-1/default.md
new file mode 100644
index 000000000..11f47bf1e
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/01.item2-1-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/01.item2-1/02.item2-1-2/default.md b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/02.item2-1-2/default.md
new file mode 100644
index 000000000..3154d3d8a
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/02.item2-1-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/01.item2-1/03.item2-1-3/default.md b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/03.item2-1-3/default.md
new file mode 100644
index 000000000..553db89cd
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/03.item2-1-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/01.item2-1/default.md b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/default.md
new file mode 100644
index 000000000..6e4261d0c
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/01.item2-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/02.item2-2/01.item2-2-1/default.md b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/01.item2-2-1/default.md
new file mode 100644
index 000000000..7798f0955
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/01.item2-2-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/02.item2-2/02.item2-2-2/default.md b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/02.item2-2-2/default.md
new file mode 100644
index 000000000..3d3555010
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/02.item2-2-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-2-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/02.item2-2/03.item2-2-3/default.md b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/03.item2-2-3/default.md
new file mode 100644
index 000000000..f4bb37c0e
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/03.item2-2-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-2-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/02.item2-2/default.md b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/default.md
new file mode 100644
index 000000000..65966c378
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/02.item2-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/03.item2-3/01.item2-3-1/default.md b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/01.item2-3-1/default.md
new file mode 100644
index 000000000..5d17e1df9
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/01.item2-3-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-3-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/03.item2-3/02.item2-3-2/default.md b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/02.item2-3-2/default.md
new file mode 100644
index 000000000..2a2c6f6ac
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/02.item2-3-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-3-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/03.item2-3/03.item2-3-3/default.md b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/03.item2-3-3/default.md
new file mode 100644
index 000000000..064933976
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/03.item2-3-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-3-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/03.item2-3/default.md b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/default.md
new file mode 100644
index 000000000..41b4acb08
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/03.item2-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/02.item2/default.md b/tests/fake/nested-site/user/pages/02.item2/default.md
new file mode 100644
index 000000000..3a27233d2
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/02.item2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/01.item3-1/01.item3-1-1/default.md b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/01.item3-1-1/default.md
new file mode 100644
index 000000000..ee0120db6
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/01.item3-1-1/default.md
@@ -0,0 +1,14 @@
+---
+title: Animal
+taxonomy:
+    tag: [animal, cat]
+---
+
+<h1>Tags: animal</h1
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/01.item3-1/02.item3-1-2/default.md b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/02.item3-1-2/default.md
new file mode 100644
index 000000000..6308fc58e
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/02.item3-1-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-1-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/01.item3-1/03.item3-1-3/default.md b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/03.item3-1-3/default.md
new file mode 100644
index 000000000..f18a80a9f
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/03.item3-1-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-1-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/01.item3-1/default.md b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/default.md
new file mode 100644
index 000000000..6e4261d0c
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/01.item3-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/02.item3-2/01.item3-2-1/default.md b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/01.item3-2-1/default.md
new file mode 100644
index 000000000..d23767d32
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/01.item3-2-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/02.item3-2/02.item3-2-2/default.md b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/02.item3-2-2/default.md
new file mode 100644
index 000000000..669f15f90
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/02.item3-2-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-2-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/02.item3-2/03.item3-2-3/default.md b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/03.item3-2-3/default.md
new file mode 100644
index 000000000..5a88e78f0
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/03.item3-2-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-2-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/02.item3-2/default.md b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/default.md
new file mode 100644
index 000000000..6e4261d0c
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/02.item3-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/03.item3-3/01.item3-3-1/default.md b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/01.item3-3-1/default.md
new file mode 100644
index 000000000..ce2ae8c3b
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/01.item3-3-1/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-3-1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/03.item3-3/02.item3-3-2/default.md b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/02.item3-3-2/default.md
new file mode 100644
index 000000000..f42aa0fa2
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/02.item3-3-2/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-3-2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/03.item3-3/03.item3-3-3/default.md b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/03.item3-3-3/default.md
new file mode 100644
index 000000000..af4a04961
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/03.item3-3-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3-3-3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/03.item3-3/default.md b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/default.md
new file mode 100644
index 000000000..3a27233d2
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/03.item3-3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/fake/nested-site/user/pages/03.item3/default.md b/tests/fake/nested-site/user/pages/03.item3/default.md
new file mode 100644
index 000000000..ee7ba9477
--- /dev/null
+++ b/tests/fake/nested-site/user/pages/03.item3/default.md
@@ -0,0 +1,10 @@
+---
+title: Item 3
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index ba8890aa6..d295a9899 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -2,6 +2,10 @@
 
 use Codeception\Util\Fixtures;
 use Grav\Common\Grav;
+use Grav\Common\Page\Pages;
+use Grav\Common\Page\Page;
+use Grav\Common\Markdown\Parsedown;
+
 
 /**
  * Class AssetsTest
@@ -14,10 +18,24 @@ class MarkdownTest extends \Codeception\TestCase\Test
     /** @var Grav $grav */
     protected $grav;
 
+    /** @var Pages $pages */
+    protected $pages;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
 
+        $this->pages = $this->grav['pages'];
+
+        /** @var UniformResourceLocator $locator */
+        $locator = $this->grav['locator'];
+        $locator->addPath('page', '', 'tests/fake/nested-site/user/pages', false);
+        $this->pages->init();
+
+        unset($this->grav['pages']);
+
+        $this->grav['pages'] = $this->pages;
+
         $defaults = [
             'extra'            => false,
             'auto_line_breaks' => false,
@@ -25,7 +43,7 @@ class MarkdownTest extends \Codeception\TestCase\Test
             'escape_markup'    => false,
             'special_chars'    => ['>' => 'gt', '<' => 'lt'],
         ];
-        $page = new \Grav\Common\Page\Page();
+        $page = $this->pages->dispatch('/item2/item2-2');
 
         $this->parsedown = new Parsedown($page, $defaults);
     }
@@ -44,6 +62,26 @@ class MarkdownTest extends \Codeception\TestCase\Test
         return preg_replace('/^\s*(.*)/', '', $string);
     }
 
+    public function testDirectoryRelativeLinks()
+    {
+        $this->assertSame($this->parsedown->text('[Down a Level](item2-2-1)'),
+            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
+        $this->assertSame($this->parsedown->text('[Up a Level](..)'),
+            '<p><a href="/item2">Up a Level</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down](../../item3/item3-3)'),
+            '<p><a href="/item3/item3-3">Up and Down</a></p>');
+        $this->assertSame($this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)'),
+            '<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>');
+//        $this->assertSame($this->parsedown->text('[Up a Level with Query](../?foo=bar)'),
+//            '<p><a href="/item2?foo=bar">Up a Level with Query</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)'),
+        '<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)'),
+            '<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)'),
+            '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>');
+    }
+
     public function testMarkdownSpecialProtocols()
     {
         $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'),
@@ -59,13 +97,13 @@ class MarkdownTest extends \Codeception\TestCase\Test
     public function testMarkdownReferenceLinks()
     {
         $sample = '[relative link][r_relative]
-                   [r_relative]: ../03.assets#blah';
-        $this->assertSame($this->parsedown->text($sample), '<p><a href="../03.assets#blah">relative link</a></p>');
+                   [r_relative]: ../item2-3#blah';
+        $this->assertSame($this->parsedown->text($sample), '<p><a href="/item2/item2-3#blah">relative link</a></p>');
 
         $sample = '[absolute link][r_absolute]
-                   [r_absolute]: /blog/focus-and-blur#blah';
+                   [r_absolute]: /item3#blah';
         $this->assertSame($this->parsedown->text($sample),
-            '<p><a href="/blog/focus-and-blur#blah">absolute link</a></p>');
+            '<p><a href="/item3#blah">absolute link</a></p>');
 
         $sample = '[external link][r_external]
                    [r_external]: http://www.cnn.com';

From fe01f298728131cb964d9ba089f678f3e1bc9bd1 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 29 Jan 2016 17:40:20 -0700
Subject: [PATCH 25/48] slug and directory relative links

---
 tests/unit/Grav/Common/MarkdownTest.php | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index d295a9899..62d532e8e 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -62,7 +62,7 @@ class MarkdownTest extends \Codeception\TestCase\Test
         return preg_replace('/^\s*(.*)/', '', $string);
     }
 
-    public function testDirectoryRelativeLinks()
+    public function testSlugRelativeLinks()
     {
         $this->assertSame($this->parsedown->text('[Down a Level](item2-2-1)'),
             '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
@@ -82,6 +82,22 @@ class MarkdownTest extends \Codeception\TestCase\Test
             '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>');
     }
 
+    public function testDirectoryRelativeLinks()
+    {
+        $this->assertSame($this->parsedown->text('[Down a Level](01.item2-2-1)'),
+            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down](../../03.item3/03.item3-3)'),
+            '<p><a href="/item3/item3-3">Up and Down</a></p>');
+        $this->assertSame($this->parsedown->text('[Down a Level with Query](01.item2-2-1?foo=bar)'),
+            '<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down with Query](../../03.item3/03.item3-3?foo=bar)'),
+            '<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>');
+//        $this->assertSame($this->parsedown->text('[Up and Down with Param](../../03.item3/03.item3-3/foo:bar)'),
+//            '<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>');
+        $this->assertSame($this->parsedown->text('[Up and Down with Anchor](../../03.item3/03.item3-3#foo)'),
+            '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>');
+    }
+
     public function testMarkdownSpecialProtocols()
     {
         $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'),

From 07fa7da920e656cf562395eba3de91988747a895 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 29 Jan 2016 21:32:16 -0700
Subject: [PATCH 26/48] renaming some tests

---
 tests/unit/Grav/Common/MarkdownTest.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index 62d532e8e..6968bfc0d 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -33,7 +33,6 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->pages->init();
 
         unset($this->grav['pages']);
-
         $this->grav['pages'] = $this->pages;
 
         $defaults = [
@@ -98,7 +97,7 @@ class MarkdownTest extends \Codeception\TestCase\Test
             '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>');
     }
 
-    public function testMarkdownSpecialProtocols()
+    public function testSpecialProtocols()
     {
         $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'),
             '<p><a href="mailto:user@domain.com">mailto</a></p>');
@@ -110,7 +109,7 @@ class MarkdownTest extends \Codeception\TestCase\Test
             '<p><a href="sms:123-555-12345">sms</a></p>');
     }
 
-    public function testMarkdownReferenceLinks()
+    public function testReferenceLinks()
     {
         $sample = '[relative link][r_relative]
                    [r_relative]: ../item2-3#blah';
@@ -126,7 +125,7 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->assertSame($this->parsedown->text($sample), '<p><a href="http://www.cnn.com">external link</a></p>');
     }
 
-    public function testMarkdownExternalLinks()
+    public function testExternalLinks()
     {
         $this->assertSame($this->parsedown->text('[cnn.com](http://www.cnn.com)'),
             '<p><a href="http://www.cnn.com">cnn.com</a></p>');

From 13db4025b69618760512844e503b94d08e5ec177 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 29 Jan 2016 21:32:34 -0700
Subject: [PATCH 27/48] reset the pages

---
 tests/unit/Grav/Common/Page/PagesTest.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
index 5225f35b7..fe594b05c 100644
--- a/tests/unit/Grav/Common/Page/PagesTest.php
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -30,6 +30,9 @@ class PagesTest extends \Codeception\TestCase\Test
         $locator = $this->grav['locator'];
         $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
         $this->pages->init();
+
+        unset($this->grav['pages']);
+        $this->grav['pages'] = $this->pages;
     }
 
     public function testAll()

From 06a76579db1a0099fbab18e474abb5c50fb7dc81 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 30 Jan 2016 00:06:15 -0700
Subject: [PATCH 28/48] more tests

---
 tests/unit/Grav/Common/MarkdownTest.php | 33 +++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index 6968bfc0d..6a5c8cab3 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -61,8 +61,23 @@ class MarkdownTest extends \Codeception\TestCase\Test
         return preg_replace('/^\s*(.*)/', '', $string);
     }
 
+    public function testAnchorLinks()
+    {
+        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
+            '<p><a href="/item2/item2-1#foo">Peer Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
+            '<p><a href="/item2/item2-1/#foo">Peer Anchor 2</a></p>');
+//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
+//            '<p><a href="#foo">Current Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
+            '<p><a href="/#foo">Root Anchor</a></p>');
+
+    }
+
     public function testSlugRelativeLinks()
     {
+        $this->assertSame($this->parsedown->text('[Peer Page](../item2-1)'),
+            '<p><a href="/item2/item2-1">Peer Page</a></p>');
         $this->assertSame($this->parsedown->text('[Down a Level](item2-2-1)'),
             '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
         $this->assertSame($this->parsedown->text('[Up a Level](..)'),
@@ -83,6 +98,8 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
     public function testDirectoryRelativeLinks()
     {
+        $this->assertSame($this->parsedown->text('[Peer Page](../01.item2-1)'),
+            '<p><a href="/item2/item2-1">Peer Page</a></p>');
         $this->assertSame($this->parsedown->text('[Down a Level](01.item2-2-1)'),
             '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
         $this->assertSame($this->parsedown->text('[Up and Down](../../03.item3/03.item3-3)'),
@@ -97,6 +114,22 @@ class MarkdownTest extends \Codeception\TestCase\Test
             '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>');
     }
 
+    public function testDirectoryAbsoluteLinks()
+    {
+        $this->assertSame($this->parsedown->text('[Peer Page](/item2/item2-1)'),
+            '<p><a href="/item2/item2-1">Peer Page</a></p>');
+        $this->assertSame($this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)'),
+            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
+        $this->assertSame($this->parsedown->text('[Up a Level](/item2)'),
+            '<p><a href="/item2">Up a Level</a></p>');
+        $this->assertSame($this->parsedown->text('[With Query](/item2?foo=bar)'),
+            '<p><a href="/item2?foo=bar">With Query</a></p>');
+        $this->assertSame($this->parsedown->text('[With Param](/item2/foo:bar)'),
+            '<p><a href="/item2/foo:bar">With Param</a></p>');
+        $this->assertSame($this->parsedown->text('[With Anchor](/item2#foo)'),
+            '<p><a href="/item2#foo">With Anchor</a></p>');
+    }
+
     public function testSpecialProtocols()
     {
         $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'),

From b612347ee746bc3b2f85fa241f608c219ee4c7ba Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Sat, 30 Jan 2016 12:20:07 +0100
Subject: [PATCH 29/48] :construction: Drop unneeded pages unset. Remove second
 set of pages test, currently not working

---
 tests/unit/Grav/Common/MarkdownTest.php   |  3 ---
 tests/unit/Grav/Common/Page/PagesTest.php | 13 +++++--------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index 6a5c8cab3..1e1760910 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -32,9 +32,6 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $locator->addPath('page', '', 'tests/fake/nested-site/user/pages', false);
         $this->pages->init();
 
-        unset($this->grav['pages']);
-        $this->grav['pages'] = $this->pages;
-
         $defaults = [
             'extra'            => false,
             'auto_line_breaks' => false,
diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
index fe594b05c..aed050ee7 100644
--- a/tests/unit/Grav/Common/Page/PagesTest.php
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -27,12 +27,9 @@ class PagesTest extends \Codeception\TestCase\Test
         $this->pages = $this->grav['pages'];
 
         /** @var UniformResourceLocator $locator */
-        $locator = $this->grav['locator'];
-        $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
-        $this->pages->init();
-
-        unset($this->grav['pages']);
-        $this->grav['pages'] = $this->pages;
+//        $locator = $this->grav['locator'];
+//        $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
+//        $this->pages->init();
     }
 
     public function testAll()
@@ -46,7 +43,7 @@ class PagesTest extends \Codeception\TestCase\Test
     {
         $list = $this->pages->getList();
         $this->assertTrue(is_array($list));
-        $this->assertSame($list['/'], 'Home');
-        $this->assertSame($list['/blog'], 'Blog');
+//        $this->assertSame($list['/home'], 'Home');
+//        $this->assertSame($list['/blog'], 'Blog');
     }
 }

From b17a3780ab668d6a39a7afac19f6d739189a592e Mon Sep 17 00:00:00 2001
From: Tyler Cosgrove <Vivalldi@users.noreply.github.com>
Date: Sat, 30 Jan 2016 18:15:28 -0500
Subject: [PATCH 30/48] Change user to USER - Easy to note replacement

Primarily going to be used for install script but it makes it more apparent that someone may need to change their root path.
---
 webserver-configs/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webserver-configs/nginx.conf b/webserver-configs/nginx.conf
index dbc581fee..69f88fb77 100644
--- a/webserver-configs/nginx.conf
+++ b/webserver-configs/nginx.conf
@@ -3,7 +3,7 @@ server {
     index index.html index.php;
 
     ## Begin - Server Info
-    root /home/user/www/html;
+    root /home/USER/www/html;
     server_name localhost;
     ## End - Server Info
 

From 47b5cd7db77d3e101a57e3f1324151599d5a32c1 Mon Sep 17 00:00:00 2001
From: Tyler Cosgrove <Vivalldi@users.noreply.github.com>
Date: Sun, 31 Jan 2016 11:46:43 -0500
Subject: [PATCH 31/48] Deny access to `tests` folder

---
 webserver-configs/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webserver-configs/nginx.conf b/webserver-configs/nginx.conf
index 69f88fb77..50ff852b9 100644
--- a/webserver-configs/nginx.conf
+++ b/webserver-configs/nginx.conf
@@ -32,13 +32,13 @@ server {
 
     ## Begin - Security
     # deny all direct access for these folders
-    location ~* /(.git|cache|bin|logs|backups)/.*$ { return 403; }
+    location ~* /(.git|cache|bin|logs|backups|tests)/.*$ { return 403; }
     # deny running scripts inside core system folders
     location ~* /(system|vendor)/.*\.(txt|xml|md|html|yaml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
     # deny running scripts inside user folder
     location ~* /user/.*\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
     # deny access to specific files in the root folder
-    location ~ /(LICENSE.txt|composer.lock|composer.json|nginx.conf|web.config|htaccess.txt|\.htaccess) { return 403; }
+    location ~ /(LICENSE|composer.lock|composer.json|nginx.conf|web.config|htaccess.txt|\.htaccess) { return 403; }
     ## End - Security
 }
 

From 3d830fb6080fbad116dc71223ed3185f754b431f Mon Sep 17 00:00:00 2001
From: Tyler Cosgrove <Vivalldi@users.noreply.github.com>
Date: Sun, 31 Jan 2016 11:47:53 -0500
Subject: [PATCH 32/48] Deny access to `tests` folder

---
 webserver-configs/lighttpd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webserver-configs/lighttpd.conf b/webserver-configs/lighttpd.conf
index 8429b865f..a4775a555 100644
--- a/webserver-configs/lighttpd.conf
+++ b/webserver-configs/lighttpd.conf
@@ -30,7 +30,7 @@ url.rewrite-if-not-file = (
 $HTTP["url"] =~ "^/grav_path/(LICENSE.txt|composer.json|composer.lock|nginx.conf|web.config)$" {
     url.access-deny = ("")
 }
-$HTTP["url"] =~ "^/grav_path/(.git|cache|bin|logs|backup)/(.*)" {
+$HTTP["url"] =~ "^/grav_path/(.git|cache|bin|logs|backup|tests)/(.*)" {
     url.access-deny = ("")
 }
 $HTTP["url"] =~ "^/grav_path/(system|user|vendor)/(.*)\.(txt|md|html|yaml|php|twig|sh|bat)$" {

From 49c4dd197e0ef2809e1b9d7022ad09a1a2e99a09 Mon Sep 17 00:00:00 2001
From: Tyler Cosgrove <Vivalldi@users.noreply.github.com>
Date: Sun, 31 Jan 2016 11:48:53 -0500
Subject: [PATCH 33/48] Deny access to `tests` folder

---
 webserver-configs/htaccess.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webserver-configs/htaccess.txt b/webserver-configs/htaccess.txt
index a5f6b9c96..c82ca8fa6 100644
--- a/webserver-configs/htaccess.txt
+++ b/webserver-configs/htaccess.txt
@@ -44,7 +44,7 @@ RewriteRule .* index.php [L]
 
 ## Begin - Security
 # Block all direct access for these folders
-RewriteRule ^(.git|cache|bin|logs|backup|webserver-configs)/(.*) error [F]
+RewriteRule ^(.git|cache|bin|logs|backup|webserver-configs|tests)/(.*) error [F]
 # Block access to specific file types for these system folders
 RewriteRule ^(system|vendor)/(.*)\.(txt|xml|md|html|yaml|php|pl|py|cgi|twig|sh|bat)$ error [F]
 # Block access to specific file types for these user folders

From 9ba4ced65ddd76b43295f5f78351000e7ebc179c Mon Sep 17 00:00:00 2001
From: Tyler Cosgrove <Vivalldi@users.noreply.github.com>
Date: Sun, 31 Jan 2016 12:02:41 -0500
Subject: [PATCH 34/48] Extensive update.

Simplify a few blocks into one.
---
 webserver-configs/web.config | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/webserver-configs/web.config b/webserver-configs/web.config
index 9ef3d88fd..d9ea0c6e1 100644
--- a/webserver-configs/web.config
+++ b/webserver-configs/web.config
@@ -17,28 +17,12 @@
                     </conditions>
                     <action type="Rewrite" url="index.php" />
                 </rule>
-                <rule name="user_accounts" stopProcessing="true">
-                    <match url="^user/accounts/(.*)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="user_config" stopProcessing="true">
-                    <match url="^user/config/(.*)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
                 <rule name="user_error_redirect" stopProcessing="true">
-                    <match url="^user/(.*)\.(txt|md|html|php|yaml|json|twig|sh|bat)$" ignoreCase="false" />
+                    <match url="^(user)/(.*)\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$" ignoreCase="false" />
                     <action type="Redirect" url="error" redirectType="Permanent" />
                 </rule>
-                <rule name="cache" stopProcessing="true">
-                    <match url="^cache/(.*)" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="bin" stopProcessing="true">
-                    <match url="^bin/(.*)$" ignoreCase="false" />
-                    <action type="Redirect" url="error" redirectType="Permanent" />
-                </rule>
-                <rule name="backup" stopProcessing="true">
-                    <match url="^backup/(.*)" ignoreCase="false" />
+                <rule name="ignore_folders" stopProcessing="true">
+                    <match url="^(.git|cache|bin|logs|backup|webserver-configs|tests)/(.*)" ignoreCase="false" />
                     <action type="Redirect" url="error" redirectType="Permanent" />
                 </rule>
                 <rule name="system" stopProcessing="true">

From 5abb4060f39cd0b221a5cf86873f9d8b8cc7d570 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 31 Jan 2016 19:04:58 -0700
Subject: [PATCH 35/48] moved grav-based base_uri values into Uri->init()

---
 system/src/Grav/Common/Grav.php | 15 ---------------
 system/src/Grav/Common/Uri.php  |  5 +++++
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 05cc8944e..669d91cee 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -190,21 +190,6 @@ class Grav extends Container
             return new Browser();
         };
 
-        $container['base_url_absolute'] = function ($c) {
-            /** @var Grav $c */
-            return $c['config']->get('system.base_url_absolute') ?: $c['uri']->rootUrl(true);
-        };
-
-        $container['base_url_relative'] = function ($c) {
-            /** @var Grav $c */
-            return $c['config']->get('system.base_url_relative') ?: $c['uri']->rootUrl(false);
-        };
-
-        $container['base_url'] = function ($c) {
-            /** @var Grav $c */
-            return $c['config']->get('system.absolute_urls') ? $c['base_url_absolute'] : $c['base_url_relative'];
-        };
-
         $container->register(new StreamsServiceProvider);
         $container->register(new ConfigServiceProvider);
 
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 0857238cb..0d30d3b07 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -304,6 +304,11 @@ class Uri
         if ($this->content_path != '') {
             $this->paths = explode('/', $this->content_path);
         }
+
+        // Set some Grav stuff
+        $grav['base_url_absolute'] = $this->rootUrl(true);
+        $grav['base_url_relative'] = $this->rootUrl(false);
+        $grav['base_url'] = $grav['config']->get('system.absolute_urls') ? $grav['base_url_absolute'] : $grav['base_url_relative'];
     }
 
     /**

From 0ddfd4c5461487cbfebc03faeb87c8fb056af78d Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 31 Jan 2016 19:05:15 -0700
Subject: [PATCH 36/48] value is getting overridden so not needed here

---
 system/src/Grav/Common/Uri.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index 0d30d3b07..874902003 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -221,7 +221,6 @@ class Uri
     {
         $this->initializeWithUrl($url);
         $this->root_path = $root_path;
-        $this->root = $this->base . $this->root_path;
 
         return $this;
     }

From 62dbf9b02b47b8551eaee42034d92c9d01d080ee Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 31 Jan 2016 19:05:37 -0700
Subject: [PATCH 37/48] Initiate the Uri->init() in bootstrap stage

---
 tests/_bootstrap.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 836de7ea2..f2ceea5e3 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -40,9 +40,12 @@ $grav = Grav::instance(
     )
 );
 
+
+$grav['uri']->init();
 $grav['debugger']->init();
 $grav['assets']->init();
 
+
 // Set default $_SERVER value used for nonces
 empty( $_SERVER['HTTP_CLIENT_IP'] ) && $_SERVER['HTTP_CLIENT_IP'] = '127.0.0.1';
 

From 9c0deea6c846060691ee0106568611e91bd6503c Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 31 Jan 2016 19:06:00 -0700
Subject: [PATCH 38/48] added some tests that test various URL and subduer
 scenarios

---
 tests/unit/Grav/Common/MarkdownTest.php | 107 +++++++++++++++++++++++-
 1 file changed, 106 insertions(+), 1 deletion(-)

diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index 1e1760910..fa8ccc2ca 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -2,6 +2,8 @@
 
 use Codeception\Util\Fixtures;
 use Grav\Common\Grav;
+use Grav\Common\Uri;
+use Grav\Common\Config\Config;
 use Grav\Common\Page\Pages;
 use Grav\Common\Page\Page;
 use Grav\Common\Markdown\Parsedown;
@@ -21,12 +23,22 @@ class MarkdownTest extends \Codeception\TestCase\Test
     /** @var Pages $pages */
     protected $pages;
 
+    /** @var Config $config */
+    protected $config;
+
+    /** @var  Uri $uri */
+    protected $uri;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
 
         $this->pages = $this->grav['pages'];
 
+        $this->config = $this->grav['config'];
+
+        $this->uri = $this->grav['uri'];
+
         /** @var UniformResourceLocator $locator */
         $locator = $this->grav['locator'];
         $locator->addPath('page', '', 'tests/fake/nested-site/user/pages', false);
@@ -58,8 +70,12 @@ class MarkdownTest extends \Codeception\TestCase\Test
         return preg_replace('/^\s*(.*)/', '', $string);
     }
 
-    public function testAnchorLinks()
+    public function testAnchorLinksNoPortRelativeUrls()
     {
+        $this->config->set('system.absolute_urls', false);
+        $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
+
+
         $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
             '<p><a href="/item2/item2-1#foo">Peer Anchor</a></p>');
         $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
@@ -71,8 +87,80 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
     }
 
+    public function testAnchorLinksNoPortAbsoluteUrls()
+    {
+        $this->config->set('system.absolute_urls', true);
+        $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
+
+
+        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
+            '<p><a href="http://localhost/item2/item2-1#foo">Peer Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
+            '<p><a href="http://localhost/item2/item2-1/#foo">Peer Anchor 2</a></p>');
+//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
+//            '<p><a href="http://localhost/item2/item2-2#foo">Current Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
+            '<p><a href="http://localhost/#foo">Root Anchor</a></p>');
+
+    }
+
+    public function testAnchorLinksWithPortAbsoluteUrls()
+    {
+        $this->config->set('system.absolute_urls', true);
+        $this->uri->initializeWithURL('http://localhost:8080/item2/item-2-2')->init();
+
+
+        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
+            '<p><a href="http://localhost:8080/item2/item2-1#foo">Peer Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
+            '<p><a href="http://localhost:8080/item2/item2-1/#foo">Peer Anchor 2</a></p>');
+//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
+//            '<p><a href="http://localhost:8080#foo">Current Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
+            '<p><a href="http://localhost:8080/#foo">Root Anchor</a></p>');
+
+    }
+
+    public function testAnchorLinksSubDirRelativeUrls()
+    {
+        $this->config->set('system.absolute_urls', false);
+        $this->uri->initializeWithUrlAndRootPath('http://localhost/subdir/item2/item-2-2', '/subdir')->init();
+
+
+        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
+            '<p><a href="/subdir/item2/item2-1#foo">Peer Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
+            '<p><a href="/subdir/item2/item2-1/#foo">Peer Anchor 2</a></p>');
+//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
+//            '<p><a href="/subdir/#foo">Current Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
+            '<p><a href="/subdir/#foo">Root Anchor</a></p>');
+
+    }
+
+    public function testAnchorLinksSubDirAbsoluteUrls()
+    {
+        $this->config->set('system.absolute_urls', true);
+        $this->uri->initializeWithUrlAndRootPath('http://localhost/subdir/item2/item-2-2', '/subdir')->init();
+
+
+        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
+            '<p><a href="http://localhost/subdir/item2/item2-1#foo">Peer Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
+            '<p><a href="http://localhost/subdir/item2/item2-1/#foo">Peer Anchor 2</a></p>');
+//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
+//            '<p><a href="http://localhost/subdir#foo">Current Anchor</a></p>');
+        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
+            '<p><a href="http://localhost/subdir/#foo">Root Anchor</a></p>');
+
+    }
+
     public function testSlugRelativeLinks()
     {
+        $this->config->set('system.absolute_urls', false);
+        $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
+
+
         $this->assertSame($this->parsedown->text('[Peer Page](../item2-1)'),
             '<p><a href="/item2/item2-1">Peer Page</a></p>');
         $this->assertSame($this->parsedown->text('[Down a Level](item2-2-1)'),
@@ -95,6 +183,10 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
     public function testDirectoryRelativeLinks()
     {
+        $this->config->set('system.absolute_urls', false);
+        $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
+
+
         $this->assertSame($this->parsedown->text('[Peer Page](../01.item2-1)'),
             '<p><a href="/item2/item2-1">Peer Page</a></p>');
         $this->assertSame($this->parsedown->text('[Down a Level](01.item2-2-1)'),
@@ -113,6 +205,10 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
     public function testDirectoryAbsoluteLinks()
     {
+        $this->config->set('system.absolute_urls', false);
+        $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
+
+
         $this->assertSame($this->parsedown->text('[Peer Page](/item2/item2-1)'),
             '<p><a href="/item2/item2-1">Peer Page</a></p>');
         $this->assertSame($this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)'),
@@ -129,6 +225,10 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
     public function testSpecialProtocols()
     {
+        $this->config->set('system.absolute_urls', false);
+        $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
+
+
         $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'),
             '<p><a href="mailto:user@domain.com">mailto</a></p>');
         $this->assertSame($this->parsedown->text('[xmpp](xmpp:xyx@domain.com)'),
@@ -141,6 +241,10 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
     public function testReferenceLinks()
     {
+        $this->config->set('system.absolute_urls', false);
+        $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
+
+
         $sample = '[relative link][r_relative]
                    [r_relative]: ../item2-3#blah';
         $this->assertSame($this->parsedown->text($sample), '<p><a href="/item2/item2-3#blah">relative link</a></p>');
@@ -162,4 +266,5 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->assertSame($this->parsedown->text('[google.com](https://www.google.com)'),
             '<p><a href="https://www.google.com">google.com</a></p>');
     }
+
 }

From 7de21b1f52074012023eccf223402a28df7d6e17 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 31 Jan 2016 21:54:08 -0700
Subject: [PATCH 39/48] went back to dev-master of Parsedown until release

---
 composer.json |  7 +------
 composer.lock | 36 +++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index 2bc153a40..2cc831fef 100644
--- a/composer.json
+++ b/composer.json
@@ -8,6 +8,7 @@
     "require": {
         "php": ">=5.5.9",
         "twig/twig": "~1.24",
+        "erusev/parsedown": "dev-master as 1.6.0",
         "erusev/parsedown-extra": "~0.7",
         "symfony/yaml": "~2.8",
         "symfony/console": "~2.8",
@@ -31,12 +32,6 @@
         "codeception/codeception": "^2.1",
         "fzaninotto/faker": "^1.5"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/getgrav/parsedown"
-        }
-    ],
     "autoload": {
         "psr-4": {
             "Grav\\": "system/src/Grav"
diff --git a/composer.lock b/composer.lock
index 584fd0675..92d015aa2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a779e113a6d1bc09fff7a0a27ec8251e",
-    "content-hash": "335b1c5c62ea10a4df7d085816a50f91",
+    "hash": "a641806eb4174e72533c76a56d4fac5e",
+    "content-hash": "812ba1911705385948bc6b15c197f9b4",
     "packages": [
         {
             "name": "doctrine/cache",
@@ -130,24 +130,28 @@
         },
         {
             "name": "erusev/parsedown",
-            "version": "1.6.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/getgrav/parsedown.git",
-                "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7"
+                "url": "https://github.com/erusev/parsedown.git",
+                "reference": "94688f21cc5d8bc85f1783b4c8b98b3288d712cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/getgrav/parsedown/zipball/3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
-                "reference": "3ebbd730b5c2cf5ce78bc1bf64071407fc6674b7",
+                "url": "https://api.github.com/repos/erusev/parsedown/zipball/94688f21cc5d8bc85f1783b4c8b98b3288d712cb",
+                "reference": "94688f21cc5d8bc85f1783b4c8b98b3288d712cb",
                 "shasum": ""
             },
+            "require": {
+                "php": ">=5.3.0"
+            },
             "type": "library",
             "autoload": {
                 "psr-0": {
                     "Parsedown": ""
                 }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "license": [
                 "MIT"
             ],
@@ -164,10 +168,7 @@
                 "markdown",
                 "parser"
             ],
-            "support": {
-                "source": "https://github.com/getgrav/parsedown/tree/1.6.0"
-            },
-            "time": "2015-10-04 16:44:32"
+            "time": "2016-01-07 17:36:51"
         },
         {
             "name": "erusev/parsedown-extra",
@@ -2647,9 +2648,18 @@
             "time": "2015-12-05 11:13:14"
         }
     ],
-    "aliases": [],
+    "aliases": [
+        {
+            "alias": "1.6.0",
+            "alias_normalized": "1.6.0.0",
+            "version": "9999999-dev",
+            "package": "erusev/parsedown"
+        }
+    ],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "erusev/parsedown": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From 5f6b09b0325e0cd7ac5c1ae20277bab03fbea4d5 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 31 Jan 2016 21:54:57 -0700
Subject: [PATCH 40/48] fixed a markdown test

---
 tests/unit/Grav/Common/MarkdownTest.php | 43 ++++++++++++-------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index fa8ccc2ca..1a2b905ad 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -75,15 +75,14 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', false);
         $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
 
-
-        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
-            '<p><a href="/item2/item2-1#foo">Peer Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
-            '<p><a href="/item2/item2-1/#foo">Peer Anchor 2</a></p>');
-//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
-//            '<p><a href="#foo">Current Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
-            '<p><a href="/#foo">Root Anchor</a></p>');
+        $this->assertSame('<p><a href="/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
+        $this->assertSame('<p><a href="/item2/item2-1/#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)'));
+        $this->assertSame('<p><a href="/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)'));
 
     }
 
@@ -92,16 +91,14 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
 
-
-        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
-            '<p><a href="http://localhost/item2/item2-1#foo">Peer Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
-            '<p><a href="http://localhost/item2/item2-1/#foo">Peer Anchor 2</a></p>');
-//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
-//            '<p><a href="http://localhost/item2/item2-2#foo">Current Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
-            '<p><a href="http://localhost/#foo">Root Anchor</a></p>');
-
+        $this->assertSame('<p><a href="http://localhost/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
+        $this->assertSame('<p><a href="http://localhost/item2/item2-1/#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
+        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
+            $this->parsedown->text('[Current Anchor](#foo)'));
+        $this->assertSame('<p><a href="http://localhost/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)'));
     }
 
     public function testAnchorLinksWithPortAbsoluteUrls()
@@ -261,10 +258,10 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
     public function testExternalLinks()
     {
-        $this->assertSame($this->parsedown->text('[cnn.com](http://www.cnn.com)'),
-            '<p><a href="http://www.cnn.com">cnn.com</a></p>');
-        $this->assertSame($this->parsedown->text('[google.com](https://www.google.com)'),
-            '<p><a href="https://www.google.com">google.com</a></p>');
+        $this->assertSame('<p><a href="http://www.cnn.com">cnn.com</a></p>',
+            $this->parsedown->text('[cnn.com](http://www.cnn.com)'));
+        $this->assertSame('<p><a href="https://www.google.com">google.com</a></p>',
+            $this->parsedown->text('[google.com](https://www.google.com)'));
     }
 
 }

From 56f267ec79e6d2ef31cf07fa4f564ddc3bb57c00 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 31 Jan 2016 22:09:27 -0700
Subject: [PATCH 41/48] reordered tests

---
 tests/unit/Grav/Common/MarkdownTest.php | 178 ++++++++++++------------
 1 file changed, 86 insertions(+), 92 deletions(-)

diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index 1a2b905ad..24eed1424 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -79,8 +79,8 @@ class MarkdownTest extends \Codeception\TestCase\Test
             $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
         $this->assertSame('<p><a href="/item2/item2-1/#foo">Peer Anchor 2</a></p>',
             $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
+//        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
+//            $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
 
@@ -95,8 +95,8 @@ class MarkdownTest extends \Codeception\TestCase\Test
             $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
         $this->assertSame('<p><a href="http://localhost/item2/item2-1/#foo">Peer Anchor 2</a></p>',
             $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
-        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
-            $this->parsedown->text('[Current Anchor](#foo)'));
+//        $this->assertSame('<p><a href="#foo">Current Anchor</a></p>',
+//            $this->parsedown->text('[Current Anchor](#foo)'));
         $this->assertSame('<p><a href="http://localhost/#foo">Root Anchor</a></p>',
             $this->parsedown->text('[Root Anchor](/#foo)'));
     }
@@ -106,15 +106,14 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithURL('http://localhost:8080/item2/item-2-2')->init();
 
-
-        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
-            '<p><a href="http://localhost:8080/item2/item2-1#foo">Peer Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
-            '<p><a href="http://localhost:8080/item2/item2-1/#foo">Peer Anchor 2</a></p>');
-//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
-//            '<p><a href="http://localhost:8080#foo">Current Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
-            '<p><a href="http://localhost:8080/#foo">Root Anchor</a></p>');
+        $this->assertSame('<p><a href="http://localhost:8080/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
+        $this->assertSame('<p><a href="http://localhost:8080/item2/item2-1/#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
+//        $this->assertSame('<p><a href="http://localhost:8080#foo">Current Anchor</a></p>',
+//            $this->parsedown->text('[Current Anchor](#foo)'));
+        $this->assertSame('<p><a href="http://localhost:8080/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)'));
 
     }
 
@@ -123,15 +122,14 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', false);
         $this->uri->initializeWithUrlAndRootPath('http://localhost/subdir/item2/item-2-2', '/subdir')->init();
 
-
-        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
-            '<p><a href="/subdir/item2/item2-1#foo">Peer Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
-            '<p><a href="/subdir/item2/item2-1/#foo">Peer Anchor 2</a></p>');
-//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
-//            '<p><a href="/subdir/#foo">Current Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
-            '<p><a href="/subdir/#foo">Root Anchor</a></p>');
+        $this->assertSame('<p><a href="/subdir/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
+        $this->assertSame('<p><a href="/subdir/item2/item2-1/#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
+//        $this->assertSame('<p><a href="/subdir/#foo">Current Anchor</a></p>',
+//            $this->parsedown->text('[Current Anchor](#foo)'));
+        $this->assertSame('<p><a href="/subdir/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)'));
 
     }
 
@@ -140,15 +138,14 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', true);
         $this->uri->initializeWithUrlAndRootPath('http://localhost/subdir/item2/item-2-2', '/subdir')->init();
 
-
-        $this->assertSame($this->parsedown->text('[Peer Anchor](../item2-1#foo)'),
-            '<p><a href="http://localhost/subdir/item2/item2-1#foo">Peer Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'),
-            '<p><a href="http://localhost/subdir/item2/item2-1/#foo">Peer Anchor 2</a></p>');
-//        $this->assertSame($this->parsedown->text('[Current Anchor](#foo)'),
-//            '<p><a href="http://localhost/subdir#foo">Current Anchor</a></p>');
-        $this->assertSame($this->parsedown->text('[Root Anchor](/#foo)'),
-            '<p><a href="http://localhost/subdir/#foo">Root Anchor</a></p>');
+        $this->assertSame('<p><a href="http://localhost/subdir/item2/item2-1#foo">Peer Anchor</a></p>',
+            $this->parsedown->text('[Peer Anchor](../item2-1#foo)'));
+        $this->assertSame('<p><a href="http://localhost/subdir/item2/item2-1/#foo">Peer Anchor 2</a></p>',
+            $this->parsedown->text('[Peer Anchor 2](../item2-1/#foo)'));
+//        $this->assertSame('<p><a href="http://localhost/subdir#foo">Current Anchor</a></p>',
+//            $this->parsedown->text('[Current Anchor](#foo)'));
+        $this->assertSame('<p><a href="http://localhost/subdir/#foo">Root Anchor</a></p>',
+            $this->parsedown->text('[Root Anchor](/#foo)'));
 
     }
 
@@ -157,25 +154,24 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', false);
         $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
 
-
-        $this->assertSame($this->parsedown->text('[Peer Page](../item2-1)'),
-            '<p><a href="/item2/item2-1">Peer Page</a></p>');
-        $this->assertSame($this->parsedown->text('[Down a Level](item2-2-1)'),
-            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
-        $this->assertSame($this->parsedown->text('[Up a Level](..)'),
-            '<p><a href="/item2">Up a Level</a></p>');
-        $this->assertSame($this->parsedown->text('[Up and Down](../../item3/item3-3)'),
-            '<p><a href="/item3/item3-3">Up and Down</a></p>');
-        $this->assertSame($this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)'),
-            '<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>');
-//        $this->assertSame($this->parsedown->text('[Up a Level with Query](../?foo=bar)'),
-//            '<p><a href="/item2?foo=bar">Up a Level with Query</a></p>');
-        $this->assertSame($this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)'),
-        '<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>');
-        $this->assertSame($this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)'),
-            '<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>');
-        $this->assertSame($this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)'),
-            '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>');
+        $this->assertSame('<p><a href="/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../item2-1)'));
+        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](item2-2-1)'));
+        $this->assertSame('<p><a href="/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](..)'));
+        $this->assertSame('<p><a href="/item3/item3-3">Up and Down</a></p>',
+            $this->parsedown->text('[Up and Down](../../item3/item3-3)'));
+        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
+            $this->parsedown->text('[Down a Level with Query](item2-2-1?foo=bar)'));
+//        $this->assertSame('<p><a href="/item2?foo=bar">Up a Level with Query</a></p>',
+//            $this->parsedown->text('[Up a Level with Query](../?foo=bar)'));
+        $this->assertSame('<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
+            $this->parsedown->text('[Up and Down with Query](../../item3/item3-3?foo=bar)'));
+        $this->assertSame('<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
+            $this->parsedown->text('[Up and Down with Param](../../item3/item3-3/foo:bar)'));
+        $this->assertSame('<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>',
+            $this->parsedown->text('[Up and Down with Anchor](../../item3/item3-3#foo)'));
     }
 
     public function testDirectoryRelativeLinks()
@@ -183,21 +179,20 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', false);
         $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
 
-
-        $this->assertSame($this->parsedown->text('[Peer Page](../01.item2-1)'),
-            '<p><a href="/item2/item2-1">Peer Page</a></p>');
-        $this->assertSame($this->parsedown->text('[Down a Level](01.item2-2-1)'),
-            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
-        $this->assertSame($this->parsedown->text('[Up and Down](../../03.item3/03.item3-3)'),
-            '<p><a href="/item3/item3-3">Up and Down</a></p>');
-        $this->assertSame($this->parsedown->text('[Down a Level with Query](01.item2-2-1?foo=bar)'),
-            '<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>');
-        $this->assertSame($this->parsedown->text('[Up and Down with Query](../../03.item3/03.item3-3?foo=bar)'),
-            '<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>');
-//        $this->assertSame($this->parsedown->text('[Up and Down with Param](../../03.item3/03.item3-3/foo:bar)'),
-//            '<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>');
-        $this->assertSame($this->parsedown->text('[Up and Down with Anchor](../../03.item3/03.item3-3#foo)'),
-            '<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>');
+        $this->assertSame('<p><a href="/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](../01.item2-1)'));
+        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](01.item2-2-1)'));
+        $this->assertSame('<p><a href="/item3/item3-3">Up and Down</a></p>',
+            $this->parsedown->text('[Up and Down](../../03.item3/03.item3-3)'));
+        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1?foo=bar">Down a Level with Query</a></p>',
+            $this->parsedown->text('[Down a Level with Query](01.item2-2-1?foo=bar)'));
+        $this->assertSame('<p><a href="/item3/item3-3?foo=bar">Up and Down with Query</a></p>',
+            $this->parsedown->text('[Up and Down with Query](../../03.item3/03.item3-3?foo=bar)'));
+//        $this->assertSame('<p><a href="/item3/item3-3/foo:bar">Up and Down with Param</a></p>',
+//            $this->parsedown->text('[Up and Down with Param](../../03.item3/03.item3-3/foo:bar)'));
+        $this->assertSame('<p><a href="/item3/item3-3#foo">Up and Down with Anchor</a></p>',
+            $this->parsedown->text('[Up and Down with Anchor](../../03.item3/03.item3-3#foo)'));
     }
 
     public function testDirectoryAbsoluteLinks()
@@ -205,19 +200,18 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', false);
         $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
 
-
-        $this->assertSame($this->parsedown->text('[Peer Page](/item2/item2-1)'),
-            '<p><a href="/item2/item2-1">Peer Page</a></p>');
-        $this->assertSame($this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)'),
-            '<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>');
-        $this->assertSame($this->parsedown->text('[Up a Level](/item2)'),
-            '<p><a href="/item2">Up a Level</a></p>');
-        $this->assertSame($this->parsedown->text('[With Query](/item2?foo=bar)'),
-            '<p><a href="/item2?foo=bar">With Query</a></p>');
-        $this->assertSame($this->parsedown->text('[With Param](/item2/foo:bar)'),
-            '<p><a href="/item2/foo:bar">With Param</a></p>');
-        $this->assertSame($this->parsedown->text('[With Anchor](/item2#foo)'),
-            '<p><a href="/item2#foo">With Anchor</a></p>');
+        $this->assertSame('<p><a href="/item2/item2-1">Peer Page</a></p>',
+            $this->parsedown->text('[Peer Page](/item2/item2-1)'));
+        $this->assertSame('<p><a href="/item2/item2-2/item2-2-1">Down a Level</a></p>',
+            $this->parsedown->text('[Down a Level](/item2/item2-2/item2-2-1)'));
+        $this->assertSame('<p><a href="/item2">Up a Level</a></p>',
+            $this->parsedown->text('[Up a Level](/item2)'));
+        $this->assertSame('<p><a href="/item2?foo=bar">With Query</a></p>',
+            $this->parsedown->text('[With Query](/item2?foo=bar)'));
+        $this->assertSame('<p><a href="/item2/foo:bar">With Param</a></p>',
+            $this->parsedown->text('[With Param](/item2/foo:bar)'));
+        $this->assertSame('<p><a href="/item2#foo">With Anchor</a></p>',
+            $this->parsedown->text('[With Anchor](/item2#foo)'));
     }
 
     public function testSpecialProtocols()
@@ -225,15 +219,14 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', false);
         $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
 
-
-        $this->assertSame($this->parsedown->text('[mailto](mailto:user@domain.com)'),
-            '<p><a href="mailto:user@domain.com">mailto</a></p>');
-        $this->assertSame($this->parsedown->text('[xmpp](xmpp:xyx@domain.com)'),
-            '<p><a href="xmpp:xyx@domain.com">xmpp</a></p>');
-        $this->assertSame($this->parsedown->text('[tel](tel:123-555-12345)'),
-            '<p><a href="tel:123-555-12345">tel</a></p>');
-        $this->assertSame($this->parsedown->text('[sms](sms:123-555-12345)'),
-            '<p><a href="sms:123-555-12345">sms</a></p>');
+        $this->assertSame('<p><a href="mailto:user@domain.com">mailto</a></p>',
+            $this->parsedown->text('[mailto](mailto:user@domain.com)'));
+        $this->assertSame('<p><a href="xmpp:xyx@domain.com">xmpp</a></p>',
+            $this->parsedown->text('[xmpp](xmpp:xyx@domain.com)'));
+        $this->assertSame('<p><a href="tel:123-555-12345">tel</a></p>',
+            $this->parsedown->text('[tel](tel:123-555-12345)'));
+        $this->assertSame('<p><a href="sms:123-555-12345">sms</a></p>',
+            $this->parsedown->text('[sms](sms:123-555-12345)'));
     }
 
     public function testReferenceLinks()
@@ -241,19 +234,20 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $this->config->set('system.absolute_urls', false);
         $this->uri->initializeWithURL('http://localhost/item2/item-2-2')->init();
 
-
         $sample = '[relative link][r_relative]
                    [r_relative]: ../item2-3#blah';
-        $this->assertSame($this->parsedown->text($sample), '<p><a href="/item2/item2-3#blah">relative link</a></p>');
+        $this->assertSame('<p><a href="/item2/item2-3#blah">relative link</a></p>',
+            $this->parsedown->text($sample));
 
         $sample = '[absolute link][r_absolute]
                    [r_absolute]: /item3#blah';
-        $this->assertSame($this->parsedown->text($sample),
-            '<p><a href="/item3#blah">absolute link</a></p>');
+        $this->assertSame('<p><a href="/item3#blah">absolute link</a></p>',
+            $this->parsedown->text($sample));
 
         $sample = '[external link][r_external]
                    [r_external]: http://www.cnn.com';
-        $this->assertSame($this->parsedown->text($sample), '<p><a href="http://www.cnn.com">external link</a></p>');
+        $this->assertSame('<p><a href="http://www.cnn.com">external link</a></p>',
+            $this->parsedown->text($sample));
     }
 
     public function testExternalLinks()

From 31940c03b141407b7d625c341c62bb3340c71802 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 1 Feb 2016 14:33:31 +0100
Subject: [PATCH 42/48] Disable system cache

---
 tests/_bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index f2ceea5e3..dd85c2c47 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -44,7 +44,7 @@ $grav = Grav::instance(
 $grav['uri']->init();
 $grav['debugger']->init();
 $grav['assets']->init();
-
+$grav['config']->set('system.cache.enabled', false);
 
 // Set default $_SERVER value used for nonces
 empty( $_SERVER['HTTP_CLIENT_IP'] ) && $_SERVER['HTTP_CLIENT_IP'] = '127.0.0.1';

From 57cd5c9e6fb74e3c6804f97b00dcf3a46fe2e3bc Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 1 Feb 2016 14:37:19 +0100
Subject: [PATCH 43/48] Add second set of pages to test

---
 tests/unit/Grav/Common/Page/PagesTest.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
index aed050ee7..5225f35b7 100644
--- a/tests/unit/Grav/Common/Page/PagesTest.php
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -27,9 +27,9 @@ class PagesTest extends \Codeception\TestCase\Test
         $this->pages = $this->grav['pages'];
 
         /** @var UniformResourceLocator $locator */
-//        $locator = $this->grav['locator'];
-//        $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
-//        $this->pages->init();
+        $locator = $this->grav['locator'];
+        $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
+        $this->pages->init();
     }
 
     public function testAll()
@@ -43,7 +43,7 @@ class PagesTest extends \Codeception\TestCase\Test
     {
         $list = $this->pages->getList();
         $this->assertTrue(is_array($list));
-//        $this->assertSame($list['/home'], 'Home');
-//        $this->assertSame($list['/blog'], 'Blog');
+        $this->assertSame($list['/'], 'Home');
+        $this->assertSame($list['/blog'], 'Blog');
     }
 }

From 2934157fb49a80174bd271e206e6ae9a62c0b6f2 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 1 Feb 2016 15:18:33 +0100
Subject: [PATCH 44/48] :white_check_mark: Add pages content

---
 tests/fake/simple-site/user/pages/01.home/default.md  | 11 ++++++++++-
 tests/fake/simple-site/user/pages/02.blog/blog.md     | 10 ++++++++++
 .../simple-site/user/pages/02.blog/post-one/item.md   | 11 ++++++++++-
 .../simple-site/user/pages/02.blog/post-two/item.md   | 11 ++++++++++-
 tests/fake/simple-site/user/pages/03.about/default.md |  9 +++++++--
 5 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100644 tests/fake/simple-site/user/pages/02.blog/blog.md

diff --git a/tests/fake/simple-site/user/pages/01.home/default.md b/tests/fake/simple-site/user/pages/01.home/default.md
index 8318c86b3..93d474701 100644
--- a/tests/fake/simple-site/user/pages/01.home/default.md
+++ b/tests/fake/simple-site/user/pages/01.home/default.md
@@ -1 +1,10 @@
-Test
\ No newline at end of file
+---
+title: Home
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/02.blog/blog.md b/tests/fake/simple-site/user/pages/02.blog/blog.md
new file mode 100644
index 000000000..1675616ad
--- /dev/null
+++ b/tests/fake/simple-site/user/pages/02.blog/blog.md
@@ -0,0 +1,10 @@
+---
+title: Blog
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/02.blog/post-one/item.md b/tests/fake/simple-site/user/pages/02.blog/post-one/item.md
index 8318c86b3..26bef8963 100644
--- a/tests/fake/simple-site/user/pages/02.blog/post-one/item.md
+++ b/tests/fake/simple-site/user/pages/02.blog/post-one/item.md
@@ -1 +1,10 @@
-Test
\ No newline at end of file
+---
+title: Post 1
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/02.blog/post-two/item.md b/tests/fake/simple-site/user/pages/02.blog/post-two/item.md
index 8318c86b3..5aebce815 100644
--- a/tests/fake/simple-site/user/pages/02.blog/post-two/item.md
+++ b/tests/fake/simple-site/user/pages/02.blog/post-two/item.md
@@ -1 +1,10 @@
-Test
\ No newline at end of file
+---
+title: Post 2
+---
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/tests/fake/simple-site/user/pages/03.about/default.md b/tests/fake/simple-site/user/pages/03.about/default.md
index 43bfdf031..0e280c07f 100644
--- a/tests/fake/simple-site/user/pages/03.about/default.md
+++ b/tests/fake/simple-site/user/pages/03.about/default.md
@@ -1,5 +1,10 @@
 ---
-title: test
+title: About
 ---
 
-# Test
\ No newline at end of file
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod
+tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
+consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
+cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non
+proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file

From 1279cb4ef3bd8d7569623054ff54088cf9bcd2e2 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 1 Feb 2016 17:19:34 +0100
Subject: [PATCH 45/48] Add Unit module available methods for future usage

---
 tests/_support/Helper/Unit.php | 75 ++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 4 deletions(-)

diff --git a/tests/_support/Helper/Unit.php b/tests/_support/Helper/Unit.php
index 41fc4d1c5..199872966 100644
--- a/tests/_support/Helper/Unit.php
+++ b/tests/_support/Helper/Unit.php
@@ -1,13 +1,80 @@
 <?php
 namespace Helper;
 
+use Codeception;
 // here you can define custom actions
 // all public methods declared in helper class will be available in $I
 
-class Unit extends \Codeception\Module
+/**
+ * Class Unit
+ * @package Helper
+ */
+class Unit extends Codeception\Module
 {
-    public function _afterSuite()
-    {
-        // Tear down after test suite
+    /**
+     * HOOK: used after configuration is loaded
+     */
+    public function _initialize() {
+    }
+
+    /**
+     * HOOK: on every Actor class initialization
+     */
+    public function _cleanup() {
+    }
+
+    /**
+     * HOOK: before suite
+     *
+     * @param array $settings
+     */
+    public function _beforeSuite($settings = []) {
+    }
+
+    /**
+     * HOOK: after suite
+     **/
+    public function _afterSuite() {
+    }
+
+    /**
+     * HOOK: before each step
+     *
+     * @param Codeception\Step $step*
+     */
+    public function _beforeStep(Codeception\Step $step) {
+    }
+
+    /**
+     * HOOK: after each step
+     *
+     * @param Codeception\Step $step
+     */
+    public function _afterStep(Codeception\Step $step) {
+    }
+
+    /**
+     * HOOK: before each suite
+     *
+     * @param Codeception\TestCase $test
+     */
+    public function _before(Codeception\TestCase $test) {
+    }
+
+    /**
+     * HOOK: before each suite
+     *
+     * @param Codeception\TestCase $test
+     */
+    public function _after(Codeception\TestCase $test) {
+    }
+
+    /**
+     * HOOK: on fail
+     *
+     * @param Codeception\TestCase $test
+     * @param $fail
+     */
+    public function _failed(Codeception\TestCase $test, $fail) {
     }
 }

From f8eeac70a271155c26999d4a3227be918b87560d Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 1 Feb 2016 17:19:52 +0100
Subject: [PATCH 46/48] Only initialize new pages location once in tests

---
 tests/unit/Grav/Common/MarkdownTest.php   | 18 ++++++++++++++----
 tests/unit/Grav/Common/Page/PagesTest.php | 14 ++++++++++----
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/tests/unit/Grav/Common/MarkdownTest.php b/tests/unit/Grav/Common/MarkdownTest.php
index 24eed1424..3c5e7c664 100644
--- a/tests/unit/Grav/Common/MarkdownTest.php
+++ b/tests/unit/Grav/Common/MarkdownTest.php
@@ -29,6 +29,8 @@ class MarkdownTest extends \Codeception\TestCase\Test
     /** @var  Uri $uri */
     protected $uri;
 
+    static $run = false;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
@@ -39,10 +41,15 @@ class MarkdownTest extends \Codeception\TestCase\Test
 
         $this->uri = $this->grav['uri'];
 
-        /** @var UniformResourceLocator $locator */
-        $locator = $this->grav['locator'];
-        $locator->addPath('page', '', 'tests/fake/nested-site/user/pages', false);
-        $this->pages->init();
+        if (!self::$run) {
+
+            /** @var UniformResourceLocator $locator */
+            $locator = $this->grav['locator'];
+            $locator->addPath('page', '', 'tests/fake/nested-site/user/pages', false);
+            $this->pages->init();
+
+            self::$run = true;
+        }
 
         $defaults = [
             'extra'            => false,
@@ -54,6 +61,9 @@ class MarkdownTest extends \Codeception\TestCase\Test
         $page = $this->pages->dispatch('/item2/item2-2');
 
         $this->parsedown = new Parsedown($page, $defaults);
+
+
+
     }
 
     protected function _after()
diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
index 5225f35b7..98e2bcc03 100644
--- a/tests/unit/Grav/Common/Page/PagesTest.php
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -21,15 +21,21 @@ class PagesTest extends \Codeception\TestCase\Test
     /** @var Page $root_page */
     protected $root_page;
 
+    static $run = false;
+
     protected function _before()
     {
         $this->grav = Fixtures::get('grav');
         $this->pages = $this->grav['pages'];
 
-        /** @var UniformResourceLocator $locator */
-        $locator = $this->grav['locator'];
-        $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
-        $this->pages->init();
+        if (!self::$run) {
+            /** @var UniformResourceLocator $locator */
+            $locator = $this->grav['locator'];
+            $locator->addPath('page', '', 'tests/fake/simple-site/user/pages', false);
+            $this->pages->init();
+            self::$run = true;
+        }
+
     }
 
     public function testAll()

From 7d354751042e33b97bcb72911102bcb994d6ab3b Mon Sep 17 00:00:00 2001
From: Tyler Cosgrove <Vivalldi@users.noreply.github.com>
Date: Mon, 1 Feb 2016 11:48:12 -0500
Subject: [PATCH 47/48] LICENSE renamed to LICENSE.txt

---
 webserver-configs/nginx.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webserver-configs/nginx.conf b/webserver-configs/nginx.conf
index 50ff852b9..04d179889 100644
--- a/webserver-configs/nginx.conf
+++ b/webserver-configs/nginx.conf
@@ -38,7 +38,7 @@ server {
     # deny running scripts inside user folder
     location ~* /user/.*\.(txt|md|yaml|php|pl|py|cgi|twig|sh|bat)$ { return 403; }
     # deny access to specific files in the root folder
-    location ~ /(LICENSE|composer.lock|composer.json|nginx.conf|web.config|htaccess.txt|\.htaccess) { return 403; }
+    location ~ /(LICENSE.txt|composer.lock|composer.json|nginx.conf|web.config|htaccess.txt|\.htaccess) { return 403; }
     ## End - Security
 }
 

From 9d67f1ac33dc5b66c8f4e869cb2e55f8f9364484 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 1 Feb 2016 18:55:31 +0100
Subject: [PATCH 48/48] :white_check_mark: Fix assertSame param order

---
 tests/unit/Grav/Common/AssetsTest.php     | 105 +++++----
 tests/unit/Grav/Common/Page/PagesTest.php |   4 +-
 tests/unit/Grav/Common/UriTest.php        | 246 +++++++++++-----------
 tests/unit/Grav/Common/UtilsTest.php      |   4 +-
 4 files changed, 176 insertions(+), 183 deletions(-)

diff --git a/tests/unit/Grav/Common/AssetsTest.php b/tests/unit/Grav/Common/AssetsTest.php
index 353835f2b..65ead94d8 100644
--- a/tests/unit/Grav/Common/AssetsTest.php
+++ b/tests/unit/Grav/Common/AssetsTest.php
@@ -31,60 +31,60 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test.css');
 
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.css',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         $this->assets->add('test.js');
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getCss();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.css',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         //test addCss(). Test adding asset to a separate group
         $this->assets->reset();
         $this->assets->addCSS('test.css');
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.css',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         //test addJs()
         $this->assets->reset();
         $this->assets->addJs('test.js');
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.js',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'loading'  => '',
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         //Test CSS Groups
         $this->assets->reset();
@@ -92,16 +92,16 @@ class AssetsTest extends \Codeception\TestCase\Test
         $css = $this->assets->css();
         $this->assertEmpty($css);
         $css = $this->assets->css('footer');
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         $array = $this->assets->getCss();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.css',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'group'    => 'footer'
-        ]);
+        ], reset($array));
 
         //Test JS Groups
         $this->assets->reset();
@@ -109,48 +109,48 @@ class AssetsTest extends \Codeception\TestCase\Test
         $js = $this->assets->js();
         $this->assertEmpty($js);
         $js = $this->assets->js('footer');
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" ></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.js',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'loading'  => '',
             'group'    => 'footer'
-        ]);
+        ], reset($array));
 
         //Test async / defer
         $this->assets->reset();
         $this->assets->addJs('test.js', null, true, 'async', null);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.js',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'loading'  => 'async',
             'group'    => 'head'
-        ]);
+        ], reset($array));
 
         $this->assets->reset();
         $this->assets->addJs('test.js', null, true, 'defer', null);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" defer></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" defer></script>' . PHP_EOL, $js);
 
         $array = $this->assets->getJs();
-        $this->assertSame(reset($array), [
+        $this->assertSame([
             'asset'    => '/test.js',
             'priority' => 10,
             'order'    => 0,
             'pipeline' => true,
             'loading'  => 'defer',
             'group'    => 'head'
-        ]);
+        ], reset($array));
     }
 
     public function testAddingAssetPropertiesWithArray()
@@ -159,7 +159,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addJs('test.js', ['loading' => 'async']);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL, $js);
         $this->assets->reset();
 
     }
@@ -170,26 +170,24 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async']);
         $js = $this->assets->js();
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL, $js);
 
         //Test priority too
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async', 'priority' => 1]);
         $this->assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL .
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL .
+            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL, $js);
 
         //Test multiple groups
         $this->assets->reset();
         $this->assets->addJs('jquery', ['loading' => 'async', 'priority' => 1, 'group' => 'footer']);
         $this->assets->addJs('test.js', ['loading' => 'async', 'priority' => 2]);
         $js = $this->assets->js();
-        $this->assertSame($js, '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL, $js);
         $js = $this->assets->js('footer');
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL, $js);
 
         //Test adding array of assets
         //Test priority too
@@ -197,9 +195,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->addJs(['jquery', 'test.js'], ['loading' => 'async']);
         $js = $this->assets->js();
 
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL .
-            '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL .
+            '<script src="/test.js" type="text/javascript" async></script>' . PHP_EOL, $js);
     }
 
     public function testAddingCSSAssetPropertiesWithArrayFromCollection()
@@ -211,25 +208,25 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->addCss('test', ['priority' => 1]);
         $this->assets->addCss('test.css', ['priority' => 2]);
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+            '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         //Test multiple groups
         $this->assets->reset();
         $this->assets->addCss('test', ['priority' => 1, 'group' => 'footer']);
         $this->assets->addCss('test.css', ['priority' => 2]);
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
         $css = $this->assets->css('footer');
-        $this->assertSame($css, '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         //Test adding array of assets
         //Test priority too
         $this->assets->reset();
         $this->assets->addCss(['test', 'test.css'], ['loading' => 'async']);
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/system/assets/whoops.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+            '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
     }
 
     public function testPriorityOfAssets()
@@ -239,8 +236,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test-after.css');
 
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         //----------------
         $this->assets->reset();
@@ -248,8 +245,8 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test.css', 2);
 
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+        $this->assertSame('<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
 
         //----------------
         $this->assets->reset();
@@ -258,9 +255,9 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test-before.css', 3);
 
         $css = $this->assets->css();
-        $this->assertSame($css, '<link href="/test-before.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
+        $this->assertSame('<link href="/test-before.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
             '<link href="/test.css" type="text/css" rel="stylesheet" />' . PHP_EOL .
-            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL);
+            '<link href="/test-after.css" type="text/css" rel="stylesheet" />' . PHP_EOL, $css);
     }
 
     public function testPipeline()
@@ -271,7 +268,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->add('test.css', null, true);
         $this->assets->setCssPipeline(true);
         $css = $this->assets->css();
-        $this->assertSame($css, '');
+        $this->assertSame('', $css);
 
         //Add a core Grav CSS file, which is found. Pipeline will now return a file
         $this->assets->add('/system/assets/debugger.css', null, true);
@@ -285,8 +282,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addAsyncJs('jquery');
         $js = $this->assets->js();
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" async></script>' . PHP_EOL, $js);
     }
 
     public function testAddDeferJs()
@@ -294,8 +290,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addDeferJs('jquery');
         $js = $this->assets->js();
-        $this->assertSame($js,
-            '<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" defer></script>' . PHP_EOL);
+        $this->assertSame('<script src="/system/assets/jquery/jquery-2.x.min.js" type="text/javascript" defer></script>' . PHP_EOL, $js);
     }
 
     public function testAddInlineCss()
@@ -303,8 +298,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addInlineCss('body { color: black }');
         $css = $this->assets->css();
-        $this->assertSame($css,
-            PHP_EOL . '<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . PHP_EOL . '</style>' . PHP_EOL);
+        $this->assertSame(PHP_EOL . '<style>' . PHP_EOL . 'body { color: black }' . PHP_EOL . PHP_EOL . '</style>' . PHP_EOL, $css);
     }
 
     public function testAddInlineJs()
@@ -312,8 +306,7 @@ class AssetsTest extends \Codeception\TestCase\Test
         $this->assets->reset();
         $this->assets->addInlineJs('alert("test")');
         $js = $this->assets->js();
-        $this->assertSame($js,
-            PHP_EOL . '<script>' . PHP_EOL . 'alert("test")' . PHP_EOL . PHP_EOL . '</script>' . PHP_EOL);
+        $this->assertSame(PHP_EOL . '<script>' . PHP_EOL . 'alert("test")' . PHP_EOL . PHP_EOL . '</script>' . PHP_EOL, $js);
     }
 
     public function testGetCollections()
diff --git a/tests/unit/Grav/Common/Page/PagesTest.php b/tests/unit/Grav/Common/Page/PagesTest.php
index 98e2bcc03..97049a42e 100644
--- a/tests/unit/Grav/Common/Page/PagesTest.php
+++ b/tests/unit/Grav/Common/Page/PagesTest.php
@@ -49,7 +49,7 @@ class PagesTest extends \Codeception\TestCase\Test
     {
         $list = $this->pages->getList();
         $this->assertTrue(is_array($list));
-        $this->assertSame($list['/'], 'Home');
-        $this->assertSame($list['/blog'], 'Blog');
+        $this->assertSame('Home', $list['/']);
+        $this->assertSame('Blog', $list['/blog']);
     }
 }
diff --git a/tests/unit/Grav/Common/UriTest.php b/tests/unit/Grav/Common/UriTest.php
index 1236ceba5..0a9989328 100644
--- a/tests/unit/Grav/Common/UriTest.php
+++ b/tests/unit/Grav/Common/UriTest.php
@@ -73,167 +73,167 @@ class UriTest extends \Codeception\TestCase\Test
     public function testPaths()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->paths(), ['grav', 'it', 'ueper']);
+        $this->assertSame(['grav', 'it', 'ueper'], $this->uri->paths());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->paths(), ['grav', 'it']);
+        $this->assertSame(['grav', 'it'], $this->uri->paths());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->paths(), ['grav', 'it', 'ueper']);
+        $this->assertSame(['grav', 'it', 'ueper'], $this->uri->paths());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->paths(), ['a', 'b', 'c', 'd']);
+        $this->assertSame(['a', 'b', 'c', 'd'], $this->uri->paths());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->paths(),
-            ['a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f']);
+        $this->assertSame(['a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f', 'a', 'b', 'c', 'd', 'e', 'f'],
+            $this->uri->paths());
     }
 
     public function testRoute()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->route(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->route());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->route(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->route());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->route(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->route());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->route(), '/a/b/c/d');
+        $this->assertSame('/a/b/c/d', $this->uri->route());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->route(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->assertSame('/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f', $this->uri->route());
     }
 
     public function testQuery()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->query(), '');
+        $this->assertSame('', $this->uri->query());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->query(), '');
-        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame('', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->query(), 'test=x');
-        $this->assertSame($this->uri->query('id'), null);
-        $this->assertSame($this->uri->query('test'), 'x');
+        $this->assertSame('test=x', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
+        $this->assertSame('x', $this->uri->query('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->query(), 'test=x&test2=y');
-        $this->assertSame($this->uri->query('id'), null);
-        $this->assertSame($this->uri->query('test'), 'x');
-        $this->assertSame($this->uri->query('test2'), 'y');
+        $this->assertSame('test=x&test2=y', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
+        $this->assertSame('x', $this->uri->query('test'));
+        $this->assertSame('y', $this->uri->query('test2'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->query(), 'test=x&test2=y&test3=x&test4=y');
-        $this->assertSame($this->uri->query('id'), null);
-        $this->assertSame($this->uri->query('test'), 'x');
-        $this->assertSame($this->uri->query('test2'), 'y');
-        $this->assertSame($this->uri->query('test4'), 'y');
+        $this->assertSame('test=x&test2=y&test3=x&test4=y', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
+        $this->assertSame('x', $this->uri->query('test'));
+        $this->assertSame('y', $this->uri->query('test2'));
+        $this->assertSame('y', $this->uri->query('test4'));
         //Test all after the ? is encoded in the query
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->query(), 'test=x&test2=y&test3=x&test4=y%2Ftest');
-        $this->assertSame($this->uri->query('id'), null);
-        $this->assertSame($this->uri->query('test'), 'x');
-        $this->assertSame($this->uri->query('test2'), 'y');
-        $this->assertSame($this->uri->query('test4'), 'y/test');
+        $this->assertSame('test=x&test2=y&test3=x&test4=y%2Ftest', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
+        $this->assertSame('x', $this->uri->query('test'));
+        $this->assertSame('y', $this->uri->query('test2'));
+        $this->assertSame('y/test', $this->uri->query('test4'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->query(), '');
-        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame('', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->query(), '');
-        $this->assertSame($this->uri->query('id'), null);
+        $this->assertSame('', $this->uri->query());
+        $this->assertSame(null, $this->uri->query('id'));
     }
 
     public function testParams()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->params(), null);
+        $this->assertSame(null, $this->uri->params());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->params(), '/ueper:xxx');
-        $this->assertSame($this->uri->params('ueper'), '/ueper:xxx');
+        $this->assertSame('/ueper:xxx', $this->uri->params());
+        $this->assertSame('/ueper:xxx', $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->params(), '/ueper:xxx/test:yyy');
-        $this->assertSame($this->uri->params('ueper'), '/ueper:xxx');
-        $this->assertSame($this->uri->params('test'), '/test:yyy');
+        $this->assertSame('/ueper:xxx/test:yyy', $this->uri->params());
+        $this->assertSame('/ueper:xxx', $this->uri->params('ueper'));
+        $this->assertSame('/test:yyy', $this->uri->params('test'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->params(), null);
-        $this->assertSame($this->uri->params('ueper'), null);
+        $this->assertSame(null, $this->uri->params());
+        $this->assertSame(null, $this->uri->params('ueper'));
     }
 
     public function testParam()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->param('ueper'), 'xxx');
+        $this->assertSame('xxx', $this->uri->param('ueper'));
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->param('ueper'), 'xxx');
-        $this->assertSame($this->uri->param('test'), 'yyy');
+        $this->assertSame('xxx', $this->uri->param('ueper'));
+        $this->assertSame('yyy', $this->uri->param('test'));
     }
 
     public function testUrl()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->url(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->url(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->url(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->url(), '/a/b/c/d');
+        $this->assertSame('/a/b/c/d', $this->uri->url());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->url(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->assertSame('/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f', $this->uri->url());
     }
 
     public function testPath()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->path(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->path(), '/grav/it');
+        $this->assertSame('/grav/it', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->path(), '/grav/it/ueper');
+        $this->assertSame('/grav/it/ueper', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->path(), '/a/b/c/d');
+        $this->assertSame('/a/b/c/d', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->path(), '/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f');
+        $this->assertSame('/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f', $this->uri->path());
         $this->uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($this->uri->path(), '/');
+        $this->assertSame('/', $this->uri->path());
     }
 
     public function testExtension()
     {
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->extension(), null);
+        $this->assertSame(null, $this->uri->extension());
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->extension('x'), 'x');
+        $this->assertSame('x', $this->uri->extension('x'));
         $this->uri->initializeWithURL('http://localhost/a-page.html')->init();
-        $this->assertSame($this->uri->extension(), 'html');
+        $this->assertSame('html', $this->uri->extension());
         $this->uri->initializeWithURL('http://localhost/a-page.xml')->init();
-        $this->assertSame($this->uri->extension(), 'xml');
+        $this->assertSame('xml', $this->uri->extension());
         $this->uri->initializeWithURL('http://localhost/a-page.foo')->init();
-        $this->assertSame($this->uri->extension(), 'foo');
+        $this->assertSame('foo', $this->uri->extension());
     }
 
     public function testHost()
@@ -244,24 +244,24 @@ class UriTest extends \Codeception\TestCase\Test
         }
 
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->host(), $address);
+        $this->assertSame($address, $this->uri->host());
         $this->uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($this->uri->host(), $address);
+        $this->assertSame($address, $this->uri->host());
         //Host is set to localhost when running from local
         $this->uri->initializeWithURL('http://google.com/')->init();
-        $this->assertSame($this->uri->host(), $address);
+        $this->assertSame($address, $this->uri->host());
     }
 
     public function testPort()
     {
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->port(), '80');
+        $this->assertSame('80', $this->uri->port());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->port(), 8080);
+        $this->assertSame(8080, $this->uri->port());
         $this->uri->initializeWithURL('http://localhost:443/a-page')->init();
-        $this->assertSame($this->uri->port(), 443);
+        $this->assertSame(443, $this->uri->port());
         $this->uri->initializeWithURL('https://localhost/a-page')->init();
-        $this->assertSame($this->uri->port(), '80');
+        $this->assertSame('80', $this->uri->port());
     }
 
     public function testEnvironment()
@@ -272,51 +272,51 @@ class UriTest extends \Codeception\TestCase\Test
         }
 
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->environment(), $address);
+        $this->assertSame($address, $this->uri->environment());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->environment(), $address);
+        $this->assertSame($address, $this->uri->environment());
         $this->uri->initializeWithURL('http://foobar.it:443/a-page')->init();
-        $this->assertSame($this->uri->environment(), $address);
+        $this->assertSame($address, $this->uri->environment());
         $this->uri->initializeWithURL('https://google.com/a-page')->init();
-        $this->assertSame($this->uri->environment(), $address);
+        $this->assertSame($address, $this->uri->environment());
     }
 
     public function testBasename()
     {
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx')->init();
-        $this->assertSame($this->uri->basename(), 'it');
+        $this->assertSame('it', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper:xxx/test:yyy')->init();
-        $this->assertSame($this->uri->basename(), 'it');
+        $this->assertSame('it', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/grav/it/ueper?test=x&test2=y&test3=x&test4=y/test')->init();
-        $this->assertSame($this->uri->basename(), 'ueper');
+        $this->assertSame('ueper', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d')->init();
-        $this->assertSame($this->uri->basename(), 'd');
+        $this->assertSame('d', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost:8080/a/b/c/d/e/f/a/b/c/d/e/f/a/b/c/d/e/f')->init();
-        $this->assertSame($this->uri->basename(), 'f');
+        $this->assertSame('f', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost/')->init();
-        $this->assertSame($this->uri->basename(), '');
+        $this->assertSame('', $this->uri->basename());
         $this->uri->initializeWithURL('http://localhost/test.xml')->init();
-        $this->assertSame($this->uri->basename(), 'test.xml');
+        $this->assertSame('test.xml', $this->uri->basename());
     }
 
     public function testBase()
     {
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->base(), 'http://localhost');
+        $this->assertSame('http://localhost', $this->uri->base());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->base(), 'http://localhost:8080');
+        $this->assertSame('http://localhost:8080', $this->uri->base());
         $this->uri->initializeWithURL('http://foobar.it:80/a-page')->init();
-        $this->assertSame($this->uri->base(), 'http://foobar.it');
+        $this->assertSame('http://foobar.it', $this->uri->base());
         $this->uri->initializeWithURL('https://google.com/a-page')->init();
-        $this->assertSame($this->uri->base(), 'http://google.com');
+        $this->assertSame('http://google.com', $this->uri->base());
     }
 
     public function testRootUrl()
@@ -324,45 +324,45 @@ class UriTest extends \Codeception\TestCase\Test
         //Without explicitly adding the root path via `initializeWithUrlAndRootPath`,
         //tests always default to the base empty root path
         $this->uri->initializeWithURL('http://localhost/a-page')->init();
-        $this->assertSame($this->uri->rootUrl(true), 'http://localhost');
+        $this->assertSame('http://localhost', $this->uri->rootUrl(true));
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->rootUrl(true), 'http://localhost:8080');
+        $this->assertSame('http://localhost:8080', $this->uri->rootUrl(true));
         $this->uri->initializeWithURL('http://foobar.it:80/a-page')->init();
-        $this->assertSame($this->uri->rootUrl(true), 'http://foobar.it');
+        $this->assertSame('http://foobar.it', $this->uri->rootUrl(true));
         $this->uri->initializeWithURL('https://google.com/a-page/xxx')->init();
-        $this->assertSame($this->uri->rootUrl(true), 'http://google.com');
+        $this->assertSame('http://google.com', $this->uri->rootUrl(true));
 
         $this->uri->initializeWithUrlAndRootPath('https://localhost/grav/page-foo', '/grav')->init();
-        $this->assertSame($this->uri->rootUrl(), '/grav');
-        $this->assertSame($this->uri->rootUrl(true), 'http://localhost/grav');
+        $this->assertSame('/grav', $this->uri->rootUrl());
+        $this->assertSame('http://localhost/grav', $this->uri->rootUrl(true));
     }
 
     public function testCurrentPage()
     {
         $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($this->uri->currentPage(), 'test');
+        $this->assertSame('test', $this->uri->currentPage());
         $this->uri->initializeWithURL('http://localhost:8080/a-page')->init();
-        $this->assertSame($this->uri->currentPage(), 1);
+        $this->assertSame(1, $this->uri->currentPage());
         $this->uri->initializeWithURL('http://localhost:8080/a-page/page:2')->init();
-        $this->assertSame($this->uri->currentPage(), '2');
+        $this->assertSame('2', $this->uri->currentPage());
         $this->uri->initializeWithURL('http://localhost:8080/a-page/page:x')->init();
-        $this->assertSame($this->uri->currentPage(), 'x');
+        $this->assertSame('x', $this->uri->currentPage());
         $this->uri->initializeWithURL('http://localhost:8080/a-page/page:')->init();
-        $this->assertSame($this->uri->currentPage(), '');
+        $this->assertSame('', $this->uri->currentPage());
     }
 
     public function testReferrer()
     {
         $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($this->uri->referrer(), '/foo');
+        $this->assertSame('/foo', $this->uri->referrer());
         $this->uri->initializeWithURL('http://localhost/foo/bar/page:test')->init();
-        $this->assertSame($this->uri->referrer(), '/foo/bar');
+        $this->assertSame('/foo/bar', $this->uri->referrer());
     }
 
     public function testIp()
     {
         $this->uri->initializeWithURL('http://localhost/foo/page:test')->init();
-        $this->assertSame($this->uri->ip(), 'UNKNOWN');
+        $this->assertSame('UNKNOWN', $this->uri->ip());
     }
 
     public function testIsExternal()
@@ -382,7 +382,7 @@ class UriTest extends \Codeception\TestCase\Test
             'port'   => '8080',
         ];
 
-        $this->assertSame(Uri::buildUrl($parsed_url), 'http://localhost:8080');
+        $this->assertSame('http://localhost:8080', Uri::buildUrl($parsed_url));
 
         $parsed_url = [
             'scheme'   => 'http',
@@ -395,7 +395,7 @@ class UriTest extends \Codeception\TestCase\Test
             'fragment' => 'xxx',
         ];
 
-        $this->assertSame(Uri::buildUrl($parsed_url), 'http://foo:bar@localhost:8080/test?x=2#xxx');
+        $this->assertSame('http://foo:bar@localhost:8080/test?x=2#xxx', Uri::buildUrl($parsed_url));
     }
 
     public function testConvertUrl()
@@ -411,7 +411,7 @@ class UriTest extends \Codeception\TestCase\Test
 
         $this->uri->initializeWithURL(Uri::addNonce($url, 'test-action'))->init();
         $this->assertTrue(is_string($this->uri->param('nonce')));
-        $this->assertSame($this->uri->param('nonce'), Utils::getNonce('test-action'));
+        $this->assertSame(Utils::getNonce('test-action'), $this->uri->param('nonce'));
     }
 }
 
diff --git a/tests/unit/Grav/Common/UtilsTest.php b/tests/unit/Grav/Common/UtilsTest.php
index c6dbec24e..96761282e 100644
--- a/tests/unit/Grav/Common/UtilsTest.php
+++ b/tests/unit/Grav/Common/UtilsTest.php
@@ -215,8 +215,8 @@ class UtilsTest extends \Codeception\TestCase\Test
     public function testDate2timestamp()
     {
         $timestamp = strtotime('10 September 2000');
-        $this->assertSame(Utils::date2timestamp('10 September 2000'), $timestamp);
-        $this->assertSame(Utils::date2timestamp('2000-09-10 00:00:00'), $timestamp);
+        $this->assertSame($timestamp, Utils::date2timestamp('10 September 2000'));
+        $this->assertSame($timestamp, Utils::date2timestamp('2000-09-10 00:00:00'));
     }
 
     public function testResolve()