Merge pull request #19 from gwa/develop

	test fixes | cs fixes

Author: prisis

src/Gwa/MultisiteDirectoryResolver.php

@@ -11,8 +11,6 @@
  * @link        http://www.greatwhiteark.com
  *
  * @license     MIT
- *
- * @version     0.0.5
  */
 
 /**
@@ -70,13 +68,14 @@ public function fixNetworkAdminUrlFilter($path = '', $scheme = 'admin')
             '/(wp-admin)/',
             '/(wp-login\.php)/',
             '/(wp-activate\.php)/',
-            '/(wp-signup\.php)/'
+            '/(wp-signup\.php)/',
         ];
+
         $multiSiteUrl = [
             $this->wpFolderName.'/wp-admin',
             $this->wpFolderName.'/wp-login.php',
             $this->wpFolderName.'/wp-activate.php',
-            $this->wpFolderName.'/wp-signup.php'
+            $this->wpFolderName.'/wp-signup.php',
         ];
 
         return preg_replace($wordpressUrl, $multiSiteUrl, $path, 1);
@@ -124,6 +123,10 @@ public function fixStyleScriptPathFilter($src, $handle)
             $src = site_url().'/'.$dir.$styleUrl[1];
         }
 
+        if (strpos($src, 'plugins') && strpos($src, '//app')) {
+            $src = str_replace('//app', '/app', $src);
+        }
+
         return esc_url($src);
     }
 

tests/MultisiteDirectoryResolverTest.php

@@ -202,15 +202,17 @@ public function testFixesStyleScriptURLWhenPluginUrlPassed($value = '')
         $installpath = '/path/to/my/project';
         $installsubfolder = 'foo/wp';
 
-        $urlPlugin = $domain.$installpath.'/app/plugins/';
+        $urlPlugin = $domain.$installpath.'//app/plugins/';
+        $expectedUrl = $domain.$installpath.'/app/plugins/';
 
         $cwml = new MDR($installsubfolder);
-        $this->assertEquals($urlPlugin, $cwml->fixStyleScriptPathFilter($urlPlugin, ''));
+        $this->assertEquals($expectedUrl, $cwml->fixStyleScriptPathFilter($urlPlugin, ''));
 
-        $urlPlugin = 'http://example.org/projects/testWordpress/web/wp/app/plugins/';
+        $urlPlugin = 'http://example.org/projects/testWordpress/web/wp//app/plugins/';
+        $expectedUrl = 'http://example.org/projects/testWordpress/web/wp/app/plugins/';
 
         $cwml = new MDR($installsubfolder);
-        $this->assertEquals($urlPlugin, $cwml->fixStyleScriptPathFilter($urlPlugin, ''));
+        $this->assertEquals($expectedUrl, $cwml->fixStyleScriptPathFilter($urlPlugin, ''));
     }
 
     public function testFixesStyleScriptURLWhenSiteUrlPassed()