Merge pull request #33 from gwa/master

Master

Author: prisis

.editorconfig

@@ -0,0 +1,15 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

composer.json

@@ -1,7 +1,7 @@
 {
     "name"       : "gwa/multisite-directory-resolver",
     "type"       : "library",
-    "description": "",
+    "description": "Adds filters that correct directory paths in a Wordpress multisite install with the WordPress installation in a custom subfolder.",
     "keywords"   : ["composer", "wordpress", "multisite"],
     "license"    : "MIT",
     "homepage"   : "https://github.com/gwa/WpMultisiteDirectoryResolver",
@@ -16,11 +16,12 @@
         }
     ],
     "require": {
-        "php"                        : ">=5.4.0"
+        "php"                        : ">=5.4.0",
+        "gwa/mockery-wp-bridge"      : "^1.2"
     },
     "require-dev": {
-        "fabpot/php-cs-fixer"        : "~1.8",
-        "phpunit/phpunit"            : "~4.6.6",
+        "fabpot/php-cs-fixer"        : "~1.10",
+        "phpunit/phpunit"            : "~4.8",
         "satooshi/php-coveralls"     : "~0.6.1"
     },
     "autoload": {
@@ -35,7 +36,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master"             : "0.0.5-dev"
+            "dev-master"             : "2.1.0-dev"
         }
     },
     "suggest": {

phpunit.php

@@ -1,4 +1,3 @@
 <?php
 
 require __DIR__.'/vendor/autoload.php';
-require __DIR__.'/tests/MockFunc/WpFunc.php';

src/Gwa/AbstractResolver.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Gwa\Wordpress;
 
 /**
@@ -12,13 +13,17 @@
  * @license     MIT
  */
 
+use Gwa\Wordpress\MockeryWpBridge\Traits\WpBridgeTrait;
+
 /**
  * AbstractResolver.
  *
  * @author  Daniel Bannert
  */
 abstract class AbstractResolver
 {
+    use WpBridgeTrait;
+
     /**
      * Folder path to wordpress, with trailing slash.
      *
@@ -75,15 +80,65 @@ public function fixNetworkAdminUrlFilter($path = '', $scheme = 'admin')
         return preg_replace($wordpressUrl, $multiSiteUrl, $path, 1);
     }
 
+    /**
+     * Fix double backslashes in app folder.
+     *
+     * @param string
+     */
+    public function fixWpDoubleSlashFilter($urls)
+    {
+        foreach ($urls as &$url) {
+            if ($url) {
+                $url = str_replace('//app', '/app', $url);
+            }
+        }
+
+        return $urls;
+    }
+
+    /**
+     * Fixes the protocol in urls. Replaces leading double slashes //
+     * with the full protocol; https or http depending on context.
+     *
+     * @param string
+     *
+     * @return array
+     */
+    public function fixWpProtocolFilter($urls)
+    {
+        $protocol = $this->getSiteProtocol();
+
+        foreach ($urls as $k => &$v) {
+            if ((strpos($k, 'url') !== false) && (substr($v, 0, 2) === '//')) {
+                $v = $protocol.ltrim($v, '//');
+            }
+        }
+
+        return $urls;
+    }
+
+    /**
+     * Get the correct protocol.
+     *
+     * @return string
+     */
+    protected function getSiteProtocol()
+    {
+        return $this->getWpBridge()->isSsl() ? 'https://' : 'http://';
+    }
+
     /**
      * Init all filter.
      */
     public function init()
     {
-        add_filter('network_admin_url', [$this, 'fixNetworkAdminUrlFilter'], 10, 2);
+        $this->getWpBridge()->addFilter('network_admin_url', [$this, 'fixNetworkAdminUrlFilter'], 10, 2);
+
+        $this->getWpBridge()->addFilter('script_loader_src', [$this, 'fixStyleScriptPathFilter'], 10, 2);
+        $this->getWpBridge()->addFilter('style_loader_src', [$this, 'fixStyleScriptPathFilter'], 10, 2);
 
-        add_filter('script_loader_src', [$this, 'fixStyleScriptPathFilter'], 10, 2);
-        add_filter('style_loader_src', [$this, 'fixStyleScriptPathFilter'], 10, 2);
+        $this->getWpBridge()->addFilter('upload_dir', [$this, 'fixWpDoubleSlashFilter'], 10, 1);
+        $this->getWpBridge()->addFilter('upload_dir', [$this, 'fixWpProtocolFilter'], 10, 1);
     }
 
     /**

src/Gwa/Contracts/MultisiteDirectoryResolver.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Gwa\Wordpress\Contracts;
 
 /**
@@ -17,7 +18,7 @@
  *
  * @author  Daniel Bannert
  */
-Interface MultisiteDirectoryResolver
+interface MultisiteDirectoryResolver
 {
     /**
      * Set the right links in Adminbar.

src/Gwa/MultisiteDirectoryResolver.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Gwa\Wordpress;
 
 /**
@@ -42,7 +43,7 @@ class MultisiteDirectoryResolver extends AbstractResolver implements ResolverCon
      */
     public function __construct($wpdir)
     {
-        $this->wpDirectoryPath = substr($wpdir, -1) === '/' ? $wpdir : $wpdir.'/';;
+        $this->wpDirectoryPath = substr($wpdir, -1) === '/' ? $wpdir : $wpdir.'/';
 
         $this->setWpFolderName();
     }
@@ -81,19 +82,19 @@ public function fixStyleScriptPathFilter($src, $handle)
         $dir = rtrim($this->wpDirectoryPath, '/');
 
         if (
-            strpos($src, site_url()) !== false &&
+            strpos($src, $this->getWpBridge()->siteUrl()) !== false &&
             strpos($src, 'plugins') === false &&
             strpos($src, $dir) === false
         ) {
-            $styleUrl = explode(site_url(), $src);
-            $src = site_url().$dir.$styleUrl[1];
+            $styleUrl = explode($this->getWpBridge()->siteUrl(), $src);
+            $src = $this->getWpBridge()->siteUrl().'/'.$dir.$styleUrl[1];
         }
 
         if (strpos($src, '/app')) {
             $src = str_replace('//app', '/app', $src);
         }
 
-        return esc_url($src);
+        return $this->getWpBridge()->escUrl($src);
     }
 
     /**
@@ -120,7 +121,7 @@ public function init()
     {
         parent::init();
 
-        add_filter('site_url', [$this, 'fixSiteUrlFilter'], 10, 3);
-        add_filter('includes_url', [$this, 'fixWpIncludeFolder'], 10, 2);
+        $this->getWpBridge()->addFilter('site_url', [$this, 'fixSiteUrlFilter'], 10, 3);
+        $this->getWpBridge()->addFilter('includes_url', [$this, 'fixWpIncludeFolder'], 10, 2);
     }
 }

src/Gwa/MultisiteResolverManager.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Gwa\Wordpress;
 
 /**
@@ -12,18 +13,23 @@
  * @license     MIT
  */
 
+use Gwa\Wordpress\MockeryWpBridge\Traits\WpBridgeTrait;
+use Gwa\Wordpress\MockeryWpBridge\WpBridge;
+
 /**
  * MultisiteResolverManager.
  *
  * @author  Daniel Bannert
  */
 class MultisiteResolverManager
 {
+    use WpBridgeTrait;
+
     const TYPE_SUBDOMAIN = '\Gwa\Wordpress\MultisiteSubDomainResolver';
-    const TYPE_FOLDER    = '\Gwa\Wordpress\MultisiteDirectoryResolver';
+    const TYPE_FOLDER = '\Gwa\Wordpress\MultisiteDirectoryResolver';
 
     /**
-     * Resolver Handler
+     * Resolver Handler.
      *
      * @var \Gwa\Wordpress\Contracts\MultisiteDirectoryResolver
      */
@@ -34,17 +40,24 @@ class MultisiteResolverManager
      *
      * @param string $wpdir
      * @param string $multisiteDomainType
+     * @param null   $wpBridge
      */
-    public function __construct($wpdir, $multisiteDomainType) {
+    public function __construct($wpdir, $multisiteDomainType, $wpBridge = null)
+    {
         if (!is_string($wpdir) || $wpdir === '' || $wpdir === '/') {
             throw new \Exception('Please set the relative path to your Wordpress install folder.');
         }
 
-        $this->handler = new $multisiteDomainType($wpdir);
+        $this->setWpBridge(($wpBridge !== null) ? $wpBridge : new WpBridge());
+
+        $handler = new $multisiteDomainType($wpdir);
+        $handler->setWpBridge($this->getWpBridge());
+
+        $this->handler = $handler;
     }
 
     /**
-     * Get current Handler
+     * Get current Handler.
      *
      * @return \Gwa\Wordpress\Contracts\MultisiteDirectoryResolver
      */

src/Gwa/MultisiteSubDomainResolver.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace Gwa\Wordpress;
 
 /**
@@ -21,7 +22,7 @@
  */
 class MultisiteSubDomainResolver extends AbstractResolver implements ResolverContract
 {
-     /**
+    /**
      * Set the right path for script and style loader.
      *
      * @param string $src
@@ -35,6 +36,6 @@ public function fixStyleScriptPathFilter($src, $handle)
             $src = str_replace('//app', '/app', $src);
         }
 
-        return esc_url($src);
+        return $this->getWpBridge()->escUrl($src);
     }
 }