Cherry pick changes from #9

userfrosting · Jun 22, 2019 · 72b73b6 · 72b73b6
1 parent 7695f03
commit 72b73b6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/ResourceLocator.php b/src/ResourceLocator.php
@@ -11,6 +11,7 @@
 namespace UserFrosting\UniformResourceLocator;
 
 use Illuminate\Filesystem\Filesystem;
+use InvalidArgumentException;
 use RocketTheme\Toolbox\StreamWrapper\Stream;
 use RocketTheme\Toolbox\StreamWrapper\StreamBuilder;
 use UserFrosting\UniformResourceLocator\Exception\LocationNotFoundException;
@@ -107,7 +108,7 @@ public function __invoke($uri)
     public function addStream(ResourceStreamInterface $stream)
     {
         if (in_array($stream->getScheme(), $this->reservedStreams)) {
-            throw new \InvalidArgumentException("Can't add restriced stream scheme {$stream->getScheme()}.");
+            throw new InvalidArgumentException("Can't add restricted stream scheme {$stream->getScheme()}.");
         }
 
         $this->streams[$stream->getScheme()][$stream->getPrefix()][] = $stream;
@@ -476,6 +477,7 @@ public function normalize($uri, $throwException = false, $splitStream = false)
                 return false;
             }
         }
+
         $uri = preg_replace('|\\\|u', $this->separator, $uri);
         $segments = explode('://', $uri, 2);
         $path = array_pop($segments);
@@ -568,10 +570,10 @@ public function findResource($uri, $absolute = true, $first = false)
      */
     public function findResources($uri, $absolute = true, $all = false)
     {
-        $reources = $this->getResources($uri, $all);
+        $resources = $this->getResources($uri, $all);
 
         $paths = [];
-        foreach ($reources as $resource) {
+        foreach ($resources as $resource) {
             if ($absolute) {
                 $paths[] = $resource->getAbsolutePath();
             } else {
@@ -647,15 +649,15 @@ protected function searchPaths(ResourceStreamInterface $stream)
      * @param bool   $array  Return an array or a single path
      * @param bool   $all    Whether to return all paths even if they don't exist.
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      *
      * @return ResourceInterface|array[ResourceInterface]
      */
     protected function find($scheme, $file, $array, $all)
     {
         // Make sure stream exist
         if (!$this->schemeExists($scheme)) {
-            throw new \InvalidArgumentException("Invalid resource {$scheme}://");
+            throw new InvalidArgumentException("Invalid resource {$scheme}://");
         }
 
         // Prepare result depending on $array parameter

diff --git a/tests/ResourceLocatorTest.php b/tests/ResourceLocatorTest.php
@@ -144,7 +144,7 @@ public function testStreamNotFoundException()
 
     /**
      * @depends testRegisterStream
-     * @expectedException InvalidArgumentException
+     * @expectedException \InvalidArgumentException
      */
     public function testAddStreamThrowExceptionOnRestrictedScheme()
     {
@@ -291,7 +291,7 @@ public function testRegisterLocationWithNoPath()
      * @depends testAddLocation
      * @expectedException \UserFrosting\UniformResourceLocator\Exception\LocationNotFoundException
      */
-    public function testgetLocationThrowExceptionIfNotFound()
+    public function testGetLocationThrowExceptionIfNotFound()
     {
         $locator = new ResourceLocator();
         $locator->getLocation('etc');
@@ -322,7 +322,7 @@ public function testListLocations()
         $locator->registerLocation('bar', '/foo');
         $locator->registerLocation('foo', '/bar');
 
-        // N.B.: Locations are list with the latest one (top prioriry) first
+        // N.B.: Locations are list with the latest one (top priority) first
         $this->assertEquals(['foo', 'bar'], $locator->listLocations());
     }