Merge branch 'release/1.1.2'

Author: jakubmikita

.github/workflows/test.yml

@@ -0,0 +1,28 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  PHPCS:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install dependencies
+      run: composer install --no-progress
+    - name: Coding Standards
+      run: composer phpcs
+  PHPUnit:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install dependencies
+      run: composer install --no-progress
+    - name: PHPUnit
+      run: |
+        composer setup-local-tests
+        composer phpunit

CHANGELOG.md

@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.1.2 - 10.02.2020
+
+### Changed:
+- WP Filesystem is not cached scroll all Filesystem instances for better performance.
+
 ## 1.1.1 - 05.02.2020
 
 ### Fixed:

composer.json

@@ -11,7 +11,9 @@
 	"scripts": {
 		"phpcs": "phpcs",
 		"phpcbf": "phpcbf",
-		"phpunit": "phpunit"
+		"phpunit": "phpunit",
+		"phpunit-coverage": "phpunit --coverage-text",
+		"setup-local-tests": "bash bin/install-wp-tests.sh wordpress_test root root localhost latest"
 	},
 	"require": {
 		"php": ">=5.6"

phpunit.xml.dist renamed to phpunit.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <phpunit
 	bootstrap="tests/bootstrap.php"
 	backupGlobals="false"
@@ -11,4 +12,9 @@
 			<directory prefix="test-" suffix=".php">./tests/</directory>
 		</testsuite>
 	</testsuites>
+	<filter>
+        <whitelist>
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
 </phpunit>

src/Filesystem.php

@@ -26,7 +26,7 @@ class Filesystem {
 	 *
 	 * @var WP_Filesystem_*
 	 */
-	protected $wp_filesystem;
+	protected static $wp_filesystem;
 
 	/**
 	 * WP_Filesystem's methods
@@ -72,7 +72,7 @@ public function __construct( $base_dir ) {
 
 		$this->base_dir = trailingslashit( wp_normalize_path( $base_dir ) );
 
-		$this->init_wp_filesystem();
+		self::init_wp_filesystem();
 
 	}
 
@@ -82,14 +82,18 @@ public function __construct( $base_dir ) {
 	 * @since  1.0.0
 	 * @return void
 	 */
-	private function init_wp_filesystem() {
+	private static function init_wp_filesystem() {
+
+		if ( self::$wp_filesystem ) {
+			return;
+		}
 
 		global $wp_filesystem;
 
 		require_once ABSPATH . '/wp-admin/includes/file.php';
 		WP_Filesystem();
 
-		$this->wp_filesystem = $wp_filesystem;
+		self::$wp_filesystem = $wp_filesystem;
 
 	}
 
@@ -111,7 +115,7 @@ public function __call( $method_name, $arguments ) {
 			$arguments[0] = $this->path( $arguments[0] );
 		}
 
-		return call_user_func_array( [ $this->wp_filesystem, $method_name ], $arguments );
+		return call_user_func_array( [ self::$wp_filesystem, $method_name ], $arguments );
 
 	}
 
@@ -133,12 +137,12 @@ public function __call( $method_name, $arguments ) {
 	 */
 	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false, $recursive = false ) {
 
-		if ( ! $this->wp_filesystem instanceof \WP_Filesystem_Direct ) {
+		if ( ! self::$wp_filesystem instanceof \WP_Filesystem_Direct ) {
 			if ( $recursive ) {
 				throw new \Exception( 'Current filesystem method does not support recursive directory creation.' );
 			}
 
-			$this->wp_filesystem->mkdir( $path, $chmod, $chown, $chgrp );
+			self::$wp_filesystem->mkdir( $path, $chmod, $chown, $chgrp );
 		}
 
 		// Safe mode fails with a trailing slash under certain PHP versions.