bump deps;adjust build

.gitignore

@@ -1,3 +1,4 @@
 /vendor/
 /vendor_prefixed/
+coverage/
 

README.md

@@ -1,27 +1,18 @@
-=== Plugin Name ===
-Contributors: leonstafford
-Tags: wp2static,netlify,static
-Requires at least: 3.2
-Tested up to: 5.4
-Stable tag: 1.0-alpha-005
-License: Unlicense
-License URI: http://unlicense.org
+# WP2Static Netlify Deployment Add-on
 
 Adds Netlify as a deployment option for WP2Static.
 
-== Description ==
-
 Take advantage of the Netlify to host your WordPress powered static website.
 
-== Installation ==
+## Installation ==
 
 Upload the ZIP to your WordPress plugins page within your dashboard.
 
 Activate the plugin, then navigate to your WP2Static main plugin page to see
  the new deployment option available.
 
-== Changelog ==
+## Changelog ==
 
-= 1.1 =
+### 1.1
 
-First release
+ - First release

composer.json

@@ -22,14 +22,14 @@
         "guzzlehttp/guzzle": "^6.5"
     },
     "require-dev": {
-        "phpstan/phpstan": "^0.11.16",
+        "phpstan/phpstan": "*",
         "thecodingmachine/phpstan-strict-rules": "*",
-        "szepeviktor/phpstan-wordpress": "^0.2.0",
+        "szepeviktor/phpstan-wordpress": "*",
         "squizlabs/php_codesniffer": "*",
         "phpunit/phpunit": "*",
         "dealerdirect/phpcodesniffer-composer-installer": "*",
         "wp-coding-standards/wpcs": "*",
-        "jakub-onderka/php-parallel-lint": "*",
+        "php-parallel-lint/php-parallel-lint": "*",
         "wa72/url": "^0.7.1"
     },
     "autoload": {
@@ -57,14 +57,12 @@
         "phpcs": "vendor/bin/phpcs --standard=./tools/phpcs.xml --ignore=*/tests/*,*/admin/*,**/coverage/*,*.js,*/vendor/*,*/views/*.php ./",
         "phpcbf": "vendor/bin/phpcbf --standard=./tools/phpcs.xml --ignore=*/js/*,*/tests/*,*/admin/*,*/coverage/*,*.js,*/vendor/*,*/views/*.php ./",
         "phpunit": "vendor/bin/phpunit ./tests/unit/",
-        "coverage": "vendor/bin/phpunit tests/unit --coverage-html coverage --whitelist src/",
         "lint": "vendor/bin/parallel-lint --exclude vendor .",
         "test": [
             "@lint",
             "@phpcs",
             "@phpstan"
         ],
-        "build": "/bin/sh tools/build_release.sh",
-        "post-install-cmd": "sh ./tools/composer-post-install.sh"
+        "build": "/bin/sh tools/build_release.sh"
     }
 }

phpstan.neon

@@ -7,7 +7,7 @@ parameters:
     inferPrivatePropertyTypeFromConstructor: true
     paths:
         - %currentWorkingDirectory%/src/
-    autoload_files:
+    scanFiles:
         - %currentWorkingDirectory%/tests/phpstan/bootstrap.php
         - %currentWorkingDirectory%/tests/phpstan/wp-cli-stubs-2.2.0.php
     ignoreErrors:
@@ -15,4 +15,4 @@ parameters:
         - '#Call to static method l\(\) on an unknown class WP2Static\\WsLog.#'
         - '#Call to static method getUrl\(\) on an unknown class WP2Static\\SiteInfo.#'
         - '#Call to static method getPath\(\) on an unknown class WP2Static\\SiteInfo.#'
-        - '#Call to static method encrypt_decrypt\(\) on an unknown class WP2Static\\Controller.#'
+        - '#Call to static method encrypt_decrypt\(\) on an unknown class WP2Static\\CoreOptions.#'

tools/build_release.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-######################################
+############################################
 ##
 ## Build WP2Static Netlify Deployment Addon
 ##
@@ -8,7 +8,7 @@
 ##
 ## places archive in $HOME/Downloads
 ##
-######################################
+############################################
 
 # run script from project root
 EXEC_DIR=$(pwd)
@@ -20,22 +20,16 @@ mkdir -p $TMP_DIR
 rm -Rf $TMP_DIR/wp2static-addon-netlify
 mkdir $TMP_DIR/wp2static-addon-netlify
 
-
 # clear dev dependencies
 rm -Rf $EXEC_DIR/vendor/*
 # load prod deps and optimize loader
-composer install --no-dev --optimize-autoloader
-
+composer install --quiet --no-dev --optimize-autoloader
 
 # cp all required sources to build dir
 cp -r $EXEC_DIR/wp2static-addon-netlify.php $TMP_DIR/wp2static-addon-netlify/
 cp -r $EXEC_DIR/src $TMP_DIR/wp2static-addon-netlify/
-cp -r $EXEC_DIR/assets $TMP_DIR/wp2static-addon-netlify/
 cp -r $EXEC_DIR/vendor $TMP_DIR/wp2static-addon-netlify/
-cp -r $EXEC_DIR/readme.txt $TMP_DIR/wp2static-addon-netlify/
 cp -r $EXEC_DIR/views $TMP_DIR/wp2static-addon-netlify/
-cp -r $EXEC_DIR/admin $TMP_DIR/wp2static-addon-netlify/
-cp -r $EXEC_DIR/js $TMP_DIR/wp2static-addon-netlify/
 
 cd $TMP_DIR
 
@@ -43,12 +37,7 @@ cd $TMP_DIR
 find . -type d -exec chmod 755 {} \;
 find . -type f -exec chmod 644 {} \;
 
-# strip comments and whitespace from each PHP file
-if [ -z "$2" ]; then
-  find .  ! -name 'wp2static-addon-netlify.php' -name \*.php -exec $EXEC_DIR/tools/compress_php_file {} \;
-fi
-
-zip -r -9 ./$1.zip ./wp2static-addon-netlify
+zip --quiet -r -9 ./$1.zip ./wp2static-addon-netlify
 
 cd -
 
@@ -61,4 +50,4 @@ cd $EXEC_DIR
 # clear dev dependencies
 rm -Rf $EXEC_DIR/vendor/*
 # load prod deps
-composer install
+composer install --quiet

tools/composer-post-install.sh

@@ -1,4 +0,0 @@
-#!/bin/sh
-
-sed -e 's#^function is_countable(#// &#' -i vendor/giacocorsiglia/wordpress-stubs/wordpress-stubs.php
-