Merges RWOverdijk/AssetManager#202 into v2

wshafer · Sep 21, 2017 · 6a6af09 · 6a6af09
1 parent 35c934d
commit 6a6af09
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 21 deletions.
diff --git a/src/Resolver/AliasPathStackResolver.php b/src/Resolver/AliasPathStackResolver.php
@@ -146,7 +146,7 @@ public function resolve($name)
 
             if ($file->isReadable() && !$file->isDir()) {
                 $filePath = $file->getRealPath();
-                $mimeType = $this->getMimeResolver()->getMimeType($filePath);
+                $mimeType = $this->getMimeResolver()->getMimeType($name);
                 $asset    = new FileAsset($filePath);
 
                 $asset->mimetype = $mimeType;

diff --git a/src/Resolver/ConcatResolver.php b/src/Resolver/ConcatResolver.php
@@ -152,6 +152,7 @@ public function resolve($name)
         $aggregateAsset = new AggregateAsset($resolvedAssets);
         $this->getAssetFilterManager()->setFilters($name, $aggregateAsset);
         $aggregateAsset->setTargetPath($name);
+        $aggregateAsset->mimetype = $this->getMimeResolver()->getMimeType($name);
 
         return $aggregateAsset;
     }

diff --git a/src/Resolver/MapResolver.php b/src/Resolver/MapResolver.php
@@ -101,7 +101,7 @@ public function resolve($name)
         }
 
         $file            = $this->map[$name];
-        $mimeType        = $this->getMimeResolver()->getMimeType($file);
+        $mimeType        = $this->getMimeResolver()->getMimeType($name);
 
         if (false === filter_var($file, FILTER_VALIDATE_URL)) {
             $asset = new FileAsset($file);

diff --git a/src/Resolver/PathStackResolver.php b/src/Resolver/PathStackResolver.php
@@ -180,7 +180,7 @@ public function resolve($name)
 
             if ($file->isReadable() && !$file->isDir()) {
                 $filePath = $file->getRealPath();
-                $mimeType = $this->getMimeResolver()->getMimeType($filePath);
+                $mimeType = $this->getMimeResolver()->getMimeType($name);
                 $asset    = new FileAsset($filePath);
 
                 $asset->mimetype = $mimeType;

diff --git a/src/Resolver/PrioritizedPathsResolver.php b/src/Resolver/PrioritizedPathsResolver.php
@@ -189,7 +189,7 @@ public function resolve($name)
 
             if ($file->isReadable() && !$file->isDir()) {
                 $filePath = $file->getRealPath();
-                $mimeType = $this->getMimeResolver()->getMimeType($filePath);
+                $mimeType = $this->getMimeResolver()->getMimeType($name);
                 $asset    = new FileAsset($filePath);
 
                 $asset->mimetype = $mimeType;

diff --git a/src/Service/MimeResolver.php b/src/Service/MimeResolver.php
@@ -88,7 +88,7 @@ class MimeResolver
         'cmdf'     => 'chemical/x-cmdf',
         'cml'      => 'chemical/x-cml',
         'cod'      => 'application/vnd.rim.cod',
-        'coffee'   => 'application/javascript',
+        'coffee'   => 'application/vnd.coffeescript',
         'com'      => 'application/x-msdos-program',
         'cpa'      => 'chemical/x-compass',
         'cpio'     => 'application/x-cpio',
@@ -238,7 +238,7 @@ class MimeResolver
         'kwd'      => 'application/x-kword',
         'kwt'      => 'application/x-kword',
         'latex'    => 'application/x-latex',
-        'less'     => 'text/css',
+        'less'     => 'text/less',
         'lha'      => 'application/x-lha',
         'lhs'      => 'text/x-literate-haskell',
         'lin'      => 'application/bbolin',
@@ -406,7 +406,7 @@ class MimeResolver
         'sci'      => 'application/x-scilab',
         'sco'      => 'audio/csound',
         'scr'      => 'application/x-silverlight',
-        'scss'     => 'text/css',
+        'scss'     => 'text/scss',
         'sct'      => 'text/scriptlet',
         'sd'       => 'chemical/x-mdl-sdfile',
         'sd2'      => 'audio/x-sd2',

diff --git a/tests/Resolver/AliasPathStackResolverTest.php b/tests/Resolver/AliasPathStackResolverTest.php
@@ -345,7 +345,7 @@ public function testCollectDirectory()
     {
         $alias    = 'my/alias/';
         $resolver = new AliasPathStackResolver(array($alias => realpath(__DIR__ . '/../')));
-        $dir      = substr(__DIR__, strrpos(__DIR__, '/', 0) + 1);
+        $dir      = substr(__DIR__, strrpos(__DIR__, DIRECTORY_SEPARATOR, 0) + 1);
 
         $this->assertContains($alias . $dir . DIRECTORY_SEPARATOR . basename(__FILE__), $resolver->collect());
         $this->assertNotContains($alias . $dir . DIRECTORY_SEPARATOR . 'i-do-not-exist.php', $resolver->collect());

diff --git a/tests/Resolver/MapResolverTest.php b/tests/Resolver/MapResolverTest.php
@@ -108,12 +108,12 @@ public function testResolveAssetSuccess()
         $resolver->setMimeResolver($mimeResolver);
 
         $asset1 = array(
-            'bacon' => __FILE__,
+            'bacon.php' => __FILE__,
         );
 
         $resolver->setMap($asset1);
 
-        $asset      = $resolver->resolve('bacon');
+        $asset      = $resolver->resolve('bacon.php');
         $mimetype   = $mimeResolver->getMimeType(__FILE__);
 
         $this->assertTrue($asset instanceof Asset\FileAsset);
@@ -127,19 +127,19 @@ public function testResolveHttpAssetSuccess()
         $mimeResolver = $this->createMock(MimeResolver::class);
 
         $mimeResolver->expects($this->any())
-            ->method('getMimeType')
-            ->with('http://foo.bar/')
-            ->will($this->returnValue('text/foo'));
+                ->method('getMimeType')
+                ->with('bacon.bar')
+                ->will($this->returnValue('text/foo'));
 
         $resolver->setMimeResolver($mimeResolver);
 
         $asset1 = array(
-            'bacon' => 'http://foo.bar/',
+            'bacon.bar' => 'http://foo.bar/',
         );
 
         $resolver->setMap($asset1);
 
-        $asset      = $resolver->resolve('bacon');
+        $asset      = $resolver->resolve('bacon.bar');
 
         $this->assertTrue($asset instanceof Asset\HttpAsset);
         $this->assertSame('text/foo', $asset->mimetype);

diff --git a/tests/Resolver/PathStackResolverTest.php b/tests/Resolver/PathStackResolverTest.php
@@ -162,7 +162,7 @@ public function testCollectDirectory()
     {
         $resolver = new PathStackResolver();
         $resolver->addPath(realpath(__DIR__ . '/../'));
-        $dir = substr(__DIR__, strrpos(__DIR__, '/', 0) + 1);
+        $dir = substr(__DIR__, strrpos(__DIR__, DIRECTORY_SEPARATOR, 0) + 1);
 
         $this->assertContains($dir . DIRECTORY_SEPARATOR . basename(__FILE__), $resolver->collect());
         $this->assertNotContains($dir . DIRECTORY_SEPARATOR . 'i-do-not-exist.php', $resolver->collect());

diff --git a/tests/Resolver/PrioritizedPathsResolverTest.php b/tests/Resolver/PrioritizedPathsResolverTest.php
@@ -247,7 +247,7 @@ public function testCollectDirectory()
     {
         $resolver = new PrioritizedPathsResolver();
         $resolver->addPath(realpath(__DIR__ . '/../'));
-        $dir = substr(__DIR__, strrpos(__DIR__, '/', 0) + 1);
+        $dir = substr(__DIR__, strrpos(__DIR__, DIRECTORY_SEPARATOR, 0) + 1);
 
         $this->assertContains($dir . DIRECTORY_SEPARATOR . basename(__FILE__), $resolver->collect());
         $this->assertNotContains($dir . DIRECTORY_SEPARATOR . 'i-do-not-exist.php', $resolver->collect());

diff --git a/tests/Service/PathStackResolverServiceFactoryTest.php b/tests/Service/PathStackResolverServiceFactoryTest.php
@@ -21,8 +21,8 @@ public function testCreateService()
                 'asset_manager' => array(
                     'resolver_configs' => array(
                         'paths' => array(
-                            'path1/',
-                            'path2/',
+                            'path1' . DIRECTORY_SEPARATOR,
+                            'path2' . DIRECTORY_SEPARATOR,
                         ),
                     ),
                 ),
@@ -34,8 +34,8 @@ public function testCreateService()
         $resolver = $factory($serviceManager);
         $this->assertSame(
             array(
-                'path2/',
-                'path1/',
+                'path2' . DIRECTORY_SEPARATOR,
+                'path1' . DIRECTORY_SEPARATOR,
             ),
             $resolver->getPaths()->toArray()
         );