Merge pull request #157 from dshanske/depupdate

Dependency Update

Author: dshanske

.travis.yml

@@ -19,6 +19,7 @@ env:
   - GH_REF: https://github.com/indieweb/wordpress-indieweb.git
 matrix:
   include:
+  - php: 7.4
   - php: 7.3
   - php: 7.2
   - php: 7.1
@@ -40,18 +41,18 @@ before_script:
   # Install the specified version of PHPUnit depending on the PHP version:
   if [[ "$WP_TRAVISCI" == "travis:phpunit" ]]; then
     case "$TRAVIS_PHP_VERSION" in
-      7.3|7.2|7.1|7.0|nightly)
+      7.4|7.3|7.2|7.1|nightly)
+        echo "Using PHPUnit 7.x"
+        composer global require "phpunit/phpunit:^7"
+        ;;
+      7.0)
         echo "Using PHPUnit 6.x"
         composer global require "phpunit/phpunit:^6"
         ;;
       5.6|5.5|5.4|5.3)
         echo "Using PHPUnit 4.x"
         composer global require "phpunit/phpunit:^4"
         ;;
-      5.2)
-        # Do nothing, use default PHPUnit 3.6.x
-        echo "Using default PHPUnit, hopefully 3.6"
-        ;;
       *)
         echo "No PHPUnit version handling for PHP version $TRAVIS_PHP_VERSION"
         exit 1

Gruntfile.js

@@ -1,5 +1,6 @@
 module.exports = function (grunt) {
-  // Project configuration.
+const sass = require('node-sass');
+// Project configuration.
   grunt.initConfig({
     execute: {
       simpleicons: {
@@ -56,39 +57,28 @@ module.exports = function (grunt) {
         }
       }
     },
-    sass: {                              // Task
+    sass: { 
+    	options: {
+		implementation: sass,
+		sourceMap: true,
+		outputStyle: 'compressed'
+      },
+      // Task
       dist: {                            // Target
-        options: {                       // Target options
-          style: 'compressed'
-        },
         files: {                         // Dictionary of files
           'static/css/indieweb.css': 'sass/main.scss',       // 'destination': 'source'
           'static/css/indieweb-bw.css': 'sass/main-bw.scss',
           'static/css/indieweb-admin.css': 'sass/main-admin.scss'
         }
       }
-    },
-
-    makepot: {
-      target: {
-        options: {
-          mainFile: 'indieweb.php',
-          domainPath: '/languages',
-          exclude: ['build/.*'],
-          potFilename: 'wordpress-indieweb.pot',
-          type: 'wp-plugin',
-          updateTimestamp: true
-        }
-      }
     }
-  });
+ });
 
   grunt.loadNpmTasks('grunt-wp-readme-to-markdown');
-  grunt.loadNpmTasks('grunt-wp-i18n');
-  grunt.loadNpmTasks('grunt-contrib-sass');
+  grunt.loadNpmTasks('grunt-sass');
   grunt.loadNpmTasks('grunt-checktextdomain');
   grunt.loadNpmTasks('grunt-execute');
   grunt.loadNpmTasks('grunt-contrib-copy');
   // Default task(s).
-  grunt.registerTask('default', ['wp_readme_to_markdown', 'makepot', 'execute', 'checktextdomain', 'copy' ]);
+  grunt.registerTask('default', ['wp_readme_to_markdown', 'copy', 'execute', 'checktextdomain', 'copy' ]);
 };

bin/install-wp-tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [ $# -lt 3 ]; then
-	echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version]"
+	echo "usage: $0 <db-name> <db-user> <db-pass> [db-host] [wp-version] [skip-database-creation]"
 	exit 1
 fi
 
@@ -10,9 +10,12 @@ DB_USER=$2
 DB_PASS=$3
 DB_HOST=${4-localhost}
 WP_VERSION=${5-latest}
+SKIP_DB_CREATE=${6-false}
 
-WP_TESTS_DIR=${WP_TESTS_DIR-/tmp/wordpress-tests-lib}
-WP_CORE_DIR=${WP_CORE_DIR-/tmp/wordpress/}
+TMPDIR=${TMPDIR-/tmp}
+TMPDIR=$(echo $TMPDIR | sed -e "s/\/$//")
+WP_TESTS_DIR=${WP_TESTS_DIR-$TMPDIR/wordpress-tests-lib}
+WP_CORE_DIR=${WP_CORE_DIR-$TMPDIR/wordpress/}
 
 download() {
     if [ `which curl` ]; then
@@ -22,8 +25,19 @@ download() {
     fi
 }
 
-if [[ $WP_VERSION =~ [0-9]+\.[0-9]+(\.[0-9]+)? ]]; then
-	WP_TESTS_TAG="tags/$WP_VERSION"
+if [[ $WP_VERSION =~ ^[0-9]+\.[0-9]+\-(beta|RC)[0-9]+$ ]]; then
+	WP_BRANCH=${WP_VERSION%\-*}
+	WP_TESTS_TAG="branches/$WP_BRANCH"
+
+elif [[ $WP_VERSION =~ ^[0-9]+\.[0-9]+$ ]]; then
+	WP_TESTS_TAG="branches/$WP_VERSION"
+elif [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0-9]+ ]]; then
+	if [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0] ]]; then
+		# version x.x.0 means the first release of the major version, so strip off the .0 and download version x.x
+		WP_TESTS_TAG="tags/${WP_VERSION%??}"
+	else
+		WP_TESTS_TAG="tags/$WP_VERSION"
+	fi
 elif [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
 	WP_TESTS_TAG="trunk"
 else
@@ -37,7 +51,6 @@ else
 	fi
 	WP_TESTS_TAG="tags/$LATEST_VERSION"
 fi
-
 set -ex
 
 install_wp() {
@@ -49,18 +62,34 @@ install_wp() {
 	mkdir -p $WP_CORE_DIR
 
 	if [[ $WP_VERSION == 'nightly' || $WP_VERSION == 'trunk' ]]; then
-		mkdir -p /tmp/wordpress-nightly
-		download https://wordpress.org/nightly-builds/wordpress-latest.zip  /tmp/wordpress-nightly/wordpress-nightly.zip
-		unzip -q /tmp/wordpress-nightly/wordpress-nightly.zip -d /tmp/wordpress-nightly/
-		mv /tmp/wordpress-nightly/wordpress/* $WP_CORE_DIR
+		mkdir -p $TMPDIR/wordpress-nightly
+		download https://wordpress.org/nightly-builds/wordpress-latest.zip  $TMPDIR/wordpress-nightly/wordpress-nightly.zip
+		unzip -q $TMPDIR/wordpress-nightly/wordpress-nightly.zip -d $TMPDIR/wordpress-nightly/
+		mv $TMPDIR/wordpress-nightly/wordpress/* $WP_CORE_DIR
 	else
 		if [ $WP_VERSION == 'latest' ]; then
 			local ARCHIVE_NAME='latest'
+		elif [[ $WP_VERSION =~ [0-9]+\.[0-9]+ ]]; then
+			# https serves multiple offers, whereas http serves single.
+			download https://api.wordpress.org/core/version-check/1.7/ $TMPDIR/wp-latest.json
+			if [[ $WP_VERSION =~ [0-9]+\.[0-9]+\.[0] ]]; then
+				# version x.x.0 means the first release of the major version, so strip off the .0 and download version x.x
+				LATEST_VERSION=${WP_VERSION%??}
+			else
+				# otherwise, scan the releases and get the most up to date minor version of the major release
+				local VERSION_ESCAPED=`echo $WP_VERSION | sed 's/\./\\\\./g'`
+				LATEST_VERSION=$(grep -o '"version":"'$VERSION_ESCAPED'[^"]*' $TMPDIR/wp-latest.json | sed 's/"version":"//' | head -1)
+			fi
+			if [[ -z "$LATEST_VERSION" ]]; then
+				local ARCHIVE_NAME="wordpress-$WP_VERSION"
+			else
+				local ARCHIVE_NAME="wordpress-$LATEST_VERSION"
+			fi
 		else
 			local ARCHIVE_NAME="wordpress-$WP_VERSION"
 		fi
-		download https://wordpress.org/${ARCHIVE_NAME}.tar.gz  /tmp/wordpress.tar.gz
-		tar --strip-components=1 -zxmf /tmp/wordpress.tar.gz -C $WP_CORE_DIR
+		download https://wordpress.org/${ARCHIVE_NAME}.tar.gz  $TMPDIR/wordpress.tar.gz
+		tar --strip-components=1 -zxmf $TMPDIR/wordpress.tar.gz -C $WP_CORE_DIR
 	fi
 
 	download https://raw.github.com/markoheijnen/wp-mysqli/master/db.php $WP_CORE_DIR/wp-content/db.php
@@ -69,7 +98,7 @@ install_wp() {
 install_test_suite() {
 	# portable in-place argument for both GNU sed and Mac OSX sed
 	if [[ $(uname -s) == 'Darwin' ]]; then
-		local ioption='-i .bak'
+		local ioption='-i.bak'
 	else
 		local ioption='-i'
 	fi
@@ -79,13 +108,14 @@ install_test_suite() {
 		# set up testing suite
 		mkdir -p $WP_TESTS_DIR
 		svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/includes/ $WP_TESTS_DIR/includes
+		svn co --quiet https://develop.svn.wordpress.org/${WP_TESTS_TAG}/tests/phpunit/data/ $WP_TESTS_DIR/data
 	fi
 
-	cd $WP_TESTS_DIR
-
 	if [ ! -f wp-tests-config.php ]; then
 		download https://develop.svn.wordpress.org/${WP_TESTS_TAG}/wp-tests-config-sample.php "$WP_TESTS_DIR"/wp-tests-config.php
-		sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR':" "$WP_TESTS_DIR"/wp-tests-config.php
+		# remove all forward slashes in the end
+		WP_CORE_DIR=$(echo $WP_CORE_DIR | sed "s:/\+$::")
+		sed $ioption "s:dirname( __FILE__ ) . '/src/':'$WP_CORE_DIR/':" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/youremptytestdbnamehere/$DB_NAME/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/yourusernamehere/$DB_USER/" "$WP_TESTS_DIR"/wp-tests-config.php
 		sed $ioption "s/yourpasswordhere/$DB_PASS/" "$WP_TESTS_DIR"/wp-tests-config.php
@@ -95,6 +125,11 @@ install_test_suite() {
 }
 
 install_db() {
+
+	if [ ${SKIP_DB_CREATE} = "true" ]; then
+		return 0
+	fi
+
 	# parse DB_HOST for port or socket references
 	local PARTS=(${DB_HOST//\:/ })
 	local DB_HOSTNAME=${PARTS[0]};

composer.json

@@ -2,7 +2,7 @@
   "name": "indiewordpress/wordpress-indieweb",
   "description": "IndieWeb for WordPress!",
   "require": {
-    "php": ">=5.2.0",
+    "php": ">=5.4.0",
     "composer/installers": "~1.0"
   },
   "extra": {
@@ -20,29 +20,47 @@
       "homepage": "https://david.shanske.com"
     }
   ],
+  "support": {
+     "issues": "https://github.com/indieweb/wordpress-indieweb/issues",
+     "source": "https://github.com/indieweb/wordpress-indieweb"
+  },
   "require-dev": {
-    "phpunit/phpunit": "5.5.*",
-    "phpcompatibility/phpcompatibility-wp": "^2.0",
-    "phpcompatibility/php-compatibility": "^9.0",
-    "wp-coding-standards/wpcs": "^1.2",
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0"
+  	"dealerdirect/phpcodesniffer-composer-installer": "^0.6",
+	"squizlabs/php_codesniffer": "^2.2 || ^3.0.2",
+	"phpcompatibility/php-compatibility": "*",
+	"wp-coding-standards/wpcs": "*",
+	"phpcompatibility/phpcompatibility-wp": "*",
+	"php-parallel-lint/php-parallel-lint": "^1.2",
+	"wp-cli/i18n-command": "^2.2",
+	"sebastian/phpcpd": "^5.0",
+	"phpunit/phpunit": "^7.0"
   },
+  "prefer-stable" : true,
   "scripts": {
     "test": [
-      "composer install",
-      "bin/install-wp-tests.sh wordpress wordpress wordpress",
-      "vendor/bin/phpunit"
+    	"composer install",
+	"bin/install-wp-tests.sh wordpress wordpress wordpress",
+	"vendor/bin/phpunit"
+    ],
+
+    "lint": [
+    	"@lint:php",
+	"@phpcs",
+	"@phpcpd"
+     ],
+    "install-codestandards": [
+	"Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
     ],
-    "lint": "phpcs",
-	"install-codestandards": [
-		"Dealerdirect\\Composer\\Plugin\\Installers\\PHPCodeSniffer\\Plugin::run"
-    	],
-    "phpcbf": [
-	"phpcbf --standard=phpcs.xml"
-			        ],
-        "post-update-cmd": [
-		                "@phpcbf"
-				        ]
+    "make-pot": "./vendor/bin/wp i18n make-pot . languages/wordpress-indieweb.pot",
+    "lint:php": "@php ./vendor/bin/parallel-lint --exclude .git --exclude vendor --exclude node_modules .",
+    "phpcs": "./vendor/bin/phpcs",
+    "phpcpd": "./vendor/bin/phpcpd --fuzzy --exclude .git --exclude vendor --exclude node_modules .",
+    "phpcbf": "./vendor/bin/phpcbf --standard=phpcs.xml",
+    "post-update-cmd": [
+	"@phpcbf",
+	"@lint",
+	"@make-pot"
+    ]
 
     }
 }

includes/class-plugin-installer.php

@@ -139,7 +139,7 @@ public static function render_template( $plugin, $api, $button_text, $button_cla
 					<h2><?php echo esc_html( $api->name ); ?></h2>
 					<p><?php echo esc_html( $api->short_description ); ?></p>
 
-					<p class="plugin-author"><?php esc_html_e( 'By', 'indieweb' ); ?> <?php echo $api->author; ?></p>
+					<p class="plugin-author"><?php esc_html_e( 'By', 'indieweb' ); ?> <?php echo $api->author; // phpcs:ignore ?></p>
 				</div>
 				<ul class="activation-row">
 					<li>
@@ -177,8 +177,8 @@ public function cnkt_plugin_installer() {
 				wp_die( esc_html( __( 'Sorry, you are not allowed to install plugins on this site.', 'indieweb' ) ) );
 			}
 
-			$nonce  = $_POST['nonce'];
-			$plugin = $_POST['plugin'];
+			$nonce  = $_POST['nonce']; // phpcs:ignore
+			$plugin = $_POST['plugin']; // phpcs:ignore
 
 			// Check our nonce, if they don't match then bounce!
 			if ( ! wp_verify_nonce( $nonce, 'cnkt_installer_nonce' ) ) {
@@ -250,8 +250,8 @@ public function cnkt_plugin_activation() {
 				wp_die( esc_html( __( 'Sorry, you are not allowed to activate plugins on this site.', 'indieweb' ) ) );
 			}
 
-			$nonce  = $_POST['nonce'];
-			$plugin = $_POST['plugin'];
+			$nonce  = $_POST['nonce']; // phpcs:ignore
+			$plugin = $_POST['plugin']; // phpcs:ignore
 
 			// Check our nonce, if they don't match then bounce!
 			if ( ! wp_verify_nonce( $nonce, 'cnkt_installer_nonce' ) ) {
@@ -330,7 +330,7 @@ public static function get_plugin_file( $plugin_slug ) {
 				$slug = dirname( plugin_basename( $plugin_file ) );
 
 				if ( $slug ) {
-					if ( $slug == $plugin_slug ) {
+					if ( $slug === $plugin_slug ) {
 						return $plugin_file; // If $slug = $plugin_name
 					}
 				}
@@ -372,7 +372,7 @@ public static function check_file_extension( $filename ) {
 		* @since 1.0
 		*/
 		public function enqueue_scripts() {
-			wp_enqueue_script( 'plugin-installer', CNKT_INSTALLER_PATH . 'static/js/installer.js', array( 'jquery' ) );
+			wp_enqueue_script( 'plugin-installer', CNKT_INSTALLER_PATH . 'static/js/installer.js', array( 'jquery' ), IndieWeb_Plugin::$version, true );
 			wp_localize_script(
 				'plugin-installer',
 				'cnkt_installer_localize',
@@ -386,7 +386,7 @@ public function enqueue_scripts() {
 				)
 			);
 
-			wp_enqueue_style( 'plugin-installer', CNKT_INSTALLER_PATH . 'static/css/installer.css' );
+			wp_enqueue_style( 'plugin-installer', CNKT_INSTALLER_PATH . 'static/css/installer.css', array(), IndieWeb_Plugin::$version );
 		}
 
 	}

includes/class-relme-domain-icon-map.php

@@ -6,6 +6,7 @@ class Rel_Me_Domain_Icon_Map {
 	// Common mappings and custom mappings
 	private static $map = array(
 		'twitter.com'         => 'twitter',
+		'blogspot.com'        => 'blogger',
 		'facebook.com'        => 'facebook',
 		'swarmapp.com'        => 'swarm',
 		'instagram.com'       => 'instagram',