* Fix VCS test

* Fix file system permission check

Author: froger-me

inc/manager/class-package-manager.php

@@ -1093,6 +1093,10 @@ public function get_package_metadata( $package_slug, $json_encode = false ) {
 	}
 
 	public function set_package_metadata( $package_slug, $metadata ) {
+		WP_Filesystem();
+
+		global $wp_filesystem;
+
 		$dir       = upserv_get_data_dir( 'metadata' );
 		$filename  = sanitize_file_name( $package_slug . '.json' );
 		$file_path = trailingslashit( $dir ) . $filename;
@@ -1104,10 +1108,6 @@ public function set_package_metadata( $package_slug, $metadata ) {
 		if ( empty( $data ) ) {
 
 			if ( ! has_filter( 'upserv_did_delete_package_metadata' ) && is_file( $file_path ) ) {
-				WP_Filesystem();
-
-				global $wp_filesystem;
-
 				$result = (bool) $wp_filesystem->delete( $file_path );
 			} else {
 				$result = apply_filters( 'upserv_did_delete_package_metadata', false, $package_slug );

lib/package-update-checker/Vcs/BitbucketApi.php

@@ -55,7 +55,11 @@ public static function test( $url, $app_password = null ) {
 				return $response;
 			}
 
-			if ( $response && isset( $response->username ) && $instance->user_name === $response->username ) {
+			if (
+				$response &&
+				isset( $response->username ) &&
+				trailingslashit( $instance->user_name ) === trailingslashit( $response->username )
+			) {
 				return true;
 			}
 

lib/package-update-checker/Vcs/GitHubApi.php

@@ -67,7 +67,10 @@ public static function test( $url, $access_token = null ) {
 				return false;
 			}
 
-			if ( isset( $response->html_url ) && $response->html_url === $url ) {
+			if (
+				isset( $response->html_url ) &&
+				trailingslashit( $url ) === trailingslashit( $response->html_url )
+			) {
 				return true;
 			}
 

lib/package-update-checker/Vcs/GitLabApi.php

@@ -135,7 +135,9 @@ public static function test( $url, $access_token = null ) {
 				return $response;
 			}
 
-			return $response && isset( $response->path ) && $instance->user_name === $response->path;
+			return $response &&
+				isset( $response->path ) &&
+				trailingslashit( $instance->user_name ) === trailingslashit( $response->path );
 		}
 
 		/**

readme.txt

@@ -67,6 +67,8 @@ This section describes how to install the plugin and get it working.
 
 = 1.0.4 =
 * More flexibility when parsing `Require License` header
+* Fix VCS test
+* Fix file system permission check
 
 = 1.0.3 =
 * Minor Package API fix