Merge branch 'release/1.1.4'

Author: jakubmikita

.github/workflows/test.yml

@@ -6,6 +6,10 @@ jobs:
   PHPCS:
     runs-on: ubuntu-latest
     steps:
+    - name: Set default PHP version
+      run: sudo update-alternatives --set php /usr/bin/php7.4
+    - name: Set Composer version
+      run: sudo composer self-update --1
     - name: Checkout
       uses: actions/checkout@v2
     - name: Install dependencies
@@ -27,16 +31,17 @@ jobs:
           - 3306
         options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Install dependencies
-      run: composer install --no-progress
     - name: Setup PHP
       uses: shivammathur/setup-php@v1
       with:
         php-version: ${{ matrix.php }}
         extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, mysql, mysqli, pdo_mysql, bcmath, soap, intl, gd, exif, iconv, imagick
         coverage: none
+        tools: composer:v1
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Install dependencies
+      run: composer install --no-progress
     - name: PHPUnit
       run: |
         chmod 777 bin/install-wp-tests.sh

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 1.1.4
+
+### Changed:
+- Allows mkdir method to get empty parameter.
+
+## 1.1.3 - 15.06.2020
+
+### Fixed:
+- WP_CONTENT_URL not returning proper protocol. Replaced with `content_url()`, thanks to @matt-bernhardt
+
 ## 1.1.3 - 15.06.2020
 
 ### Fixed:

README.md

@@ -56,13 +56,13 @@ echo $filesystem->url();
 // https://my.plugin/wp-content/plugins/my-plugin/
 
 echo $filesystem->url( 'assets/images/logo.svg' );
-// https://my.plugin/wp-content/plugins/my-plugin/'assets/images/logo.svg
+// https://my.plugin/wp-content/plugins/my-plugin/assets/images/logo.svg
 ```
 
 Convert image file to base64 URL.
 
 ```php
-echo '<img src="' . $filesystem->image_to_base64( 'assets/images/logo.svg' ) . '">';
+printf( '<img src="%s">', $filesystem->image_to_base64( 'assets/images/logo.svg' ) );
 // <img src="data:image/svg+xml;base64,m8q76v7wy4guiev...">
 ```
 

src/Filesystem.php

@@ -10,7 +10,8 @@
 /**
  * Filesystem class
  *
- * @see Available methods: https://developer.wordpress.org/reference/classes/wp_filesystem_base/#methods
+ * @see https://developer.wordpress.org/reference/classes/wp_filesystem_base/#methods
+ * @mixin \WP_Filesystem_Base
  */
 class Filesystem {
 
@@ -24,7 +25,7 @@ class Filesystem {
 	/**
 	 * WP Filesystem object
 	 *
-	 * @var WP_Filesystem_*
+	 * @var \WP_Filesystem_Base
 	 */
 	protected static $wp_filesystem;
 
@@ -84,7 +85,7 @@ public function __construct( $base_dir ) {
 	 */
 	private static function init_wp_filesystem() {
 
-		if ( self::$wp_filesystem ) {
+		if ( isset( self::$wp_filesystem ) ) {
 			return;
 		}
 
@@ -135,7 +136,7 @@ public function __call( $method_name, $arguments ) {
 	 * @param  bool       $recursive Whether to act recursively.
 	 * @return bool                  True on success, false on failure.
 	 */
-	public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false, $recursive = false ) {
+	public function mkdir( $path = '', $chmod = false, $chown = false, $chgrp = false, $recursive = false ) {
 
 		if ( ! self::$wp_filesystem instanceof \WP_Filesystem_Direct ) {
 			if ( $recursive ) {
@@ -147,9 +148,6 @@ public function mkdir( $path, $chmod = false, $chown = false, $chgrp = false, $r
 
 		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit( $path );
-		if ( empty( $path ) ) {
-			return false;
-		}
 
 		if ( ! $chmod ) {
 			$chmod = FS_CHMOD_DIR;
@@ -230,7 +228,7 @@ public function image_to_base64( $image_path ) {
 
 		$type = pathinfo( $this->path( $image_path ), PATHINFO_EXTENSION );
 
-		// SVG mime type fix.
+		// Fix SVG MIME type.
 		if ( 'svg' === $type ) {
 			$type = 'svg+xml';
 		}