From a8bfa88cac86948c38560fc6e8b66f63cb89bb4c Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Tue, 26 Jan 2016 15:08:52 -0700
Subject: [PATCH] Fix URITest with static methods

---
 tests/unit/Grav/Common/UriTest.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/unit/Grav/Common/UriTest.php b/tests/unit/Grav/Common/UriTest.php
index 14cb9d7ae..59a23deeb 100644
--- a/tests/unit/Grav/Common/UriTest.php
+++ b/tests/unit/Grav/Common/UriTest.php
@@ -1,6 +1,7 @@
 <?php
 
 use Codeception\Util\Fixtures;
+use Grav\Common\Uri;
 use Grav\Common\Utils;
 
 class UriTest extends \Codeception\TestCase\Test
@@ -419,7 +420,7 @@ class UriTest extends \Codeception\TestCase\Test
             'port' => '8080',
         ];
 
-        $this->assertSame($this->grav()['uri']::buildUrl($parsed_url), 'http://localhost:8080');
+        $this->assertSame(Uri::buildUrl($parsed_url), 'http://localhost:8080');
 
         $parsed_url = [
             'scheme' => 'http',
@@ -432,7 +433,7 @@ class UriTest extends \Codeception\TestCase\Test
             'fragment' => 'xxx',
         ];
 
-        $this->assertSame($this->grav()['uri']::buildUrl($parsed_url), 'http://foo:bar@localhost:8080/test?x=2#xxx');
+        $this->assertSame(\Uri::buildUrl($parsed_url), 'http://foo:bar@localhost:8080/test?x=2#xxx');
     }
 
     public function testConvertUrl()
@@ -443,12 +444,12 @@ class UriTest extends \Codeception\TestCase\Test
     public function testAddNonce()
     {
         $url = 'http://localhost/foo';
-        $this->assertStringStartsWith($url, $this->grav()['uri']::addNonce($url, 'test-action'));
-        $this->assertStringStartsWith($url . '/nonce:', $this->grav()['uri']::addNonce($url, 'test-action'));
+        $this->assertStringStartsWith($url, Uri::addNonce($url, 'test-action'));
+        $this->assertStringStartsWith($url . '/nonce:', Uri::addNonce($url, 'test-action'));
 
         $uri = $this->getURI();
 
-        $uri->initializeWithURL($this->grav()['uri']::addNonce($url, 'test-action'))->init();
+        $uri->initializeWithURL(Uri::addNonce($url, 'test-action'))->init();
         $this->assertTrue(is_string($uri->param('nonce')));
         $this->assertSame($uri->param('nonce'), Utils::getNonce('test-action'));
     }