More fixes

build-cs/composer.json

@@ -4,8 +4,10 @@
 		"phpcompatibility/php-compatibility": "^9.3",
 		"phpstan/phpstan": "^1.10",
 		"phpstan/extension-installer": "^1.2",
+		"phpstan/phpstan-phpunit": "^1.2",
 		"slevomat/coding-standard": "^8.9",
 		"szepeviktor/phpstan-wordpress": "^1.1",
+		"swissspidy/phpstan-no-private": "^0.2",
 		"wp-coding-standards/wpcs": "dev-develop#fca9d9e"
 	},
 	"config": {

composer.json

@@ -21,6 +21,9 @@
 		"wp-coding-standards/wpcs": "dev-develop",
 		"yoast/phpunit-polyfills": "^1.0.1"
 	},
+	"suggest": {
+		"ext-json": "Needed for supporting JSON translation files"
+	},
 	"minimum-stability": "dev",
 	"config": {
 		"allow-plugins": {

lib/class-ginger-mo-translation-file-json.php

@@ -25,12 +25,7 @@ protected function parse_file() {
 		$data = json_decode( $data, true );
 
 		if ( ! $data || ! is_array( $data ) ) {
-			$this->error = true;
-			if ( function_exists( 'json_last_error_msg' ) ) {
-				$this->error = 'JSON Error: ' . json_last_error_msg();
-			} elseif ( function_exists( 'json_last_error' ) ) {
-				$this->error = 'JSON Error code: ' . json_last_error();
-			}
+			$this->error = 'JSON Error: ' . json_last_error_msg();
 			return;
 		}
 
@@ -68,11 +63,7 @@ protected function create_file( $headers, $entries ) {
 		// Prefix as the first key.
 		$entries = array_merge( array( '' => $headers ), $entries );
 
-		if ( defined( 'JSON_PRETTY_PRINT' ) ) {
-			$json = json_encode( (array) $entries, JSON_PRETTY_PRINT );
-		} else {
-			$json = json_encode( (array) $entries );
-		}
+		$json = json_encode( (array) $entries, JSON_PRETTY_PRINT );
 
 		return (bool) file_put_contents( $this->file, $json );
 	}

lib/class-ginger-mo-translation-file.php

@@ -86,19 +86,19 @@ public static function create( $file, $context = 'read', $filetype = null ) {
 
 		switch ( $filetype ) {
 			case 'mo':
-				$moe = new Ginger_MO_Translation_File_MO( $file, $context );
-				break;
+				return new Ginger_MO_Translation_File_MO( $file, $context );
 			case 'php':
-				$moe = new Ginger_MO_Translation_File_PHP( $file, $context );
-				break;
+				return new Ginger_MO_Translation_File_PHP( $file, $context );
 			case 'json':
-				$moe = new Ginger_MO_Translation_File_JSON( $file, $context );
+				if ( function_exists( 'json_decode' ) ) {
+					return new Ginger_MO_Translation_File_JSON( $file, $context );
+				}
 				break;
 			default:
-				$moe = false;
+				return false;
 		}
 
-		return $moe;
+		return false;
 	}
 
 	/**

phpstan.neon.dist

@@ -3,6 +3,8 @@ parameters:
 	paths:
 		- ginger-mo.php
 		- lib/
+		- tests/phpunit/unit/includes
+		- tests/phpunit/unit/tests
 	excludePaths:
 		- lib/class-plural-forms.php
 	bootstrapFiles:

tests/phpstan/bootstrap.php

@@ -0,0 +1,3 @@
+<?php
+
+define( 'GINGER_MO_TEST_DATA', '' );