Merge pull request #282 from envato/dtbaker/2023-jan-updates

2023-01 Maintenance

.eslintrc.js

@@ -0,0 +1,19 @@
+module.exports = {
+  env: {
+    browser: true,
+    es6: true
+  },
+  overrides: [
+  ],
+  parserOptions: {
+    ecmaVersion: 'latest'
+  },
+  rules: {
+    "indent": [2, "tab"],
+    "no-tabs": 0
+  },
+  globals: {
+    "jQuery": "readonly",
+    "wp": "readonly"
+  }
+}

Gruntfile.js

@@ -1,4 +1,3 @@
-/* jshint node:true */
 var sass = require('node-sass');
 
 module.exports = function( grunt ) {
@@ -8,12 +7,9 @@ module.exports = function( grunt ) {
 
 		pkg: grunt.file.readJSON( 'package.json' ),
 
-		// JavaScript linting with JSHint.
-		jshint: {
-			options: {
-				jshintrc: '.jshintrc'
-			},
-			all: [
+		// JavaScript linting with eslint.
+		eslint: {
+			target: [
 				'Gruntfile.js',
 				'js/*.js',
 				'!js/*.min.js'
@@ -43,7 +39,6 @@ module.exports = function( grunt ) {
 		sass: {
 			options: {
 				implementation: sass,
-				require: 'susy',
 				sourcemap: 'none',
 				includePaths: require( 'node-bourbon' ).includePaths
 			},
@@ -177,7 +172,6 @@ module.exports = function( grunt ) {
 					'!CodeSniffer.conf',
 					'!phpc*',
 					'!api-test/**',
-					'!dev-lib/**',
 					'!dist/**',
 					'!docs/**',
 					'!Gruntfile.js',
@@ -239,30 +233,24 @@ module.exports = function( grunt ) {
 				stdout: true,
 				stderr: true
 			},
-			readme: {
-				command: 'cd ./dev-lib && ./generate-markdown-readme' // Generate the readme.md
-			},
 			phpunit: {
 				command: 'vagrant ssh -c "cd <%= vvv.plugin %> && phpunit"'
 			},
 			phpunit_c: {
 				command: 'vagrant ssh -c "cd <%= vvv.plugin %> && phpunit --coverage-html <%= vvv.coverage %>"'
 			},
-            phpcs: {
-                command: 'vagrant ssh -c "cd <%= vvv.plugin %> && phpcs"'
-            },
-            phpcbf: {
-                command: 'vagrant ssh -c "cd <%= vvv.plugin %> && phpcbf"'
-            },
-            precommit: {
-                command: 'vagrant ssh -c "cd <%= vvv.plugin %> && DEV_LIB_SKIP="xmllint" ./dev-lib/pre-commit"'
-            }
+			phpcs: {
+				command: 'vagrant ssh -c "cd <%= vvv.plugin %> && phpcs"'
+			},
+			phpcbf: {
+				command: 'vagrant ssh -c "cd <%= vvv.plugin %> && phpcbf"'
+			}
 		}
 
 	});
 
 	// Load tasks
-	grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+	grunt.loadNpmTasks( 'grunt-eslint' );
 	grunt.loadNpmTasks( 'grunt-contrib-uglify' );
 	grunt.loadNpmTasks( 'grunt-sass' );
 	grunt.loadNpmTasks( 'grunt-rtlcss' );
@@ -277,7 +265,7 @@ module.exports = function( grunt ) {
 
 	// Register tasks
 	grunt.registerTask( 'default', [
-		'jshint',
+		'eslint',
 		'css',
 		'uglify'
 	] );
@@ -288,10 +276,6 @@ module.exports = function( grunt ) {
 		'cssmin'
 	] );
 
-	grunt.registerTask( 'readme', [
-		'shell:readme'
-	] );
-
 	grunt.registerTask( 'phpunit', [
 		'shell:phpunit'
 	] );
@@ -308,22 +292,16 @@ module.exports = function( grunt ) {
 		'shell:phpcbf'
 	] );
 
-	grunt.registerTask( 'precommit', [
-		'shell:precommit'
-	] );
-
 	grunt.registerTask( 'dev', [
 		'default',
 		'makepot',
-		'readme',
 		'phpunit'
 	] );
 
 	grunt.registerTask( 'deploy', [
-    'default',
-    'makepot',
-    'readme',
-    // 'phpunit'
+		'default',
+		'makepot',
+		// 'phpunit'
 		'copy',
 		'compress',
 		'clean'

composer.json

@@ -13,6 +13,8 @@
     "php": ">=5.4.0"
   },
   "require-dev": {
-    "satooshi/php-coveralls": "^1.1"
+    "php-coveralls/php-coveralls": "^2.5",
+    "phpunit/phpunit": "^9.5",
+    "squizlabs/php_codesniffer": "^3.7"
   }
 }

contributing.md

@@ -74,7 +74,7 @@ We're really excited that you are interested in contributing to the Envato Marke
 To lint:
 
 ``` bash
-$ grunt jshint
+$ grunt eslint
 ```
 
 To compile Sass:
@@ -101,7 +101,7 @@ To create a pot file:
 $ grunt makepot
 ```
 
-The default task (simply running `grunt`) will do the following: `jshint -> css -> uglify`.
+The default task (simply running `grunt`) will do the following: `eslint -> css -> uglify`.
 
 ## PHPUnit Testing
 
@@ -118,5 +118,3 @@ $ phpunit --coverage-html /tmp/report
 ```
 
 To run the Envato API integration unit tests, you will need to create a `.token` file in the root of the plugin directory with your OAuth Personal Token saved to it. The `.token` file is added to `.gitignore` so it will not be tracked, and you should never try to commit it to the repository.
-
-Travis CI will run the unit tests and perform sniffs against the WordPress Coding Standards whenever you push changes to your PR. Tests are required to pass successfully for a merge to be considered.

docs/.gitignore

@@ -10,9 +10,6 @@ npm-debug.log
 # API Token
 .token
 
-# Build tools
-/dev-lib/
-
 # Composer
 composer.lock
 /vendor/

docs/dist/update-check.json

@@ -1,7 +1,7 @@
 {
 	"name": "Envato Market",
 	"slug": "envato-market",
-	"version": "2.0.7",
+	"version": "2.0.8",
 	"author": "<a href=\"https://envato.com/market-plugin/\">Envato</a>",
 	"author_profile": "https://envato.com/market-plugin/",
 	"contributors": {
@@ -12,7 +12,7 @@
 		}
 	},
 	"requires": "5.1",
-	"tested": "5.9",
+	"tested": "6.1",
 	"compatibility": {},
 	"rating": 0,
 	"num_ratings": "0",
@@ -23,7 +23,7 @@
 	"homepage": "https://envato.com/market-plugin/",
 	"sections": {
 		"description": "WordPress Theme & Plugin management for the Envato Market.",
-		"changelog": "<h4>v2.0.7</h4><ul><li>Fix global notice hidden bug</li></ul><h4>v2.0.6</h4><ul><li>Add health check information to help diagnose common plugin issues</li></ul><h4>v2.0.5</h4><ul><li>Fix javascript compatibility with broken jQuery in 3rd party themes/plugins</li></ul>"
+		"changelog": "<h4>v2.0.8</h4><ul><li>Ensure compatibility with 6.1</li><li>Fix blank page bug when items had no reviews</li></ul><h4>v2.0.7</h4><ul><li>Fix global notice hidden bug</li></ul><h4>v2.0.6</h4><ul><li>Add health check information to help diagnose common plugin issues</li></ul><h4>v2.0.5</h4><ul><li>Fix javascript compatibility with broken jQuery in 3rd party themes/plugins</li></ul>"
 	},
 	"short_description": "WordPress Theme & Plugin management for the Envato Market.",
 	"download_link": "http://envato.github.io/wp-envato-market/dist/envato-market.zip",

envato-market.php

@@ -3,11 +3,11 @@
  * Plugin Name: Envato Market
  * Plugin URI: https://envato.com/market-plugin/
  * Description: WordPress Theme & Plugin management for the Envato Market.
- * Version: 2.0.7
+ * Version: 2.0.8
  * Author: Envato
  * Author URI: https://envato.com
  * Requires at least: 5.1
- * Tested up to: 5.9
+ * Tested up to: 6.1
  * Requires PHP: 7.0
  * Text Domain: envato-market
  * Domain Path: /languages/
@@ -21,7 +21,7 @@
 
 
 /* Set plugin version constant. */
-define( 'ENVATO_MARKET_VERSION', '2.0.7' );
+define( 'ENVATO_MARKET_VERSION', '2.0.8' );
 
 /* Debug output control. */
 define( 'ENVATO_MARKET_DEBUG_OUTPUT', 0 );

inc/admin/functions.php

@@ -188,12 +188,14 @@ function envato_market_themes_column( $group = 'install' ) {
 					<div class="column-rating">
 						<?php
 						if ( ! empty( $theme['rating'] ) ) {
-							if ( is_array( $theme['rating'] ) && ! empty( $theme['rating']['count'] ) ) {
+							if ( is_array( $theme['rating'] ) ) {
+							    $count = ! empty( $theme['rating']['count'] ) ? $theme['rating']['count'] : 0;
+							    $rating = ! empty( $theme['rating']['rating'] ) ? (int) $theme['rating']['rating'] : 0;
 								wp_star_rating(
 									array(
-										'rating' => $theme['rating']['count'] > 0 ? ( $theme['rating']['rating'] / 5 * 100 ) : 0,
+										'rating' => $count > 0 ? ( $rating / 5 * 100 ) : 0,
 										'type'   => 'percent',
-										'number' => $theme['rating']['count'],
+										'number' => $count,
 									)
 								);
 							} else {