From a7f751e9f19e6415e3f161cfb68b52055ea625d9 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Sun, 25 Aug 2013 11:26:50 +0200 Subject: [PATCH 01/16] + Adds a new Tabbed Settings page + Adds option to disable minification alltogether + Adds option to disable minification based on specific conditions ( islogged, is_admin, query var present ) + Adds option to exclude resources, line-delimited, based on string search not matching, means it matches any part of the url * Note: Disabling minification does not disable serving minified files, so cached pages does not break. --- admin.css | 13 ++++ admin.js | 20 +++++ dependency-minification.php | 141 ++++++++++++++++++++++++++++++++---- 3 files changed, 160 insertions(+), 14 deletions(-) diff --git a/admin.css b/admin.css index 5199a48..3c63c93 100644 --- a/admin.css +++ b/admin.css @@ -14,3 +14,16 @@ .fixed .column-expires { width: 12%; } + +.nav-tab-content { + display: none; +} +.form-table th small { + display: block; + clear: both; + color: #999; +} +.form-table td label { + display: block; + clear:both; +} \ No newline at end of file diff --git a/admin.js b/admin.js index e69de29..2b6d574 100644 --- a/admin.js +++ b/admin.js @@ -0,0 +1,20 @@ +jQuery(function($){ + + // Admin page tabs + var $tabs = $('.nav-tab-wrapper'), + $panels = $('.nav-tab-content'), + currentHash = window.location.hash; + + $tabs.on('click', 'a', function(e){ + var hash = $(this).attr('href').replace('#tab-', '#tab-content-'); // prevents page scrolling if hash is present + $panels.hide().filter(hash).show(); + $tabs.find('a').removeClass('nav-tab-active').filter($(this)).addClass('nav-tab-active'); + }); + $tabs.find( currentHash ? 'a[href="'+currentHash+'"]' : ':first').trigger('click'); + + // Fix input-inside-label glitch + $panels.on('click', 'input[type=text]', function(e){ + e.preventDefault(); + }) + +}); \ No newline at end of file diff --git a/dependency-minification.php b/dependency-minification.php index 1cc347b..e0c7d36 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -14,13 +14,14 @@ class Dependency_Minification { protected static $minified_count = 0; static $admin_page_hook; - const DEFAULT_ENDPOINT = '_minify'; - const CRON_MINIFY_ACTION = 'minify_dependencies'; - const CACHE_KEY_PREFIX = 'depmin_cache_'; - const FILENAME_PATTERN = '([^/]+?)\.([0-9a-f]+)(?:\.([0-9a-f]+))?\.(css|js)'; - const AJAX_ACTION = 'dependency_minification'; - const ADMIN_PAGE_SLUG = 'dependency-minification'; - const ADMIN_PARENT_PAGE = 'tools.php'; + const DEFAULT_ENDPOINT = '_minify'; + const CRON_MINIFY_ACTION = 'minify_dependencies'; + const CACHE_KEY_PREFIX = 'depmin_cache_'; + const FILENAME_PATTERN = '([^/]+?)\.([0-9a-f]+)(?:\.([0-9a-f]+))?\.(css|js)'; + const AJAX_ACTION = 'dependency_minification'; + const AJAX_OPTIONS_ACTION = 'dependency_minification_options'; + const ADMIN_PAGE_SLUG = 'dependency-minification'; + const ADMIN_PARENT_PAGE = 'tools.php'; static $query_vars = array( 'depmin_handles', @@ -30,8 +31,7 @@ class Dependency_Minification { ); static function setup() { - self::$options = apply_filters( 'dependency_minification_options', array_merge( - array( + $defaults = array( 'endpoint' => self::DEFAULT_ENDPOINT, 'default_exclude_remote_dependencies' => true, 'cache_control_max_age_cache' => 2629743, // 1 month in seconds @@ -40,8 +40,13 @@ static function setup() { 'admin_page_capability' => 'edit_theme_options', 'show_error_messages' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ), 'disable_if_wp_debug' => true, - ), - self::$options + 'exclude_dependencies' => '', + 'disabled_on_conditions' => array(), + ); + $options = get_option( 'dependency_minification_options', array() ); + self::$options = apply_filters( 'dependency_minification_options', array_merge( + $defaults, + $options ) ); $is_frontend = ! ( @@ -49,7 +54,21 @@ static function setup() { || in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) ); - if ( $is_frontend ) { + $disabled = ( + ! empty( self::$options['disabled_on_conditions']['all'] ) + || ( !empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) + || ( !empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_plugins' ) ) + || ( !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && !empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) + ) + ); + + if ( + $is_frontend + && + ! $disabled + ) { add_filter( 'print_scripts_array', array( __CLASS__, 'filter_print_scripts_array' ) ); add_filter( 'print_styles_array', array( __CLASS__, 'filter_print_styles_array' ) ); } @@ -59,6 +78,7 @@ static function setup() { add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) ); add_action( 'admin_enqueue_scripts', array( __CLASS__, 'admin_enqueue_scripts' ) ); add_action( 'wp_ajax_' . self::AJAX_ACTION, array( __CLASS__, 'admin_ajax_handler' ) ); + add_action( 'wp_ajax_' . self::AJAX_OPTIONS_ACTION, array( __CLASS__, 'admin_ajax_options_handler' ) ); add_filter( 'plugin_action_links', array( __CLASS__, 'admin_plugin_action_links' ), 10, 2 ); } @@ -237,6 +257,32 @@ static function admin_ajax_handler() { exit; } + /** + * @action wp_ajax_dependency_minification_options + */ + static function admin_ajax_options_handler() { + if ( ! current_user_can( self::$options['admin_page_capability'] ) ) { + wp_die( __( 'You are not allowed to do that.', 'depmin' ) ); + } + if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], self::AJAX_OPTIONS_ACTION ) ) { + wp_die( __( 'Nonce check failed. Try reloading the previous page.', 'depmin' ) ); + } + $updated_count = 0; + if ( ! empty( $_REQUEST['options'] ) ) { + $options = get_option( 'dependency_minification_options' ); + $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_REQUEST['options']['exclude_dependencies'] ) ); + $options['disabled_on_conditions'] = $_REQUEST['options']['disabled_on_conditions']; + update_option( 'dependency_minification_options', $options ); + } + + $redirect_url = add_query_arg( 'page', self::ADMIN_PAGE_SLUG, admin_url( self::ADMIN_PARENT_PAGE ) ); + $redirect_url = add_query_arg( 'updated', 1, $redirect_url ); + $redirect_url.= '#tab-settings'; + wp_redirect( $redirect_url ); + + die(); + } + /** * @filter plugin_action_links */ @@ -258,8 +304,11 @@ static function admin_page() {

- - +

+ + +

+
@@ -447,6 +496,60 @@ static function admin_page() {
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + + + +
+
+ +
+
+
registered[$handle]->src; $is_local = self::is_self_hosted_src( $src ); $is_excluded = !$is_local && self::$options['default_exclude_remote_dependencies']; + $is_excluded = $is_excluded || self::is_url_included( $src, self::$options['exclude_dependencies'] ); $is_excluded = apply_filters( 'dependency_minification_excluded', $is_excluded, $handle, $src ); if ( $last_was_excluded !== $is_excluded ) { From a0c2b874bb10482523aa204e9d96c8f9cadd4084 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Sun, 25 Aug 2013 12:04:20 +0200 Subject: [PATCH 02/16] + Exposes the option of defaulting to exclude the external dependencies. #5 * Fix a small translation missing text domain --- dependency-minification.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dependency-minification.php b/dependency-minification.php index e0c7d36..383d747 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -272,6 +272,7 @@ static function admin_ajax_options_handler() { $options = get_option( 'dependency_minification_options' ); $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_REQUEST['options']['exclude_dependencies'] ) ); $options['disabled_on_conditions'] = $_REQUEST['options']['disabled_on_conditions']; + $options['default_exclude_remote_dependencies'] = isset( $_REQUEST['options']['default_exclude_remote_dependencies'] ); update_option( 'dependency_minification_options', $options ); } @@ -515,6 +516,15 @@ static function admin_page() { + + + + + + + @@ -535,7 +545,7 @@ static function admin_page() { - + From f29016831c83c45f43092b33f284559527738f67 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Sun, 25 Aug 2013 12:56:23 +0200 Subject: [PATCH 03/16] * Fix manage_plugins to manage_options * Remove trailing spaces --- dependency-minification.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dependency-minification.php b/dependency-minification.php index 383d747..64bcba9 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -55,17 +55,17 @@ static function setup() { in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) ); $disabled = ( - ! empty( self::$options['disabled_on_conditions']['all'] ) - || ( !empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) - || ( !empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_plugins' ) ) - || ( !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + ! empty( self::$options['disabled_on_conditions']['all'] ) + || ( !empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) + || ( !empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) + || ( !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) && !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) && !empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) ) ); - if ( - $is_frontend + if ( + $is_frontend && ! $disabled ) { @@ -174,7 +174,7 @@ static function admin_notices() { ?>

%1$s: %2$s', __( 'Dependency Minification', 'depmin' ), sprintf( From 41dd1729ab2967fcc2d553a6b43f1bf786a76a86 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Sun, 13 Oct 2013 23:15:52 -0700 Subject: [PATCH 04/16] Squashed 'bin/' changes from 5614813..774bdc3 774bdc3 Check modified files, pass select JS to jshint, run phpunit in vagrant bc955c7 Fix pre-commit detection of staged_php_files d0194bb Add PHP syntax checks for travis-ci and pre-commit hook c98d9c4 Merge branch 'master' of github.com:x-team/wp-plugin-dev-lib 2e1b928 Remove dependency on WP_CLI 0e07a75 Note how add .travis.yml and .jshintrc to host plugin via symlinks da3555c Also check for presence of phpunit.xml.dist 0ae29af Update pre-commit hook so PHPCS only looks at staged PHP files 00d36fb Merge commit '7ef48bd5aa6680d02589a9f5697b35cd9a9520ca' into develop f5f2c1c Update pre-commit hook to look for staged php files 3ddac64 Revamp pre-commit hook, adding jshint 9f7df05 Rename .jshint => .jshintrc 817f4c2 Add travis-ci with support for jshint, phpcs, phpunit a3a984d Add jshint and fix warnings 730cf4f Merge commit '32585ea10effb3de33aa7136424364359c199969' 1095520 Apply phpcs fixes git-subtree-dir: bin git-subtree-split: 774bdc3be5ba985f15ef4eefea94dd0dc5baac1c --- .jshintrc | 63 ++++++++++++++++++++++++ .travis.yml | 31 ++++++++++++ class-wordpress-readme-parser.php | 61 +++++++++++++---------- pre-commit | 81 ++++++++++++++++++++++++------- readme.md | 16 +++++- 5 files changed, 208 insertions(+), 44 deletions(-) create mode 100644 .jshintrc create mode 100644 .travis.yml diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000..a2bb92b --- /dev/null +++ b/.jshintrc @@ -0,0 +1,63 @@ +// -------------------------------------------------------------------- +// WordPress JSHint Configuration +// -------------------------------------------------------------------- +{ + "bitwise" : true, // Prohibit bitwise operators (&, |, ^, etc.). + "curly" : true, // Require {} for every new block or scope. + "eqeqeq" : true, // Require triple equals i.e. `===`. + "forin" : true, // Tolerate `for in` loops without `hasOwnPrototype`. + "immed" : true, // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );` + "latedef" : true, // Prohibit variable use before definition. + "newcap" : true, // Require capitalization of all constructor functions e.g. `new F()`. + "noarg" : true, // Prohibit use of `arguments.caller` and `arguments.callee`. + "noempty" : true, // Prohibit use of empty blocks. + "nonew" : true, // Prohibit use of constructors for side-effects. + "plusplus" : false, // Prohibit use of `++` & `--`. + "regexp" : false, // Prohibit `.` and `[^...]` in regular expressions. + "undef" : true, // Require all non-global variables be declared before they are used. + "strict" : true, // Require `use strict` pragma in every file. + "trailing" : true, // Prohibit trailing whitespaces. + "asi" : false, // Tolerate Automatic Semicolon Insertion (no semicolons). + "boss" : false, // Tolerate assignments inside if, for & while. Usually conditions & loops are for comparison, not assignments. + "debug" : false, // Allow debugger statements e.g. browser breakpoints. + "eqnull" : false, // Tolerate use of `== null`. + "es5" : false, // Allow EcmaScript 5 syntax. + "esnext" : false, // Allow ES.next specific features such as `const` and `let`. + "evil" : false, // Tolerate use of `eval`. + "expr" : false, // Tolerate `ExpressionStatement` as Programs. + "funcscope" : false, // Tolerate declarations of variables inside of control structures while accessing them later from the outside. + "globalstrict" : false, // Allow global "use strict" (also enables 'strict'). + "iterator" : false, // Allow usage of __iterator__ property. + "lastsemic" : false, // Tolerate missing semicolons when it is omitted for the last statement in a one-line block. + "laxbreak" : false, // Tolerate unsafe line breaks e.g. `return [\n] x` without semicolons. + "laxcomma" : false, // Suppress warnings about comma-first coding style. + "loopfunc" : false, // Allow functions to be defined within loops. + "multistr" : false, // Tolerate multi-line strings. + "onecase" : false, // Tolerate switches with just one case. + "proto" : false, // Tolerate __proto__ property. This property is deprecated. + "regexdash" : false, // Tolerate unescaped last dash i.e. `[-...]`. + "scripturl" : false, // Tolerate script-targeted URLs. + "smarttabs" : false, // Tolerate mixed tabs and spaces when the latter are used for alignmnent only. + "shadow" : false, // Allows re-define variables later in code e.g. `var x=1; x=2;`. + "sub" : false, // Tolerate all forms of subscript notation besides dot notation e.g. `dict['key']` instead of `dict.key`. + "supernew" : true, // Tolerate `new function () { ... };` and `new Object;`. + "validthis" : false, // Tolerate strict violations when the code is running in strict mode and you use this in a non-constructor function. + "browser" : true, // Standard browser globals e.g. `window`, `document`. + "couch" : false, // Enable globals exposed by CouchDB. + "devel" : false, // Allow development statements e.g. `console.log();`. + "dojo" : false, // Enable globals exposed by Dojo Toolkit. + "jquery" : true, // Enable globals exposed by jQuery JavaScript library. + "mootools" : false, // Enable globals exposed by MooTools JavaScript framework. + "node" : false, // Enable globals available when code is running inside of the NodeJS runtime environment. + "nonstandard" : false, // Define non-standard but widely adopted globals such as escape and unescape. + "prototypejs" : false, // Enable globals exposed by Prototype JavaScript framework. + "rhino" : false, // Enable globals available when your code is running inside of the Rhino runtime environment. + "wsh" : false, // Enable globals available when your code is running as a script for the Windows Script Host. + "nomen" : false, // Prohibit use of initial or trailing underbars in names. + "onevar" : false, // Allow only one `var` statement per function. + "passfail" : false, // Stop on first error. + "white" : false, // Check against strict whitespace and indentation rules. + "maxerr" : 100, // Maximum errors before stopping. + "predef" : [], // Extra globals. + "indent" : 4 // Specify indentation spacing +} \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..f686519 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,31 @@ +language: + - php + - node_js + +php: + - 5.3 + - 5.4 + +node_js: + - 0.10 + +env: + - WP_VERSION=master WP_MULTISITE=0 + - WP_VERSION=master WP_MULTISITE=1 + - WP_VERSION=3.6.1 WP_MULTISITE=0 + - WP_VERSION=3.6.1 WP_MULTISITE=1 + +before_script: + - export WP_TESTS_DIR=/tmp/wordpress-tests/ + - if [ -e phpunit.xml ]; then bash bin/install-wp-tests.sh wordpress_test root '' $WP_VERSION; fi + - pear config-set auto_discover 1 + - pear install PHP_CodeSniffer + - git clone git://github.com/WordPress-Coding-Standards/WordPress-Coding-Standards.git $(pear config-get php_dir)/PHP/CodeSniffer/Standards/WordPress + - phpenv rehash + - npm install -g jshint + +script: + - find . \( -name '*.php' -o -name '*.inc' \) -exec php -lf {} \; + - if [ -e phpunit.xml ] || [ -e phpunit.xml.dist ]; then phpunit; fi + - phpcs --standard=$(if [ -e ruleset.xml ]; then echo ruleset.xml; else echo WordPress; fi) $(find . -name '*.php') + - jshint . diff --git a/class-wordpress-readme-parser.php b/class-wordpress-readme-parser.php index 6918dd7..08e121d 100644 --- a/class-wordpress-readme-parser.php +++ b/class-wordpress-readme-parser.php @@ -19,7 +19,7 @@ class WordPress_Readme_Parser { function __construct( $args = array() ) { $args = array_merge( get_object_vars( $this ), $args ); - foreach ($args as $key => $value) { + foreach ( $args as $key => $value ) { $this->$key = $value; } @@ -37,9 +37,11 @@ function __construct( $args = array() ) { $this->short_description = $matches[3]; $readme_txt_rest = $matches[4]; $this->metadata = array_fill_keys( array( 'Contributors', 'Tags', 'Requires at least', 'Tested up to', 'Stable tag', 'License', 'License URI' ), null ); - foreach( explode( "\n", $matches[2] ) as $metadatum ) { - preg_match( '/^(.+?):\s+(.+)$/', $metadatum, $metadataum_matches ) || \WP_CLI::error( "Parse error in $metadatum" ); - list( $name, $value ) = array_slice( $metadataum_matches, 1, 2 ); + foreach ( explode( "\n", $matches[2] ) as $metadatum ) { + if ( ! preg_match( '/^(.+?):\s+(.+)$/', $metadatum, $metadataum_matches ) ) { + throw new \Exception( "Parse error in $metadatum" ); + } + list( $name, $value ) = array_slice( $metadataum_matches, 1, 2 ); $this->metadata[$name] = $value; } $this->metadata['Contributors'] = preg_split( '/\s*,\s*/', $this->metadata['Contributors'] ); @@ -52,8 +54,8 @@ function __construct( $args = array() ) { foreach ( $section_matches as $section_match ) { array_shift( $section_match ); - $heading = array_shift( $section_match ); - $body = trim( array_shift( $section_match ) ); + $heading = array_shift( $section_match ); + $body = trim( array_shift( $section_match ) ); $subsections = array(); // @todo Parse out front matter /(.+?)(\n=\s+.+$)/s @@ -76,6 +78,7 @@ function __construct( $args = array() ) { /** * Convert the parsed readme.txt into Markdown + * @param array|string [$params] * @return string */ function to_markdown( $params = array() ) { @@ -91,10 +94,12 @@ function to_markdown( $params = array() ) { 'Screenshots' => function ( $body ) { $body = trim( $body ); $new_body = ''; - $screenshots = array(); - preg_match_all( '/^\d+\. (.+?)$/m', $body, $screenshot_matches, PREG_SET_ORDER ) || \WP_CLI::error( 'Malformed screenshot section' ); + if ( ! preg_match_all( '/^\d+\. (.+?)$/m', $body, $screenshot_matches, PREG_SET_ORDER ) ) { + throw new Exception( 'Malformed screenshot section' ); + } foreach ( $screenshot_matches as $i => $screenshot_match ) { - foreach ( array( 'jpg', 'gif', 'png' ) as $ext ) { + $img_extensions = array( 'jpg', 'gif', 'png' ); + foreach ( $img_extensions as $ext ) { $filepath = sprintf( 'assets/screenshot-%d.%s', $i + 1, $ext ); if ( file_exists( dirname( $this->path ) . DIRECTORY_SEPARATOR . $filepath ) ) { break; @@ -119,20 +124,26 @@ function to_markdown( $params = array() ) { // Format metadata $formatted_metadata = $this->metadata; - $formatted_metadata['Contributors'] = join(', ', array_map( - function ( $contributor ) { - $contributor = strtolower( $contributor ); - // @todo Map to GitHub account - return sprintf( '[%1$s](http://profiles.wordpress.org/%1$s)', $contributor ); - }, - $this->metadata['Contributors'] - )); - $formatted_metadata['Tags'] = join(', ', array_map( - function ( $tag ) { - return sprintf( '[%1$s](http://wordpress.org/plugins/tags/%1$s)', $tag ); - }, - $this->metadata['Tags'] - )); + $formatted_metadata['Contributors'] = join( + ', ', + array_map( + function ( $contributor ) { + $contributor = strtolower( $contributor ); + // @todo Map to GitHub account + return sprintf( '[%1$s](http://profiles.wordpress.org/%1$s)', $contributor ); + }, + $this->metadata['Contributors'] + ) + ); + $formatted_metadata['Tags'] = join( + ', ', + array_map( + function ( $tag ) { + return sprintf( '[%1$s](http://wordpress.org/plugins/tags/%1$s)', $tag ); + }, + $this->metadata['Tags'] + ) + ); $formatted_metadata['License'] = sprintf( '[%s](%s)', $formatted_metadata['License'], $formatted_metadata['License URI'] ); unset( $formatted_metadata['License URI'] ); if ( $this->metadata['Stable tag'] === 'trunk' ) { @@ -140,7 +151,7 @@ function ( $tag ) { } // Render metadata - $markdown = "\n"; + $markdown = "\n"; $markdown .= sprintf( "# %s\n", $this->title ); $markdown .= "\n"; if ( file_exists( 'assets/banner-1544x500.png' ) ) { @@ -160,7 +171,7 @@ function ( $tag ) { $body = $section['body']; if ( isset( $section_formatters[$section['heading']] ) ) { - $body = trim(call_user_func( $section_formatters[$section['heading']], $body )); + $body = trim( call_user_func( $section_formatters[$section['heading']], $body ) ); } if ( $body ) { $markdown .= sprintf( "%s\n", $body ); diff --git a/pre-commit b/pre-commit index 17d9685..630c0a2 100755 --- a/pre-commit +++ b/pre-commit @@ -1,27 +1,74 @@ #!/bin/sh -# An example pre-commit hook for WordPress +# WordPress Plugin pre-commit hook set -e +message="Checking staged changes..." +git_status_egrep='^[MARC].+' + +for i; do + case "$i" + in + -m) + message="Checking any uncommitted changes..." + git_status_egrep='^.?[MARC].+' + shift;; + esac +done + +echo $message + +# Check for staged JS files +IFS=$'\n' staged_js_files=( $(git status --porcelain | egrep $git_status_egrep'\.js$' | cut -c4-) ) +if [ ${#staged_js_files[@]} != 0 ]; then + # JSHint + if [ -e .jshintrc ]; then + echo "## jslint" + if command -v jshint >/dev/null 2>&1; then + jshint "${staged_js_files[@]}" + else + echo "Skipping jshint since not installed" + fi + fi + +fi + +# Check for staged PHP files +IFS=$'\n' staged_php_files=( $(git status --porcelain | egrep $git_status_egrep'\.php$' | cut -c4-) ) +if [ ${#staged_php_files[@]} != 0 ]; then + # PHP Syntax Check + for php_file in "${staged_php_files[@]}"; do + php -lf $php_file + done + + # PHPUnit + if [ -e phpunit.xml ] || [ -e phpunit.xml.dist ]; then + echo "## phpunit" + if [ "$USER" != 'vagrant' ] && command -v vagrant >/dev/null 2>&1 && command -v vassh >/dev/null 2>&1; then + echo "Running phpunit in vagrant..." + vassh phpunit + elif ! command -v phpunit >/dev/null 2>&1;then + echo "Skipping phpunit since not installed" + elif [ -z "$WP_TESTS_DIR" ]; then + echo "Skipping phpunit since WP_TESTS_DIR env missing" + else + phpunit + fi + fi + + # PHP_CodeSniffer WordPress Coding Standards + echo "## phpcs" + if command -v jshint >/dev/null 2>&1; then + phpcs_standard=$(if [ -e ruleset.xml ]; then echo ruleset.xml; else echo WordPress; fi) + phpcs -p -s -v --standard=$phpcs_standard "${staged_php_files[@]}" + else + echo "Skipping phpcs since not installed" + fi +fi + # Make sure the readme.md never gets out of sync with the readme.txt generate_markdown_readme=$(find . -name generate-markdown-readme -print -quit) if [ -n "$generate_markdown_readme" ]; then markdown_readme_path=$($generate_markdown_readme) git add $markdown_readme_path fi - -if [ -e phpunit.xml.dist ]; then - # @todo Check to see if phpunit is even installed - # @todo Check if WP_TESTS_DIR is not set - phpunit -fi - -if [ -e .jshintrc ]; then - # @todo Check to see if jshint is even installed - jshint -fi - -# Run through PHP_CodeSniffer rules for WordPress Coding Standards -# @todo Check if phpcs is installed -# @todo Check if WordPress standard sniffs are installed -phpcs -p -s -v --standard=WordPress $(git status --porcelain | egrep '^[MARC]' | cut -c4- | egrep '.php$') diff --git a/readme.md b/readme.md index 9d48e48..5015dff 100644 --- a/readme.md +++ b/readme.md @@ -5,9 +5,21 @@ wp-plugin-dev-lib It is intended that this repo be included in plugin repo via git-subtree/submodule in a `bin/` directory. -Symlink to `pre-commit` from your project's `.git/hooks/pre-commit` +Symlink to the `.travis.yml` and `.jshintrc` inside of the same directory: -Includes a WordPress README [parser](class-wordpress-readme-parser.php) and [converter](generate-markdown-readme) to Markdown, +```bash +ln -s bin/.travis.yml . && git add .travis.yml +ln -s bin/.jshintrc . && git add .jshintrc +``` + +Symlink to `pre-commit` from your project's `.git/hooks/pre-commit`: + +```bash +cd .git/hooks +ln -s ../../bin/pre-commit . +``` + +The library includes a WordPress README [parser](class-wordpress-readme-parser.php) and [converter](generate-markdown-readme) to Markdown, so you don't have to manually keep your `readme.txt` on WordPress.org in sync with the `readme.md` you have on GitHub. The converter will also automatically recognize the presence of projects with Travis CI and include the status image in the markdown. Screenshots and banner images for WordPress.org are also automatically incorporated into the `readme.md`. From 8c7cb6ef44753498423ff7e274821d42756dc600 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Sun, 13 Oct 2013 23:25:38 -0700 Subject: [PATCH 05/16] Add travis, jshint, and phpcs ruleset --- .jshintrc | 1 + .travis.yml | 1 + readme.md | 2 ++ ruleset.xml | 8 ++++++++ 4 files changed, 12 insertions(+) create mode 120000 .jshintrc create mode 120000 .travis.yml create mode 100644 ruleset.xml diff --git a/.jshintrc b/.jshintrc new file mode 120000 index 0000000..e566925 --- /dev/null +++ b/.jshintrc @@ -0,0 +1 @@ +bin/.jshintrc \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 120000 index 0000000..948a887 --- /dev/null +++ b/.travis.yml @@ -0,0 +1 @@ +bin/.travis.yml \ No newline at end of file diff --git a/readme.md b/readme.md index b19754c..e4b4591 100644 --- a/readme.md +++ b/readme.md @@ -50,6 +50,8 @@ If you are using Nginx with the default Varying Vagrant Vagrants config, you'll log_not_found off; } +[![Build Status](https://travis-ci.org/x-team/wp-dependency-minification.png)](https://travis-ci.org/x-team/wp-dependency-minification) + ## Changelog ## ### 0.9.7 ### diff --git a/ruleset.xml b/ruleset.xml new file mode 100644 index 0000000..50eddd7 --- /dev/null +++ b/ruleset.xml @@ -0,0 +1,8 @@ + + + We want all WordPress standards but we want to exclude the vendor directories + + /minify/* + + + From 15a71391586aa47a218621466230f001ea2786c9 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Mon, 14 Oct 2013 12:18:21 +0200 Subject: [PATCH 06/16] Notices / CS fixes, Related #27 --- dependency-minification.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dependency-minification.php b/dependency-minification.php index 64bcba9..5a2b9ff 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -55,12 +55,12 @@ static function setup() { in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) ); $disabled = ( - ! empty( self::$options['disabled_on_conditions']['all'] ) - || ( !empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) - || ( !empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) - || ( !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) - && !empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) - && !empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) + ( isset( self::$options['disabled_on_conditions']['all'] ) && ! empty( self::$options['disabled_on_conditions']['all'] ) ) + || ( isset( self::$options['disabled_on_conditions']['loggedin'] ) && ! empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) + || ( ! empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) + || ( ! empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && ! empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && ! empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) ) ); @@ -534,7 +534,7 @@ static function admin_page() {

%1$s: %2$s', __( 'Dependency Minification', 'depmin' ), sprintf( @@ -217,6 +216,7 @@ static function admin_notices() { __( 'Permalinks Settings', 'depmin' ) ) ) + ) ); ?>

@@ -239,19 +239,23 @@ static function admin_notices() {

- +

@@ -296,21 +300,21 @@ static function admin_ajax_options_handler() { if ( ! current_user_can( self::$options['admin_page_capability'] ) ) { wp_die( __( 'You are not allowed to do that.', 'depmin' ) ); } - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], self::AJAX_OPTIONS_ACTION ) ) { + if ( ! wp_verify_nonce( $_POST['_wpnonce'], self::AJAX_OPTIONS_ACTION ) ) { wp_die( __( 'Nonce check failed. Try reloading the previous page.', 'depmin' ) ); } $updated_count = 0; - if ( ! empty( $_REQUEST['options'] ) ) { + if ( ! empty( $_POST['options'] ) ) { $options = get_option( 'dependency_minification_options' ); - $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_REQUEST['options']['exclude_dependencies'] ) ); - $options['disabled_on_conditions'] = $_REQUEST['options']['disabled_on_conditions']; - $options['default_exclude_remote_dependencies'] = isset( $_REQUEST['options']['default_exclude_remote_dependencies'] ); + $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_POST['options']['exclude_dependencies'] ) ); + $options['disabled_on_conditions'] = $_POST['options']['disabled_on_conditions']; + $options['default_exclude_remote_dependencies'] = isset( $_POST['options']['default_exclude_remote_dependencies'] ); update_option( 'dependency_minification_options', $options ); } - $redirect_url = add_query_arg( 'page', self::ADMIN_PAGE_SLUG, admin_url( self::ADMIN_PARENT_PAGE ) ); - $redirect_url = add_query_arg( 'updated', 1, $redirect_url ); - $redirect_url.= '#tab-settings'; + $redirect_url = add_query_arg( 'page', self::ADMIN_PAGE_SLUG, admin_url( self::ADMIN_PARENT_PAGE ) ); + $redirect_url = add_query_arg( 'updated', 1, $redirect_url ); + $redirect_url .= '#tab-settings'; wp_redirect( $redirect_url ); die(); @@ -335,7 +339,7 @@ static function admin_page() { $nonce = wp_create_nonce( self::AJAX_ACTION ); ?>
-

+

@@ -352,7 +356,7 @@ static function admin_page() { $option_names = $wpdb->get_col( $sql ); $minified_dependencies = array(); foreach ( $option_names as $option_name ) { - $minified_dependencies[$option_name] = get_option($option_name); + $minified_dependencies[$option_name] = get_option( $option_name ); } $minified_dependencies = array_filter( $minified_dependencies ); @@ -428,10 +432,10 @@ static function admin_page() { 'depmin_option_name[]' => $option_name, ); ?> - + - - > + + > @@ -475,7 +479,7 @@ static function admin_page() { - + column-"> - + @@ -534,7 +538,7 @@ static function admin_page() { $nonce = wp_create_nonce( self::AJAX_OPTIONS_ACTION ); ?>
-
+ @@ -544,7 +548,7 @@ static function admin_page() { @@ -553,7 +557,7 @@ static function admin_page() { @@ -562,15 +566,15 @@ static function admin_page() {
@@ -619,12 +623,15 @@ static function get_dependency_minified_url( array $deps, $type ) { $src_hash = self::hash_array( wp_list_pluck( $deps, 'src' ) ); $ver_hash = self::hash_array( wp_list_pluck( $deps, 'ver' ) ); $src = trailingslashit( home_url( self::$options['endpoint'] ) ); - $src .= join( '.', array( - join( ',', wp_list_pluck( $deps, 'handle' ) ), - $src_hash, - $ver_hash, - $type === 'scripts' ? 'js' : 'css', - ) ); + $src .= join( + '.', + array( + join( ',', wp_list_pluck( $deps, 'handle' ) ), + $src_hash, + $ver_hash, + $type === 'scripts' ? 'js' : 'css', + ) + ); return $src; } @@ -635,10 +642,10 @@ static function get_dependency_minified_url( array $deps, $type ) { * @param {string} $type (scripts|styles) */ static function filter_print_dependency_array( array $handles, $type ) { - assert( in_array($type, array( 'scripts', 'styles' ) ) ); - assert( isset($GLOBALS["wp_{$type}"]) ); + assert( in_array( $type, array( 'scripts', 'styles' ) ) ); + assert( isset( $GLOBALS["wp_{$type}"] ) ); $wp_deps = &$GLOBALS["wp_{$type}"]; - assert( is_a($wp_deps, 'WP_Dependencies') ); + assert( is_a( $wp_deps, 'WP_Dependencies' ) ); /** * Determine if minification is enabled for the provided $handles. @@ -667,7 +674,7 @@ static function filter_print_dependency_array( array $handles, $type ) { ( $wp_deps->groups[$handle] < $current_group && - !in_array($handle, $wp_deps->done) + ! in_array( $handle, $wp_deps->done ) ) ); @@ -766,13 +773,13 @@ static function filter_print_dependency_array( array $handles, $type ) { $filtered_handles = array_merge( $filtered_handles, $group['handles'] ); } else { self::$minified_count += 1; - $new_handle = sprintf('minified-%d', self::$minified_count); + $new_handle = sprintf( 'minified-%d', self::$minified_count ); $filtered_handles[] = $new_handle; $src = self::get_dependency_minified_url( $deps, $type ); // Deps are registered without versions since the URL includes the version (ver_hash) if ( 'scripts' === $type ) { - $in_footer = !empty( $extra['group'] ); // @todo what if the group is not 0 or 1? + $in_footer = ! empty( $extra['group'] ); // @todo what if the group is not 0 or 1? wp_register_script( $new_handle, $src, array(), null, $in_footer ); } elseif ( 'styles' === $type ) { wp_register_style( $new_handle, $src, array(), null, $extra['media'] ); @@ -830,7 +837,7 @@ static function is_self_hosted_src( $src ) { ( empty( $parsed_url['host'] ) && - substr( $parsed_url['path'], 0, 1) === '/' + substr( $parsed_url['path'], 0, 1 ) === '/' ) || ( @@ -861,7 +868,7 @@ static function group_dependencies_by_exclusion( $handles, WP_Dependencies $wp_d foreach ( $handles as $handle ) { $src = $wp_deps->registered[$handle]->src; $is_local = self::is_self_hosted_src( $src ); - $is_excluded = !$is_local && self::$options['default_exclude_remote_dependencies']; + $is_excluded = ! $is_local && self::$options['default_exclude_remote_dependencies']; $is_excluded = $is_excluded || self::is_url_included( $src, self::$options['exclude_dependencies'] ); $is_excluded = apply_filters( 'dependency_minification_excluded', $is_excluded, $handle, $src ); @@ -905,8 +912,8 @@ static function group_handles_by_extra( array $handles, WP_Dependencies $wp_deps foreach ( $handles as $handle ) { $dep = &$wp_deps->registered[$handle]; $extra = (array) $dep->extra; - if ( is_a($wp_deps, 'WP_Styles') ) { - $extra['media'] = is_string($dep->args) ? $dep->args : 'all'; + if ( is_a( $wp_deps, 'WP_Styles' ) ) { + $extra['media'] = is_string( $dep->args ) ? $dep->args : 'all'; } unset($extra['suffix']); unset($extra['rtl']); @@ -915,8 +922,8 @@ static function group_handles_by_extra( array $handles, WP_Dependencies $wp_deps if ( is_a( $wp_deps, 'WP_Scripts' ) && empty( $extra['group'] ) && is_int( $dep->args ) ) { $extra['group'] = $dep->args; } - ksort($extra); - $key = serialize($extra); + ksort( $extra ); + $key = serialize( $extra ); $bundles[$key][] = $handle; } return $bundles; @@ -936,10 +943,10 @@ static function minify( $cached ) { try { $is_css = ( 'styles' === $type ); if ( 'scripts' === $type ) { - require_once( dirname(__FILE__) . '/minify/JS/JSMin.php' ); + require_once( dirname( __FILE__ ) . '/minify/JS/JSMin.php' ); } elseif ( 'styles' === $type ) { - require_once( dirname(__FILE__) . '/minify/CSS/UriRewriter.php' ); - require_once( dirname(__FILE__) . '/minify/CSS/Compressor.php' ); + require_once( dirname( __FILE__ ) . '/minify/CSS/UriRewriter.php' ); + require_once( dirname( __FILE__ ) . '/minify/CSS/Compressor.php' ); } $unminified_size = 0; @@ -965,17 +972,17 @@ static function minify( $cached ) { // Dependency is not self-hosted or it the filesystem read failed, so do HTTP request if ( false === $contents ) { $r = wp_remote_get( $src ); - if ( is_wp_error($r) ) { - throw new Exception("Failed to retrieve $src: " . $r->get_error_message()); + if ( is_wp_error( $r ) ) { + throw new Exception( "Failed to retrieve $src: " . $r->get_error_message() ); } elseif ( intval( wp_remote_retrieve_response_code( $r ) ) !== 200 ) { - throw new Dependency_Minification_Exception( sprintf('Request for %s returned with HTTP %d %s', $src, wp_remote_retrieve_response_code( $r ), wp_remote_retrieve_response_message( $r )) ); + throw new Dependency_Minification_Exception( sprintf( 'Request for %s returned with HTTP %d %s', $src, wp_remote_retrieve_response_code( $r ), wp_remote_retrieve_response_message( $r ) ) ); } $contents = wp_remote_retrieve_body( $r ); } $unminified_size += strlen( $contents ); // Remove the BOM - $contents = preg_replace("/^\xEF\xBB\xBF/", '', $contents); + $contents = preg_replace( "/^\xEF\xBB\xBF/", '', $contents ); // Rewrite relative paths in CSS $src_dir_path = dirname( parse_url( $src, PHP_URL_PATH ) ); @@ -989,13 +996,13 @@ static function minify( $cached ) { $contents = ''; // Print a manifest of the dependencies - $contents .= sprintf("/*! This minified dependency bundle includes:\n"); + $contents .= sprintf( "/*! This minified dependency bundle includes:\n" ); $i = 0; foreach ( $srcs as $src ) { $i += 1; $contents .= sprintf( " * %02d. %s\n", $i, $src ); } - $contents .= sprintf(" */\n\n"); + $contents .= sprintf( " */\n\n" ); // Minify // Note: semicolon needed in case a file lacks trailing semicolon @@ -1006,13 +1013,13 @@ static function minify( $cached ) { // is the comment-reply.js in WordPress. if ( 'scripts' === $type ) { $minified_contents = join( "\n;;\n", $contents_for_each_dep ); - $minified_contents = JSMin::minify($minified_contents); + $minified_contents = JSMin::minify( $minified_contents ); if ( false === $minified_contents ) { throw new Dependency_Minification_Exception( 'JavaScript parse error' ); } } elseif ( 'styles' === $type ) { $minified_contents = join( "\n\n", $contents_for_each_dep ); - $minified_contents = Minify_CSS_Compressor::process($minified_contents); + $minified_contents = Minify_CSS_Compressor::process( $minified_contents ); } $contents .= $minified_contents; @@ -1023,12 +1030,15 @@ static function minify( $cached ) { $cached['error'] = null; } catch (Exception $e) { - error_log( sprintf( '%s in %s: %s for srcs %s', - get_class( $e ), - __FUNCTION__, - $e->getMessage(), - join( ',', $srcs ) - ) ); + error_log( + sprintf( + '%s in %s: %s for srcs %s', + get_class( $e ), + __FUNCTION__, + $e->getMessage(), + join( ',', $srcs ) + ) + ); $cached['error'] = $e->getMessage(); $max_age = apply_filters( 'dependency_minification_cache_control_max_age_error', (int) self::$options['cache_control_max_age_error'], $srcs ); $cached['expires'] = time() + $max_age; @@ -1064,7 +1074,7 @@ static function handle_request() { } $cache_option_name = self::get_cache_option_name( $src_hash ); - $cached = get_option($cache_option_name); + $cached = get_option( $cache_option_name ); if ( empty( $cached ) ) { throw new Dependency_Minification_Exception( 'Unknown minified dependency bundle.', 404 ); } @@ -1073,9 +1083,9 @@ static function handle_request() { } // Send the response headers for caching - header( 'Expires: ' . str_replace('+0000', 'GMT', gmdate('r', $cached['expires'])) ); + header( 'Expires: ' . str_replace( '+0000', 'GMT', gmdate( 'r', $cached['expires'] ) ) ); if ( ! empty( $cached['last_modified'] ) ) { - header( 'Last-Modified: ' . str_replace('+0000', 'GMT', gmdate('r', $cached['last_modified'])) ); + header( 'Last-Modified: ' . str_replace( '+0000', 'GMT', gmdate( 'r', $cached['last_modified'] ) ) ); } if ( ! empty( $cached['etag'] ) ) { header( 'ETag: ' . $cached['etag'] ); @@ -1103,24 +1113,24 @@ static function handle_request() { } if ( $is_not_modified ) { - status_header(304); + status_header( 304 ); } else { - status_header(200); + status_header( 200 ); $out = $cached['contents']; global $compress_scripts, $compress_css; script_concat_settings(); $compress = ( 'js' === $ext ? $compress_scripts : $compress_css ); - $force_gzip = ( $compress && defined('ENFORCE_GZIP') && ENFORCE_GZIP ); + $force_gzip = ( $compress && defined( 'ENFORCE_GZIP' ) && ENFORCE_GZIP ); // Copied from /wp-admin/load-scripts.php - if ( $compress && ! ini_get('zlib.output_compression') && 'ob_gzhandler' != ini_get('output_handler') && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) { - header('Vary: Accept-Encoding'); // Handle proxies - if ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) { - header('Content-Encoding: deflate'); + if ( $compress && ! ini_get( 'zlib.output_compression' ) && 'ob_gzhandler' != ini_get( 'output_handler' ) && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) { + header( 'Vary: Accept-Encoding' ); // Handle proxies + if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) { + header( 'Content-Encoding: deflate' ); $out = gzdeflate( $out, 3 ); - } elseif ( false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) { - header('Content-Encoding: gzip'); + } elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) { + header( 'Content-Encoding: gzip' ); $out = gzencode( $out, 3 ); } } @@ -1137,7 +1147,14 @@ static function handle_request() { $status = $e->getCode(); $message = $e->getMessage(); } else { - error_log( sprintf('%s: %s via URI %s', __METHOD__, $e->getMessage(), esc_url_raw( $_SERVER['REQUEST_URI'] )) ); + error_log( + sprintf( + '%s: %s via URI %s', + __METHOD__, + $e->getMessage(), + esc_url_raw( $_SERVER['REQUEST_URI'] ) + ) + ); $message = 'Unexpected error occurred.'; } if ( empty($status) ) { From 4f1449c62f58f3f846f4923e3abadc494a568c47 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Wed, 16 Oct 2013 17:21:47 +0200 Subject: [PATCH 09/16] Fix notices on settings screen on first install. --- dependency-minification.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dependency-minification.php b/dependency-minification.php index be045ff..5b154e6 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -60,7 +60,12 @@ static function setup() { 'show_error_messages' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ), 'disable_if_wp_debug' => true, 'exclude_dependencies' => array(), - 'disabled_on_conditions' => array(), + 'disabled_on_conditions' => array( + 'all' => false, + 'loggedin' => false, + 'admin' => false, + 'queryvar' => false, + ), ); $options = get_option( 'dependency_minification_options', array() ); self::$options = apply_filters( From a18558f2df1f43ef92f412a1b5b562724b376cb7 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Wed, 16 Oct 2013 20:16:07 +0200 Subject: [PATCH 10/16] Remove faulty esc_html --- dependency-minification.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dependency-minification.php b/dependency-minification.php index 5b154e6..e8bc78e 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -209,8 +209,7 @@ static function admin_notices() { ?>

%1$s: %2$s', __( 'Dependency Minification', 'depmin' ), sprintf( @@ -221,8 +220,7 @@ static function admin_notices() { __( 'Permalinks Settings', 'depmin' ) ) ) - ) - ); + ); // xss ok ?>

Date: Wed, 30 Oct 2013 12:04:14 -0700 Subject: [PATCH 11/16] Fix some phpdoc comments --- dependency-minification.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dependency-minification.php b/dependency-minification.php index 8aa2c37..3d15c1c 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -641,8 +641,9 @@ static function get_dependency_minified_url( array $deps, $type ) { /** * Separate external from internal (local) dependencies and then group the * internal resources into maximal groups. - * @param {array} $handles - * @param {string} $type (scripts|styles) + * @param array $handles + * @param string $type (scripts|styles) + * @return array */ static function filter_print_dependency_array( array $handles, $type ) { assert( in_array( $type, array( 'scripts', 'styles' ) ) ); @@ -861,7 +862,9 @@ static function is_url_included( $needle, $haystack ) { } /** - * @return {array} Two members, the 1st containing external handles and the 2nd containing internal handles + * @param array $handles + * @param WP_Dependencies $wp_deps + * @return array Two members, the 1st containing external handles and the 2nd containing internal handles */ static function group_dependencies_by_exclusion( $handles, WP_Dependencies $wp_deps ) { $groups = array(); @@ -907,8 +910,9 @@ static function group_dependencies_by_exclusion( $handles, WP_Dependencies $wp_d /** * @todo This is only applicable for styles, right? The media and conditional extras. - * @param {array} $handles - * @return {array} Associative array where the keys are the args and extras + * @param array $handles + * @param WP_Dependencies $wp_deps + * @return array Associative array where the keys are the args and extras */ static function group_handles_by_extra( array $handles, WP_Dependencies $wp_deps ) { $bundles = array(); From ef17d91f4e3223996713b772e2cd7b4a2a20107a Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Mon, 4 Nov 2013 03:06:38 +0200 Subject: [PATCH 12/16] Fix small CS issues --- dependency-minification.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dependency-minification.php b/dependency-minification.php index 3d15c1c..d60383b 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -236,8 +236,8 @@ static function admin_notices() { return; } - $updated_count = intval( $_REQUEST['updated-count'] ); - $updated_task = sanitize_title( $_REQUEST['updated-action'] ); + $updated_count = intval( $_GET['updated-count'] ); + $updated_task = esc_attr( $_GET['updated-action'] ); ?>
@@ -272,7 +272,7 @@ static function admin_ajax_handler() { if ( ! current_user_can( self::$options['admin_page_capability'] ) ) { wp_die( __( 'You are not allowed to do that.', 'dependency-minification' ) ); } - if ( ! wp_verify_nonce( $_REQUEST['_wpnonce'], self::AJAX_ACTION ) ) { + if ( ! isset( $_REQUEST['_wpnonce'] ) || ! wp_verify_nonce( $_REQUEST['_wpnonce'], self::AJAX_ACTION ) ) { wp_die( __( 'Nonce check failed. Try reloading the previous page.', 'dependency-minification' ) ); } $updated_count = 0; @@ -291,7 +291,7 @@ static function admin_ajax_handler() { $redirect_url = add_query_arg( 'page', self::ADMIN_PAGE_SLUG, admin_url( self::ADMIN_PARENT_PAGE ) ); $redirect_url = add_query_arg( 'updated-count', $updated_count, $redirect_url ); - $redirect_url = add_query_arg( 'updated-action', $_REQUEST['depmin_task'], $redirect_url ); + $redirect_url = add_query_arg( 'updated-action', esc_attr( $_REQUEST['depmin_task'] ), $redirect_url ); wp_redirect( $redirect_url ); exit; } @@ -303,14 +303,16 @@ static function admin_ajax_options_handler() { if ( ! current_user_can( self::$options['admin_page_capability'] ) ) { wp_die( __( 'You are not allowed to do that.', 'dependency-minification' ) ); } - if ( ! wp_verify_nonce( $_POST['_wpnonce'], self::AJAX_OPTIONS_ACTION ) ) { + if ( ! isset( $_POST['_wpnonce']) || ! wp_verify_nonce( $_POST['_wpnonce'], self::AJAX_OPTIONS_ACTION ) ) { wp_die( __( 'Nonce check failed. Try reloading the previous page.', 'dependency-minification' ) ); } $updated_count = 0; if ( ! empty( $_POST['options'] ) ) { $options = get_option( 'dependency_minification_options' ); - $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", $_POST['options']['exclude_dependencies'] ) ); - $options['disabled_on_conditions'] = $_POST['options']['disabled_on_conditions']; + $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", esc_attr( $_POST['options']['exclude_dependencies'] ) ) ); + $options['disabled_on_conditions'] = ( isset( $_POST['options']['disabled_on_conditions'] ) ) + ? $_POST['options']['disabled_on_conditions'] + : array(); $options['default_exclude_remote_dependencies'] = isset( $_POST['options']['default_exclude_remote_dependencies'] ); update_option( 'dependency_minification_options', $options ); } From 910bb6a6b18b12d8ff08aaf13eb1a3e8e948ddf4 Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Tue, 5 Nov 2013 18:18:46 +0200 Subject: [PATCH 13/16] Change esc_attr to esc_html --- dependency-minification.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-minification.php b/dependency-minification.php index d60383b..58e5186 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -237,7 +237,7 @@ static function admin_notices() { } $updated_count = intval( $_GET['updated-count'] ); - $updated_task = esc_attr( $_GET['updated-action'] ); + $updated_task = esc_html( $_GET['updated-action'] ); ?>
From 5980d283b46bdd119f070e4bce1e833fbb725d9f Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Tue, 5 Nov 2013 18:25:01 +0200 Subject: [PATCH 14/16] Skip escaping args inside of add_query_arg, since it does escaping already --- dependency-minification.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-minification.php b/dependency-minification.php index 58e5186..4c94343 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -291,7 +291,7 @@ static function admin_ajax_handler() { $redirect_url = add_query_arg( 'page', self::ADMIN_PAGE_SLUG, admin_url( self::ADMIN_PARENT_PAGE ) ); $redirect_url = add_query_arg( 'updated-count', $updated_count, $redirect_url ); - $redirect_url = add_query_arg( 'updated-action', esc_attr( $_REQUEST['depmin_task'] ), $redirect_url ); + $redirect_url = add_query_arg( 'updated-action', $_REQUEST['depmin_task'], $redirect_url ); wp_redirect( $redirect_url ); exit; } From 41cb811161f06312a2112ba3ca3805d9f4e88f2d Mon Sep 17 00:00:00 2001 From: Shady Sharaf Date: Tue, 5 Nov 2013 18:32:05 +0200 Subject: [PATCH 15/16] Better sanitizing input var --- dependency-minification.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependency-minification.php b/dependency-minification.php index 4c94343..cbaabe3 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -237,7 +237,7 @@ static function admin_notices() { } $updated_count = intval( $_GET['updated-count'] ); - $updated_task = esc_html( $_GET['updated-action'] ); + $updated_task = filter_input( INPUT_GET, 'updated-action' ); ?>
From d0e06cf0a88e35398f723c3b44fbe10b92d23ef4 Mon Sep 17 00:00:00 2001 From: Nashwan Doaqan Date: Wed, 13 Nov 2013 17:07:14 +0300 Subject: [PATCH 16/16] Re-orginze the plugin as instantiated classes - first commit --- dependency-minification.php | 1248 +++++------------------------------ inc/admin.php | 596 +++++++++++++++++ inc/cache.php | 271 ++++++++ inc/collation.php | 347 ++++++++++ inc/handler.php | 132 ++++ inc/helpers.php | 220 ++++++ inc/minifier.php | 361 ++++++++++ inc/options.php | 84 +++ 8 files changed, 2194 insertions(+), 1065 deletions(-) create mode 100644 inc/admin.php create mode 100644 inc/cache.php create mode 100644 inc/collation.php create mode 100644 inc/handler.php create mode 100644 inc/helpers.php create mode 100644 inc/minifier.php create mode 100644 inc/options.php diff --git a/dependency-minification.php b/dependency-minification.php index cbaabe3..7f4ae98 100644 --- a/dependency-minification.php +++ b/dependency-minification.php @@ -2,7 +2,7 @@ /** * Plugin Name: Dependency Minification * Description: Concatenates and minifies scripts and stylesheets. Please install and activate scribu's Proper Network Activation plugin before activating this plugin network-wide. - * Version: 0.9.7 + * Version: 1.0 * Author: X-Team * Author URI: http://x-team.com/wordpress/ * Text Domain: dependency-minification @@ -28,1159 +28,277 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -class Dependency_Minification { - static $options = array(); - protected static $minified_count = 0; - static $admin_page_hook; - - const DEFAULT_ENDPOINT = '_minify'; - const CRON_MINIFY_ACTION = 'minify_dependencies'; - const CACHE_KEY_PREFIX = 'depmin_cache_'; - const FILENAME_PATTERN = '([^/]+?)\.([0-9a-f]+)(?:\.([0-9a-f]+))?\.(css|js)'; - const AJAX_ACTION = 'dependency_minification'; - const AJAX_OPTIONS_ACTION = 'dependency_minification_options'; - const ADMIN_PAGE_SLUG = 'dependency-minification'; - const ADMIN_PARENT_PAGE = 'tools.php'; - - static $query_vars = array( - 'depmin_handles', - 'depmin_src_hash', - 'depmin_ver_hash', - 'depmin_file_ext', - ); - - static function setup() { - $defaults = array( - 'endpoint' => self::DEFAULT_ENDPOINT, - 'default_exclude_remote_dependencies' => true, - 'cache_control_max_age_cache' => 2629743, // 1 month in seconds - 'cache_control_max_age_error' => 60 * 60, // 1 hour, to try minifying again - 'allow_not_modified_responses' => true, // only needs to be true if not Akamaized and max-age is short - 'admin_page_capability' => 'edit_theme_options', - 'show_error_messages' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ), - 'disable_if_wp_debug' => true, - 'exclude_dependencies' => array(), - 'disabled_on_conditions' => array( - 'all' => false, - 'loggedin' => false, - 'admin' => false, - 'queryvar' => false, - ), - ); - $options = get_option( 'dependency_minification_options', array() ); - self::$options = apply_filters( - 'dependency_minification_options', array_merge( - $defaults, - $options - ) - ); - - $is_frontend = ! ( - is_admin() - || - in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) - ); - $disabled = ( - ( isset( self::$options['disabled_on_conditions']['all'] ) && ! empty( self::$options['disabled_on_conditions']['all'] ) ) - || ( isset( self::$options['disabled_on_conditions']['loggedin'] ) && ! empty( self::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) - || ( ! empty( self::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) - || ( ! empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) - && ! empty( self::$options['disabled_on_conditions']['queryvar']['enabled'] ) - && ! empty( $_GET[ self::$options['disabled_on_conditions']['queryvar']['value'] ] ) - ) - ); - - if ( $is_frontend && ! $disabled ) { - add_filter( 'print_scripts_array', array( __CLASS__, 'filter_print_scripts_array' ) ); - add_filter( 'print_styles_array', array( __CLASS__, 'filter_print_styles_array' ) ); - } - add_action( 'init', array( __CLASS__, 'hook_rewrites' ) ); - add_action( self::CRON_MINIFY_ACTION, array( __CLASS__, 'minify' ), 10, 4 ); - add_action( 'admin_menu', array( __CLASS__, 'admin_menu' ) ); - add_action( 'admin_notices', array( __CLASS__, 'admin_notices' ) ); - add_action( 'admin_enqueue_scripts', array( __CLASS__, 'admin_enqueue_scripts' ) ); - add_action( 'wp_ajax_' . self::AJAX_ACTION, array( __CLASS__, 'admin_ajax_handler' ) ); - add_action( 'wp_ajax_' . self::AJAX_OPTIONS_ACTION, array( __CLASS__, 'admin_ajax_options_handler' ) ); - add_filter( 'plugin_action_links', array( __CLASS__, 'admin_plugin_action_links' ), 10, 2 ); - } +// Exit if accessed directly +if ( ! defined( 'ABSPATH' ) ) exit; - static function hook_rewrites() { - add_filter( 'query_vars', array( __CLASS__, 'filter_query_vars' ) ); - add_action( 'pre_get_posts', array( __CLASS__, 'handle_request' ) ); - self::add_rewrite_rule(); - } - - static function get_rewrite_regex() { - return sprintf( '^%s/%s', self::$options['endpoint'], self::FILENAME_PATTERN ); - } - - static function add_rewrite_rule() { - $regex = self::get_rewrite_regex(); - $redirect = 'index.php?'; - for ( $i = 0; $i < count( self::$query_vars ); $i += 1 ) { - $redirect .= sprintf( '%s=$matches[%d]&', self::$query_vars[$i], $i + 1 ); - } - add_rewrite_rule( $regex, $redirect, 'top' ); - } +/** + * Main Dependency Minification plugin class. + * + * @since 0.1 + */ +class Dependency_Minification { - static function remove_rewrite_rule() { - $regex = self::get_rewrite_regex(); - global $wp_rewrite; - unset( $wp_rewrite->extra_rules_top[ $regex ] ); - } + /** + * @var float + * @since 1.0 + */ + const VERSION = '1.0'; - protected static $is_footer = array( - 'scripts' => false, - 'styles' => false, - ); + /*** Properties ***********************************************************/ /** - * register_activation_hook + * @var DepMin_Admin + * @since 1.0 */ - static function activate() { - self::setup(); - self::add_rewrite_rule(); - flush_rewrite_rules(); - } + public static $admin; /** - * register_deactivation_hook + * @var DepMin_Options + * @since 1.0 */ - static function deactivate() { - self::remove_rewrite_rule(); - flush_rewrite_rules(); - } + public static $options; /** - * @filter query_vars + * @var DepMin_Handler + * @since 1.0 */ - static function filter_query_vars( $query_vars ) { - return array_merge( $query_vars, self::$query_vars ); - } + public static $handler; /** - * @filter print_styles_array + * @var DepMin_Collation + * @since 1.0 */ - static function filter_print_styles_array( $handles ) { - $handles = self::filter_print_dependency_array( $handles, 'styles' ); - return $handles; - } + public static $collation; /** - * @filter print_scripts_array + * @var array + * @since 1.0 */ - static function filter_print_scripts_array( $handles ) { - $handles = self::filter_print_dependency_array( $handles, 'scripts' ); - return $handles; - } + public static $query_vars = array( + 'depmin_handles', + 'depmin_src_hash', + 'depmin_ver_hash', + 'depmin_file_ext', + ); + + /*** Methods **************************************************************/ /** - * @action admin_enqueue_scripts + * @access private + * @return void + * @since 1.0 */ - static function admin_enqueue_scripts( $hook ) { - if ( $hook !== self::$admin_page_hook ) { - return; - } - $meta = get_plugin_data( __FILE__ ); - wp_enqueue_script( 'depmin-admin', plugin_dir_url( __FILE__ ) . 'admin.js', array( 'jquery' ), $meta['Version'] ); - wp_enqueue_style( 'depmin-admin', plugin_dir_url( __FILE__ ) . 'admin.css', array(), $meta['Version'] ); + private function load_includes() { + + // Load the helpers functions. + require self::path( 'inc/helpers.php' ); + } /** - * @action admin_menu + * @access private + * @return void + * @since 1.0 */ - static function admin_menu() { - self::$admin_page_hook = add_submenu_page( - self::ADMIN_PARENT_PAGE, - __( 'Dependency Minification', 'dependency-minification' ), - __( 'Dep. Minification', 'dependency-minification' ), - self::$options['admin_page_capability'], - self::ADMIN_PAGE_SLUG, - array( __CLASS__, 'admin_page' ) - ); + private function setup_actions() { + + DepMin_Minify::hook_cron_action(); + add_action( 'init', array( __CLASS__, 'add_rewrite_rules' ) ); + add_filter( 'query_vars', array( __CLASS__, 'filter_query_vars' ) ); + } /** - * @action admin_notices + * @access private + * @return void + * @since 1.0 */ - static function admin_notices() { - // Show a notice to notify user that pretty urls is disabled, hence the plugin won't work - if ( empty( $GLOBALS['wp_rewrite']->permalink_structure ) ) { - ?> -
-

%1$s: %2$s', - __( 'Dependency Minification', 'dependency-minification' ), - sprintf( - __( 'Pretty permalinks are not enabled in your %1$s, which is required for this plugin to operate. Select something other than Default (e.g. ?p=123)', 'dependency-minification' ), - sprintf( - '%2$s', - admin_url( 'options-permalink.php' ), - __( 'Permalinks Settings', 'dependency-minification' ) - ) - ) - ); // xss ok - ?>

-
- id !== self::$admin_page_hook ) { - return; - } - if ( empty( $_GET['updated-count'] ) ) { - return; - } - if ( empty( $_GET['updated-action'] ) ) { - return; } - $updated_count = intval( $_GET['updated-count'] ); - $updated_task = filter_input( INPUT_GET, 'updated-action' ); - ?> -
- -

- -

- -

- -
- %s', esc_url( $admin_page_url ), esc_html__( 'Settings', 'dependency-minification' ) ); - array_push( $links, $admin_page_link ); - } - return $links; - } + public static function add_rewrite_rules() { - static function admin_page() { - if ( ! current_user_can( self::$options['admin_page_capability'] ) ) { - wp_die( __( 'You cannot access this page.', 'dependency-minification' ) ); - } - $nonce = wp_create_nonce( self::AJAX_ACTION ); - ?> -
- -

-

- - -

-
- - - - - prepare( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE %s", self::CACHE_KEY_PREFIX . '%' ); - $option_names = $wpdb->get_col( $sql ); - $minified_dependencies = array(); - foreach ( $option_names as $option_name ) { - $minified_dependencies[$option_name] = get_option( $option_name ); - } - $minified_dependencies = array_filter( $minified_dependencies ); - - $minify_crons = array(); - foreach ( _get_cron_array() as $timestamp => $cron ) { - if ( isset( $cron[self::CRON_MINIFY_ACTION] ) ) { - foreach ( $cron[self::CRON_MINIFY_ACTION] as $key => $min_cron ) { - $cached = $min_cron['args'][0]; - $src_hash = self::hash_array( wp_list_pluck( $cached['deps'], 'src' ) ); - $cache_option_name = self::get_cache_option_name( $src_hash ); - if ( array_key_exists( $cache_option_name, $minified_dependencies ) ) { - $minified_dependencies[$cache_option_name] = array_merge( - $minified_dependencies[$cache_option_name], - $cached - ); - } else { - $minified_dependencies[$cache_option_name] = $cached; - } - } - } - } - ?> - - -
-

-
- - - -

- -

- -
-
- - -
-
-
- - - $tcontainer ) : ?> - <> - - - - - - - - - - > - - - - $minified_dependency ) : ?> - $deps, $type, $pending, $scheduled, $error - $handles = wp_list_pluck( $deps, 'handle' ); - $minified_src = self::get_dependency_minified_url( $deps, $type ); - $link_params = array( - '_wpnonce' => $nonce, - 'action' => self::AJAX_ACTION, - 'depmin_option_name[]' => $option_name, - ); - ?> - - - - - - - $last_modified, - 'expires' => $expires, - ); - ?> - $time ) : ?> - - - - - -
- -
- - > - - - - - - - -
-

- - - - - - - -

-
- - -
- - - - | - - - - | - - - - - - - - - - -
- - 		', $percentage, esc_attr( sprintf( __( '(%1$d / %2$d)', 'dependency-minification' ), $min, $max ) ) ); - print esc_html( sprintf( __( '%1$d%%', 'dependency-minification' ), $percentage ) ); - print ''; - } - - ?> - - - - - -
- - -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - -
- - -
- - -
- - - - -
-
- -
-
-
-
- extra_rules_top[ $regex ] ); } /** - * Separate external from internal (local) dependencies and then group the - * internal resources into maximal groups. - * @param array $handles - * @param string $type (scripts|styles) - * @return array + * @return void + * @since 1.0 */ - static function filter_print_dependency_array( array $handles, $type ) { - assert( in_array( $type, array( 'scripts', 'styles' ) ) ); - assert( isset( $GLOBALS["wp_{$type}"] ) ); - $wp_deps = &$GLOBALS["wp_{$type}"]; - assert( is_a( $wp_deps, 'WP_Dependencies' ) ); - - /** - * Determine if minification is enabled for the provided $handles. - * Note that we cannot use the $concatenate_scripts global set by script_concat_settings - * because it is intended to only be used in the WP Admin - * Plugin is automatically disabled if pretty permalinks is not activated - */ - $disabled = self::$options['disable_if_wp_debug'] ? ( defined( 'WP_DEBUG' ) && WP_DEBUG ) : false; - $disabled = $disabled || ( defined( 'DEPENDENCY_MINIFICATION_DEFAULT_DISABLED' ) && DEPENDENCY_MINIFICATION_DEFAULT_DISABLED ); - $disabled = apply_filters( 'dependency_minification_disabled', $disabled, $handles, $type ); - $disabled = apply_filters( "dependency_minification_disabled_{$type}", $disabled, $handles ); - $disabled = $disabled || empty( $GLOBALS['wp_rewrite']->permalink_structure ); - if ( $disabled ) { - return $handles; - } + public static function autoload( $class_name ) { - // @todo There should be a better way to determine which group we are in - $current_group = (int) self::$is_footer[$type]; // false => 0, true => 1 - - $handles_in_group = array(); - foreach ( $handles as $handle ) { - $must_process_handle = ( - $wp_deps->groups[$handle] === $current_group - || - // Handle case where script is erroneously enqueued without in_footer=true (here's lookin at you, PollDaddy) - ( - $wp_deps->groups[$handle] < $current_group - && - ! in_array( $handle, $wp_deps->done ) - ) - ); - - if ( $must_process_handle ) { - $handles_in_group[] = $handle; - } - } + switch( $class_name ) { - $filtered_handles = array(); - $groups = self::group_dependencies_by_exclusion( $handles_in_group, $wp_deps ); - - foreach ( $groups as $group ) { - // $internal_groups as $extra => $handles_in_group - if ( empty( $group['handles'] ) ) { - continue; - } - - if ( $group['excluded'] ) { - $filtered_handles = array_merge( $filtered_handles, $group['handles'] ); - continue; - } - $extra = empty( $group['extra'] ) ? array() : $group['extra']; - - $deps = array(); - foreach ( $group['handles'] as $handle ) { - $deps[] = array( - 'handle' => $handle, - 'src' => $wp_deps->registered[$handle]->src, - 'ver' => $wp_deps->registered[$handle]->ver, - ); - } - $srcs = wp_list_pluck( $deps, 'src' ); - $src_hash = self::hash_array( $srcs ); - $ver_hash = self::hash_array( wp_list_pluck( $deps, 'ver' ) ); - - $cache_option_name = self::get_cache_option_name( $src_hash ); - $cached = get_option( $cache_option_name ); - $cached_ver_hash = null; - if ( ! empty( $cached['deps'] ) ) { - $cached_ver_hash = self::hash_array( wp_list_pluck( $cached['deps'], 'ver' ) ); - } - - $is_error = ( - ! empty( $cached['error'] ) - && - $ver_hash === $cached_ver_hash - && - time() < $cached['expires'] - ); - - $is_stale = ( - empty( $cached ) - || - time() > $cached['expires'] - || - $ver_hash !== $cached_ver_hash - ); - - if ( $is_error ) { - if ( self::$options['show_error_messages'] ) { - print "\n\n" ); - } - $filtered_handles = array_merge( $filtered_handles, $group['handles'] ); - } elseif ( $is_stale ) { - printf( "\n\n" ); - - // @todo We could store the info in the option, and just pass the cache key to the cron; this would allow reliable passing of request_uri - - $scheduled = time(); - $args = array_merge( - array( - 'expires' => false, - 'last_modified' => false, - 'etag' => false, - 'unminified_size' => false, - 'contents' => false, - 'pending' => true, - ), - compact( 'type', 'deps', 'scheduled' ) - ); - - wp_schedule_single_event( $scheduled, self::CRON_MINIFY_ACTION, array( $args ) ); - // The bundle is not ready yet, so re-use the existing dependencies - $filtered_handles = array_merge( $filtered_handles, $group['handles'] ); - } else { - self::$minified_count += 1; - $new_handle = sprintf( 'minified-%d', self::$minified_count ); - $filtered_handles[] = $new_handle; - $src = self::get_dependency_minified_url( $deps, $type ); - - // Deps are registered without versions since the URL includes the version (ver_hash) - if ( 'scripts' === $type ) { - $in_footer = ! empty( $extra['group'] ); // @todo what if the group is not 0 or 1? - wp_register_script( $new_handle, $src, array(), null, $in_footer ); - } elseif ( 'styles' === $type ) { - wp_register_style( $new_handle, $src, array(), null, $extra['media'] ); - } - $wp_deps->set_group( $new_handle, /*recursive*/false, $current_group ); - $new_dep = $wp_deps->registered[$new_handle]; - $new_extra = array( - 'data' => '', - ); - foreach ( $group['handles'] as $handle ) { - - // Aggregate data from scripts (e.g. wp_localize_script) - if ( ! empty( $wp_deps->registered[$handle]->extra ) ) { - - foreach ( array_keys( $wp_deps->registered[$handle]->extra ) as $extra_key ) { - $data = $wp_deps->get_data( $handle, $extra_key ); - - if ( 'data' === $extra_key ) { - $new_extra['data'] .= "/* wp_localize_script($handle): */\n"; - $new_extra['data'] .= "$data\n\n"; - } else { - if ( isset( $new_extra[$extra_key] ) ) { - // The handles should have been grouped so that they have the same extras - assert( $new_extra[$extra_key] === $data ); - } - $new_extra[$extra_key] = $data; - } - } - } - - // Mark the handles as done for the resources that have been minified - $wp_deps->done[] = $handle; - } - - // Add aggregated extra to new dependency - foreach ( $new_extra as $key => $value ) { - $new_dep->add_data( $key, $value ); - } - } - } + case 'DepMin_Admin': + require self::path( 'inc/admin.php' ); + break; + + case 'DepMin_Options': + require self::path( 'inc/options.php' ); + break; + + case 'DepMin_SrcInfo': + require self::path( 'inc/helpers.php' ); + break; + + case 'DepMin_Handler': + require self::path( 'inc/handler.php' ); + break; + + case 'DepMin_Collation': + require self::path( 'inc/collation.php' ); + break; - // @todo Must be a better way to do this - self::$is_footer[$type] = true; // for the next invocation + case 'DepMin_Minify': + case 'DepMin_Minifier': + case 'DepMin_Minifier_Default': + require self::path( 'inc/minifier.php' ); + break; + + case 'DepMin_Cache': + case 'DepMin_Cache_Default': + case 'DepMin_Cache_Interface': + require self::path( 'inc/cache.php' ); + break; + + } - return $filtered_handles; } /** - * @param string $src - * @return bool + * @return string + * @since 1.0 */ - static function is_self_hosted_src( $src ) { - $parsed_url = parse_url( $src ); - return ( - ( - empty( $parsed_url['host'] ) - && - substr( $parsed_url['path'], 0, 1 ) === '/' - ) - || - ( - ! empty( $parsed_url['host'] ) - && - $parsed_url['host'] === parse_url( get_home_url(), PHP_URL_HOST ) - ) - ); - } - - static function is_url_included( $needle, $haystack ) { - foreach ( $haystack as $entry ) { - if ( strpos( $needle, $entry ) !== false ) { - return true; - } - } - return false; + public static function url( $path = '' ) { + return plugins_url( $path, __FILE__ ); } /** - * @param array $handles - * @param WP_Dependencies $wp_deps - * @return array Two members, the 1st containing external handles and the 2nd containing internal handles + * @return string + * @since 1.0 */ - static function group_dependencies_by_exclusion( $handles, WP_Dependencies $wp_deps ) { - $groups = array(); - - // First create groups based on whether they are excluded from minification - $last_was_excluded = null; - foreach ( $handles as $handle ) { - $src = $wp_deps->registered[$handle]->src; - $is_local = self::is_self_hosted_src( $src ); - $is_excluded = ! $is_local && self::$options['default_exclude_remote_dependencies']; - $is_excluded = $is_excluded || self::is_url_included( $src, self::$options['exclude_dependencies'] ); - $is_excluded = apply_filters( 'dependency_minification_excluded', $is_excluded, $handle, $src ); - - if ( $last_was_excluded !== $is_excluded ) { - $groups[] = array( - 'excluded' => $is_excluded, - 'handles' => array(), - ); - } - $groups[ count( $groups ) - 1 ]['handles'][] = $handle; - $last_was_excluded = $is_excluded; - } + public static function path( $path = '' ) { - // Now divide up the groups to create bundles that share the same extras (e.g. stylesheet media or conditional) - $bundled_groups = array(); - foreach ( $groups as $group ) { - if ( $group['excluded'] ) { - $bundled_groups[] = $group; - } else { - $handles_bundles = self::group_handles_by_extra( $group['handles'], $wp_deps ); - foreach ( $handles_bundles as $extra => $handles_bundle ) { - $bundled_groups[] = array( - 'excluded' => false, - 'extra' => unserialize( $extra ), - 'handles' => $handles_bundle, - ); - } - } - } + $base = plugin_dir_path( __FILE__ ); - return $bundled_groups; + if ( ! empty( $path ) ) + $path = path_join( $base, $path ); + else + $path = untrailingslashit( $base ); + + return $path; } /** - * @todo This is only applicable for styles, right? The media and conditional extras. - * @param array $handles - * @param WP_Dependencies $wp_deps - * @return array Associative array where the keys are the args and extras + * @return void + * @since 1.0 */ - static function group_handles_by_extra( array $handles, WP_Dependencies $wp_deps ) { - $bundles = array(); - foreach ( $handles as $handle ) { - $dep = &$wp_deps->registered[$handle]; - $extra = (array) $dep->extra; - if ( is_a( $wp_deps, 'WP_Styles' ) ) { - $extra['media'] = is_string( $dep->args ) ? $dep->args : 'all'; - } - unset($extra['suffix']); - unset($extra['rtl']); - unset($extra['data']); - // Default scripts are not assigned 'group', so we use the original 'deps->args' value - if ( is_a( $wp_deps, 'WP_Scripts' ) && empty( $extra['group'] ) && is_int( $dep->args ) ) { - $extra['group'] = $dep->args; - } - ksort( $extra ); - $key = serialize( $extra ); - $bundles[$key][] = $handle; - } - return $bundles; + public static function activate() { + self::add_rewrite_rule(); + flush_rewrite_rules(); } /** - * @action minify_dependencies - * + * @return void + * @since 1.0 */ - static function minify( $cached ) { - extract( $cached ); - $host_domain = parse_url( home_url(), PHP_URL_HOST ); - $ver_hash = self::hash_array( wp_list_pluck( $deps, 'ver' ) ); - $src_hash = self::hash_array( wp_list_pluck( $deps, 'src' ) ); - $cache_option_name = self::get_cache_option_name( $src_hash ); - - try { - $is_css = ( 'styles' === $type ); - if ( 'scripts' === $type ) { - require_once( dirname( __FILE__ ) . '/minify/JS/JSMin.php' ); - } elseif ( 'styles' === $type ) { - require_once( dirname( __FILE__ ) . '/minify/CSS/UriRewriter.php' ); - require_once( dirname( __FILE__ ) . '/minify/CSS/Compressor.php' ); - } - - $unminified_size = 0; - $srcs = wp_list_pluck( $deps, 'src' ); - - // Get the contents of each script - $contents_for_each_dep = array(); - foreach ( $srcs as $src ) { - - if ( ! preg_match( '|^(https?:)?//|', $src ) ) { - $src = site_url( $src ); - } - - // First attempt to get the file from the filesystem - $contents = false; - $is_self_hosted = self::is_self_hosted_src( $src ); - if ( $is_self_hosted ) { - $src_abspath = ltrim( parse_url( $src, PHP_URL_PATH ), '/' ); - $src_abspath = path_join( $_SERVER['DOCUMENT_ROOT'], $src_abspath ); - $contents = file_get_contents( $src_abspath ); - } - - // Dependency is not self-hosted or it the filesystem read failed, so do HTTP request - if ( false === $contents ) { - $r = wp_remote_get( $src ); - if ( is_wp_error( $r ) ) { - throw new Exception( "Failed to retrieve $src: " . $r->get_error_message() ); - } elseif ( intval( wp_remote_retrieve_response_code( $r ) ) !== 200 ) { - throw new Dependency_Minification_Exception( sprintf( 'Request for %s returned with HTTP %d %s', $src, wp_remote_retrieve_response_code( $r ), wp_remote_retrieve_response_message( $r ) ) ); - } - $contents = wp_remote_retrieve_body( $r ); - } - $unminified_size += strlen( $contents ); - - // Remove the BOM - $contents = preg_replace( "/^\xEF\xBB\xBF/", '', $contents ); - - // Rewrite relative paths in CSS - $src_dir_path = dirname( parse_url( $src, PHP_URL_PATH ) ); - if ( 'styles' === $type && is_dir( ABSPATH . $src_dir_path ) ) { - $contents = Minify_CSS_UriRewriter::rewrite( $contents, ABSPATH . $src_dir_path ); - } - - $contents_for_each_dep[$src] = $contents; - } - - $contents = ''; - - // Print a manifest of the dependencies - $contents .= sprintf( "/*! This minified dependency bundle includes:\n" ); - $i = 0; - foreach ( $srcs as $src ) { - $i += 1; - $contents .= sprintf( " * %02d. %s\n", $i, $src ); - } - $contents .= sprintf( " */\n\n" ); - - // Minify - // Note: semicolon needed in case a file lacks trailing semicolon - // like `x = {a:1}` and the next file is IIFE (function(){}), - // then it would get combined as x={a:1}(function(){}) and attempt - // to pass the anonymous function into a function {a:1} which - // is of course an object and not a function. Culprit here - // is the comment-reply.js in WordPress. - if ( 'scripts' === $type ) { - $minified_contents = join( "\n;;\n", $contents_for_each_dep ); - $minified_contents = JSMin::minify( $minified_contents ); - if ( false === $minified_contents ) { - throw new Dependency_Minification_Exception( 'JavaScript parse error' ); - } - } elseif ( 'styles' === $type ) { - $minified_contents = join( "\n\n", $contents_for_each_dep ); - $minified_contents = Minify_CSS_Compressor::process( $minified_contents ); - } - - $contents .= $minified_contents; - $cached['unminified_size'] = $unminified_size; - $max_age = apply_filters( 'dependency_minification_cache_control_max_age', (int) self::$options['cache_control_max_age_cache'], $srcs ); - $cached['contents'] = $contents; - $cached['expires'] = time() + $max_age; - $cached['error'] = null; - } - catch (Exception $e) { - error_log( - sprintf( - '%s in %s: %s for srcs %s', - get_class( $e ), - __FUNCTION__, - $e->getMessage(), - join( ',', $srcs ) - ) - ); - $cached['error'] = $e->getMessage(); - $max_age = apply_filters( 'dependency_minification_cache_control_max_age_error', (int) self::$options['cache_control_max_age_error'], $srcs ); - $cached['expires'] = time() + $max_age; - } - $cached['etag'] = self::generate_etag( $src_hash, $ver_hash ); - $cached['last_modified'] = time(); - $cached['pending'] = false; - - if ( false === get_option( $cache_option_name ) ) { - add_option( $cache_option_name, $cached, '', 'no' ); - } else { - update_option( $cache_option_name, $cached ); - } + public static function deactivate() { + self::remove_rewrite_rule(); + flush_rewrite_rules(); } + /*** SingleTone ***********************************************************/ + /** - * Handle a request for the minified resource + * @return void + * @since 1.0 */ - static function handle_request() { - $src_hash = get_query_var( 'depmin_src_hash' ); - $ext = get_query_var( 'depmin_file_ext' ); - if ( empty( $src_hash ) || empty( $ext ) ) { - return; - } + public static function instance() { + + static $instance; + + if ( is_null( $instance ) ) { + + $instance = new Dependency_Minification(); + $instance->load_includes(); + $instance->setup_actions(); + $instance->setup(); - try { - ob_start(); - - if ( 'js' === $ext ) { - header( 'Content-Type: application/javascript; charset=utf-8' ); - } else { - header( 'Content-Type: text/css; charset=utf-8' ); - } - - $cache_option_name = self::get_cache_option_name( $src_hash ); - $cached = get_option( $cache_option_name ); - if ( empty( $cached ) ) { - throw new Dependency_Minification_Exception( 'Unknown minified dependency bundle.', 404 ); - } - if ( ! empty( $cached['error'] ) ) { - throw new Dependency_Minification_Exception( $cached['error'], 500 ); - } - - // Send the response headers for caching - header( 'Expires: ' . str_replace( '+0000', 'GMT', gmdate( 'r', $cached['expires'] ) ) ); - if ( ! empty( $cached['last_modified'] ) ) { - header( 'Last-Modified: ' . str_replace( '+0000', 'GMT', gmdate( 'r', $cached['last_modified'] ) ) ); - } - if ( ! empty( $cached['etag'] ) ) { - header( 'ETag: ' . $cached['etag'] ); - } - - $is_not_modified = false; - if ( time() < $cached['expires'] ) { - $is_not_modified = self::$options['allow_not_modified_responses'] && ( - ( - ! empty( $_SERVER['HTTP_IF_NONE_MATCH'] ) - && - ! empty( $cached['etag'] ) - && - trim( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $cached['etag'] - ) - || - ( - ! empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) - && - ! empty( $cached['last_modified'] ) - && - strtotime( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) <= $cached['last_modified'] - ) - ); - } - - if ( $is_not_modified ) { - status_header( 304 ); - } else { - status_header( 200 ); - $out = $cached['contents']; - - global $compress_scripts, $compress_css; - script_concat_settings(); - $compress = ( 'js' === $ext ? $compress_scripts : $compress_css ); - $force_gzip = ( $compress && defined( 'ENFORCE_GZIP' ) && ENFORCE_GZIP ); - - // Copied from /wp-admin/load-scripts.php - if ( $compress && ! ini_get( 'zlib.output_compression' ) && 'ob_gzhandler' != ini_get( 'output_handler' ) && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) { - header( 'Vary: Accept-Encoding' ); // Handle proxies - if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate' ) && function_exists( 'gzdeflate' ) && ! $force_gzip ) { - header( 'Content-Encoding: deflate' ); - $out = gzdeflate( $out, 3 ); - } elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && function_exists( 'gzencode' ) ) { - header( 'Content-Encoding: gzip' ); - $out = gzencode( $out, 3 ); - } - } - - print $out; // xss ok - } - ob_end_flush(); - } - catch(Exception $e) { - ob_end_clean(); - $status = null; - $message = ''; - if ( $e instanceof Dependency_Minification_Exception || self::$options['show_error_messages'] ) { - $status = $e->getCode(); - $message = $e->getMessage(); - } else { - error_log( - sprintf( - '%s: %s via URI %s', - __METHOD__, - $e->getMessage(), - esc_url_raw( $_SERVER['REQUEST_URI'] ) - ) - ); - $message = 'Unexpected error occurred.'; - } - if ( empty($status) ) { - $status = 500; - } - status_header( $status ); - nocache_headers(); - header( 'Content-Type: text/plain' ); - print $message; // xss ok } - exit; + + return $instance; } } -add_action( 'plugins_loaded', array( 'Dependency_Minification', 'setup' ), 100 ); -register_activation_hook( __FILE__, array( 'Dependency_Minification', 'activate' ) ); +/** + * @since 1.0 + */ +class DepMin_Exception extends Exception {} + +// Register the plugin activation and deactivation hooks. register_deactivation_hook( __FILE__, array( 'Dependency_Minification', 'deactivate' ) ); +register_activation_hook( __FILE__, array( 'Dependency_Minification', 'activate' ) ); + +// Hook the plugin early onto the 'plugins_loaded' action. +add_action( 'plugins_loaded', array( 'Dependency_Minification', 'instance' ), 100 ); -class Dependency_Minification_Exception extends Exception {} +// Register the plugin classes autoloader. +spl_autoload_register( array( 'Dependency_Minification', 'autoload' ) ); \ No newline at end of file diff --git a/inc/admin.php b/inc/admin.php new file mode 100644 index 0000000..f5758bf --- /dev/null +++ b/inc/admin.php @@ -0,0 +1,596 @@ +page_hook = add_submenu_page( + self::PARENT_PAGE, + __( 'Dependency Minification', 'dependency-minification' ), + __( 'Dep. Minification', 'dependency-minification' ), + Dependency_Minification::$options['admin_page_capability'], + self::PAGE_SLUG, + array( $this, 'page_content' ) + ); + + } + + /** + * @return void + * @since 1.0 + */ + public function page_content() { ?> + +
+ + + +

+ +

+ + +

+ + page_tab_content_status() ?> + + page_tab_content_settings() ?> + +
+ + + +
+ +
+ + + + + false ) ); + + $key = DepMin_hash_array( wp_list_pluck( $dependency['deps'], 'src' ) ); + $dependencies[ $key ] = $dependency; + + } + + foreach ( DepMin_Minify::get_pending_dependencies() as $dependency ) { + + $key = DepMin_hash_array( wp_list_pluck( $dependency['deps'], 'src' ) ); + + if ( isset( $dependencies[ $key ] ) ) { + + $dependencies[ $key ] = array_merge( + $dependencies[ $key ], + $dependency + ); + + } else { + + $dependencies[ $key ] = $dependency; + + } + + } + + ?> + + +
+

+
+ + + +

+ +

+ +
+
+ + +
+
+
+ + + $tcontainer ) : ?> + <> + + + + + + + + + + > + + + + $dependency ) : + + extract( $dependency, EXTR_OVERWRITE ); // => $deps, $type, $pending, $error + + $handles = wp_list_pluck( $dependency['deps'], 'handle' ); + $minified_src = DepMin_Minify::get_minified_dependency_url( $dependency['deps'], $dependency['type'] ); + + $link_params = array( + '_wpnonce' => $nonce, + 'action' => self::AJAX_ACTION, + 'depmin_dependencies[]' => $key, + ); + ?> + + + + + + + + + + + $last_modified, 'expires' => $expires ) as $col => $time ) : ?> + + + + + + + + + + + +
+ +
+ + > + + + + + + + + +
+

+ + + + + + + +

+
+ + +
+ + + + | + + + + | + + + + + + + + + + +
+ + 		', $percentage, esc_attr( sprintf( __( '(%1$d / %2$d)', 'dependency-minification' ), $min, $max ) ) ); + print esc_html( sprintf( __( '%1$d%%', 'dependency-minification' ), $percentage ) ); + print ''; + } + + ?> + + + + + + + +
+ + + +
+ +
+ + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + +
+ + +
+ + + + +
+
+ +
+ +
+ +
+ getArrayCopy(); + + $options['exclude_dependencies'] = array_filter( preg_split( "#[\n\r]+#", esc_attr( $_POST['options']['exclude_dependencies'] ) ) ); + $options['disabled_on_conditions'] = ( isset( $_POST['options']['disabled_on_conditions'] ) ) + ? $_POST['options']['disabled_on_conditions'] + : array(); + $options['default_exclude_remote_dependencies'] = isset( $_POST['options']['default_exclude_remote_dependencies'] ); + + Dependency_Minification::$options->exchangeArray( $options ); + + } + + $redirect_url = add_query_arg( 'page', self::PAGE_SLUG, admin_url( self::PARENT_PAGE ) ); + $redirect_url = add_query_arg( 'updated', 1, $redirect_url ); + $redirect_url .= '#tab-settings'; + wp_redirect( $redirect_url ); + + die(); + } + + /** + * @action admin_enqueue_scripts + * @since 1.0 + */ + public function enqueue_scripts( $hook ) { + + if ( $hook !== $this->page_hook ) + return; + + wp_enqueue_style( 'depmin-admin', Dependency_Minification::url( 'admin.css' ), array(), Dependency_Minification::VERSION ); + wp_enqueue_script( 'depmin-admin', Dependency_Minification::url( 'admin.js' ), array( 'jquery' ), Dependency_Minification::VERSION ); + + } + + /** + * @action admin_notices + */ + public function admin_notices() { + + // Show a notice to notify user that pretty urls is disabled, hence the plugin won't work + if ( empty( $GLOBALS['wp_rewrite']->permalink_structure ) ) { ?> + +
+

%1$s: %2$s', + __( 'Dependency Minification', 'dependency-minification' ), + sprintf( + __( 'Pretty permalinks are not enabled in your %1$s, which is required for this plugin to operate. Select something other than Default (e.g. ?p=123)', 'dependency-minification' ), + sprintf( + '%2$s', + admin_url( 'options-permalink.php' ), + __( 'Permalinks Settings', 'dependency-minification' ) + ) + ) + ); // xss ok + ?>

+
+ + id !== $this->page_hook ) + return; + + if ( empty( $_GET['updated-action'] ) ) + return; + + if ( empty( $_GET['updated-count'] ) ) + return; + + $updated_count = intval( $_GET['updated-count'] ); + $updated_task = filter_input( INPUT_GET, 'updated-action' ); + ?> +
+ +

+ +

+ +

+ +
+ %s', esc_url( $admin_page_url ), esc_html__( 'Settings', 'dependency-minification' ) ); + array_push( $links, $admin_page_link ); + + } + + return $links; + } + +} \ No newline at end of file diff --git a/inc/cache.php b/inc/cache.php new file mode 100644 index 0000000..3c244cf --- /dev/null +++ b/inc/cache.php @@ -0,0 +1,271 @@ +get_all(); + } + + /** + * @return string + * @since 1.0 + */ + public static function get_key( $key ) { + return self::get_object()->get_key( $key ); + } + + /** + * @return bool + * @since 1.0 + */ + public static function exists( $key ) { + return self::get_object()->exists( $key ); + } + + /** + * @return bool + * @since 1.0 + */ + public static function delete( $key ) { + return self::get_object()->delete( $key ); + } + + /** + * @return bool + * @since 1.0 + */ + public static function set( $key, $value ) { + return self::get_object()->set( $key, $value ); + } + + /** + * @return bool + * @since 1.0 + */ + public static function add( $key, $value ) { + return self::get_object()->add( $key, $value ); + } + + /** + * @return bool + * @since 1.0 + */ + public static function replace( $key, $value ) { + return self::get_object()->replace( $key, $value ); + } + + /** + * @return mixed + * @since 1.0 + */ + public static function get( $key, $default = false ) { + return self::get_object()->get( $key, $default ); + } + + /** + * @return void + * @since 1.0 + */ + public static function set_object( $object ) { + + if ( $object instanceof DepMin_Cache_Interface ) + self::$object = $object; + + } + + /** + * @return DepMin_Cache_Interface + * @since 1.0 + */ + public static function get_object() { + + if ( is_null( self::$object ) ) + self::$object = new DepMin_Cache_Default(); + + return self::$object; + + } + +} + +/** + * @since 1.0 + */ +class DepMin_Cache_Default implements DepMin_Cache_Interface { + + /** + * @return array + * @since 1.0 + */ + public function get_all() { + + global $wpdb; + $list = array(); + + foreach ( $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name LIKE 'depmin_cache_%'" ) as $key ) { + + if ( ( $value = get_option( $key ) ) ) + $list[ $key ] = $value; + + } + + return $list; + } + + /** + * @return string|bool + * @since 1.0 + */ + public function get_key( $key ) { + + if ( is_array( $key ) ) { + $key = DepMin_hash_array( $key ); + + } elseif ( is_object( $key ) ) { + $key = spl_object_hash( $key ); + + } + + if ( empty( $key ) ) + return false; + + return 'depmin_cache_' . trim( $key ); + } + + /** + * @return bool + * @since 1.0 + */ + public function set( $key, $value ) { + + $key = trim( $key ); + + if ( empty( $key ) ) + return false; + + if ( ! $this->exists( $key ) ) { + return $this->add( $key, $value ); + + } else { + return $this->replace( $key, $value ); + + } + + } + + /** + * @return bool + * @since 1.0 + */ + public function add( $key, $value ) { + + if ( empty( $key ) || $this->exists( $key ) ) + return false; + + return add_option( $key, $value, '', 'no' ); + } + + /** + * @return bool + * @since 1.0 + */ + public function replace( $key, $value ) { + + if ( empty( $key ) || ! $this->exists( $key ) ) + return false; + + return update_option( $key, $value ); + } + + /** + * @return mixed + * @since 1.0 + */ + public function get( $key, $default = false ) { + return get_option( $key, $default ); + } + + /** + * @return bool + * @since 1.0 + */ + public function exists( $key ) { + return (bool) $this->get( $key ); + } + + /** + * @return bool + * @since 1.0 + */ + public function delete( $key ) { + return delete_option( $key ); + } + +} + +/** + * @since 1.0 + */ +interface DepMin_Cache_Interface { + + /** + * @return array + * @since 1.0 + */ + public function get_all(); + + /** + * @return bool + * @since 1.0 + */ + public function exists( $key ); + + /** + * @return bool + * @since 1.0 + */ + public function delete( $key ); + + /** + * @return string + * @since 1.0 + */ + public function get_key( $key ); + + /** + * @return bool + * @since 1.0 + */ + public function set( $key, $value ); + + /** + * @return bool + * @since 1.0 + */ + public function add( $key, $value ); + + /** + * @return bool + * @since 1.0 + */ + public function replace( $key, $value ); + + /** + * @return mixed + * @since 1.0 + */ + public function get( $key, $default = false ); + +} diff --git a/inc/collation.php b/inc/collation.php new file mode 100644 index 0000000..f9259e2 --- /dev/null +++ b/inc/collation.php @@ -0,0 +1,347 @@ + false, + 'styles' => false, + ); + + /** + * @return void + * @since 1.0 + */ + public function __construct() { + + $disabled = ( + ( isset( Dependency_Minification::$options['disabled_on_conditions']['all'] ) && ! empty( Dependency_Minification::$options['disabled_on_conditions']['all'] ) ) + || ( isset( Dependency_Minification::$options['disabled_on_conditions']['loggedin'] ) && ! empty( Dependency_Minification::$options['disabled_on_conditions']['loggedin'] ) && is_user_logged_in() ) + || ( ! empty( Dependency_Minification::$options['disabled_on_conditions']['admin'] ) && is_user_logged_in() && current_user_can( 'manage_options' ) ) + || ( ! empty( Dependency_Minification::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && ! empty( Dependency_Minification::$options['disabled_on_conditions']['queryvar']['enabled'] ) + && ! empty( $_GET[ Dependency_Minification::$options['disabled_on_conditions']['queryvar']['value'] ] ) + ) + ); + + if ( DepMin_is_frontend() && ! $disabled ) { + + add_filter( 'print_scripts_array', array( $this, 'filter_print_scripts_array' ) ); + add_filter( 'print_styles_array', array( $this, 'filter_print_styles_array' ) ); + } + + } + + /** + * @filter print_styles_array + * @return array + * @since 1.0 + */ + public function filter_print_styles_array( $handles ) { + $handles = $this->filter_print_dependency_array( $handles, 'styles' ); + return $handles; + } + + /** + * @filter print_scripts_array + * @return array + * @since 1.0 + */ + public function filter_print_scripts_array( $handles ) { + $handles = $this->filter_print_dependency_array( $handles, 'scripts' ); + return $handles; + } + + /** + * Separate external from internal (local) dependencies and then group the + * internal resources into maximal groups. + * @param array $handles + * @param string $type (scripts|styles) + * @return array + */ + public function filter_print_dependency_array( array $handles, $type ) { + assert( in_array($type, array( 'scripts', 'styles' ) ) ); + assert( isset($GLOBALS["wp_{$type}"]) ); + $wp_deps = &$GLOBALS["wp_{$type}"]; + assert( is_a($wp_deps, 'WP_Dependencies') ); + + /** + * Determine if minification is enabled for the provided $handles. + * Note that we cannot use the $concatenate_scripts global set by script_concat_settings + * because it is intended to only be used in the WP Admin + * Plugin is automatically disabled if pretty permalinks is not activated + */ + $disabled = Dependency_Minification::$options['disable_if_wp_debug'] ? ( defined( 'WP_DEBUG' ) && WP_DEBUG ) : false; + $disabled = $disabled || ( defined( 'DEPENDENCY_MINIFICATION_DEFAULT_DISABLED' ) && DEPENDENCY_MINIFICATION_DEFAULT_DISABLED ); + $disabled = apply_filters( 'dependency_minification_disabled', $disabled, $handles, $type ); + $disabled = apply_filters( "dependency_minification_disabled_{$type}", $disabled, $handles ); + $disabled = $disabled || empty( $GLOBALS['wp_rewrite']->permalink_structure ); + if ( $disabled ) { + return $handles; + } + + // @todo There should be a better way to determine which group we are in + $current_group = (int) $this->is_footer[$type]; // false => 0, true => 1 + + $handles_in_group = array(); + foreach ( $handles as $handle ) { + $must_process_handle = ( + $wp_deps->groups[$handle] === $current_group + || + // Handle case where script is erroneously enqueued without in_footer=true (here's lookin at you, PollDaddy) + ( + $wp_deps->groups[$handle] < $current_group + && + ! in_array( $handle, $wp_deps->done ) + ) + ); + + if ( $must_process_handle ) { + $handles_in_group[] = $handle; + } + } + + $filtered_handles = array(); + $groups = $this->group_dependencies_by_exclusion( $handles_in_group, $wp_deps ); + + foreach ( $groups as $group ) { + // $internal_groups as $extra => $handles_in_group + if ( empty( $group['handles'] ) ) { + continue; + } + + if ( $group['excluded'] ) { + $filtered_handles = array_merge( $filtered_handles, $group['handles'] ); + continue; + } + $extra = empty( $group['extra'] ) ? array() : $group['extra']; + + $deps = array(); + foreach ( $group['handles'] as $handle ) { + $deps[] = array( + 'handle' => $handle, + 'src' => $wp_deps->registered[$handle]->src, + 'ver' => $wp_deps->registered[$handle]->ver, + ); + } + + $srcs = wp_list_pluck( $deps, 'src' ); + $vers = wp_list_pluck( $deps, 'ver' ); + + $src_hash = DepMin_hash_array( $srcs ); + $ver_hash = DepMin_hash_array( $vers ); + + $cached_ver_hash = null; + $cached = DepMin_Cache::get( DepMin_Cache::get_key( $src_hash ) ); + + if ( ! empty( $cached['deps'] ) ) { + $cached_ver_hash = DepMin_hash_array( wp_list_pluck( $cached['deps'], 'ver' ) ); + } + + $is_error = ( + ! empty( $cached['error'] ) + && + $ver_hash === $cached_ver_hash + && + time() < $cached['expires'] + ); + + $is_stale = ( + empty( $cached ) + || + time() > $cached['expires'] + || + $ver_hash !== $cached_ver_hash + ); + + if ( $is_error ) { + if ( Dependency_Minification::$options['show_error_messages'] ) { + print "\n\n" ); + } + $filtered_handles = array_merge( $filtered_handles, $group['handles'] ); + } elseif ( $is_stale ) { + printf( "\n\n" ); + + // @todo We could store the info in the option, and just pass the cache key to the cron; this would allow reliable passing of request_uri + + $scheduled = time(); + $args = array_merge( + array( + 'expires' => false, + 'last_modified' => false, + 'etag' => false, + 'unminified_size' => false, + 'contents' => false, + 'pending' => true, + ), + compact( 'type', 'deps' ) + ); + + wp_schedule_single_event( $scheduled, DepMin_Minify::CRON_ACTION, array( $args ) ); + // The bundle is not ready yet, so re-use the existing dependencies + $filtered_handles = array_merge( $filtered_handles, $group['handles'] ); + } else { + $this->minified_count += 1; + $new_handle = sprintf( 'minified-%d', $this->minified_count ); + $filtered_handles[] = $new_handle; + $src = DepMin_Minify::get_minified_dependency_url( $deps, $type ); + + // Deps are registered without versions since the URL includes the version (ver_hash) + if ( 'scripts' === $type ) { + $in_footer = ! empty( $extra['group'] ); // @todo what if the group is not 0 or 1? + wp_register_script( $new_handle, $src, array(), null, $in_footer ); + } elseif ( 'styles' === $type ) { + wp_register_style( $new_handle, $src, array(), null, $extra['media'] ); + } + $wp_deps->set_group( $new_handle, /*recursive*/false, $current_group ); + $new_dep = $wp_deps->registered[$new_handle]; + $new_extra = array( + 'data' => '', + ); + foreach ( $group['handles'] as $handle ) { + + // Aggregate data from scripts (e.g. wp_localize_script) + if ( ! empty( $wp_deps->registered[$handle]->extra ) ) { + + foreach ( array_keys( $wp_deps->registered[$handle]->extra ) as $extra_key ) { + $data = $wp_deps->get_data( $handle, $extra_key ); + + if ( 'data' === $extra_key ) { + $new_extra['data'] .= "/* wp_localize_script($handle): */\n"; + $new_extra['data'] .= "$data\n\n"; + } else { + if ( isset( $new_extra[$extra_key] ) ) { + // The handles should have been grouped so that they have the same extras + assert( $new_extra[$extra_key] === $data ); + } + $new_extra[$extra_key] = $data; + } + } + } + + // Mark the handles as done for the resources that have been minified + $wp_deps->done[] = $handle; + } + + // Add aggregated extra to new dependency + foreach ( $new_extra as $key => $value ) { + $new_dep->add_data( $key, $value ); + } + } + } + + // @todo Must be a better way to do this + $this->is_footer[$type] = true; // for the next invocation + + return $filtered_handles; + + } + + /** + * @param array $handles + * @param WP_Dependencies $wp_deps + * @return array Two members, the 1st containing external handles and the 2nd containing internal handles + */ + public function group_dependencies_by_exclusion( $handles, WP_Dependencies $wp_deps ) { + $groups = array(); + + // First create groups based on whether they are excluded from minification + $last_was_excluded = null; + foreach ( $handles as $handle ) { + $src = $wp_deps->registered[$handle]->src; + $is_local = DepMin_is_self_hosted_src( $src ); + $is_excluded = ! $is_local && Dependency_Minification::$options['default_exclude_remote_dependencies']; + $is_excluded = $is_excluded || $this->is_url_included( $src, Dependency_Minification::$options['exclude_dependencies'] ); + $is_excluded = apply_filters( 'dependency_minification_excluded', $is_excluded, $handle, $src ); + + if ( $last_was_excluded !== $is_excluded ) { + $groups[] = array( + 'excluded' => $is_excluded, + 'handles' => array(), + ); + } + $groups[ count( $groups ) - 1 ]['handles'][] = $handle; + $last_was_excluded = $is_excluded; + } + + // Now divide up the groups to create bundles that share the same extras (e.g. stylesheet media or conditional) + $bundled_groups = array(); + foreach ( $groups as $group ) { + if ( $group['excluded'] ) { + $bundled_groups[] = $group; + } else { + $handles_bundles = $this->group_handles_by_extra( $group['handles'], $wp_deps ); + foreach ( $handles_bundles as $extra => $handles_bundle ) { + $bundled_groups[] = array( + 'excluded' => false, + 'extra' => unserialize( $extra ), + 'handles' => $handles_bundle, + ); + } + } + } + + return $bundled_groups; + } + + /** + * @todo This is only applicable for styles, right? The media and conditional extras. + * @param array $handles + * @param WP_Dependencies $wp_deps + * @return array Associative array where the keys are the args and extras + */ + public function group_handles_by_extra( array $handles, WP_Dependencies $wp_deps ) { + $bundles = array(); + foreach ( $handles as $handle ) { + $dep = &$wp_deps->registered[$handle]; + $extra = (array) $dep->extra; + if ( is_a( $wp_deps, 'WP_Styles' ) ) { + $extra['media'] = is_string( $dep->args ) ? $dep->args : 'all'; + } + unset($extra['suffix']); + unset($extra['rtl']); + unset($extra['data']); + // Default scripts are not assigned 'group', so we use the original 'deps->args' value + if ( is_a( $wp_deps, 'WP_Scripts' ) && empty( $extra['group'] ) && is_int( $dep->args ) ) { + $extra['group'] = $dep->args; + } + ksort( $extra ); + $key = serialize( $extra ); + $bundles[$key][] = $handle; + } + return $bundles; + } + + public function is_url_included( $needle, $haystack ) { + foreach ( $haystack as $entry ) { + if ( strpos( $needle, $entry ) !== false ) { + return true; + } + } + return false; + } + +} \ No newline at end of file diff --git a/inc/handler.php b/inc/handler.php new file mode 100644 index 0000000..77b248c --- /dev/null +++ b/inc/handler.php @@ -0,0 +1,132 @@ +getCode(); + $message = $e->getMessage(); + } else { + error_log( + sprintf( + '%s: %s via URI %s', + __METHOD__, + $e->getMessage(), + esc_url_raw( $_SERVER['REQUEST_URI'] ) + ) + ); + $message = 'Unexpected error occurred.'; + } + if ( empty($status) ) { + $status = 500; + } + status_header( $status ); + nocache_headers(); + header( 'Content-Type: text/plain' ); + print $message; // xss ok + } + exit; + } + +} \ No newline at end of file diff --git a/inc/helpers.php b/inc/helpers.php new file mode 100644 index 0000000..a06d687 --- /dev/null +++ b/inc/helpers.php @@ -0,0 +1,220 @@ +set_url( $url ); + + if ( ! empty( $path ) ) + $this->set_path( $path ); + + if ( empty( $url ) && empty( $path ) ) + throw new DepMin_Exception( 'Specific the file path or URL' ); + + } + + /** + * @throw DepMin_Exception + * @return string|bool + * @since 1.0 + */ + public function is_self_hosted() { + + $url = $this->get_url(); + + if ( ! empty( $url ) ) { + + $parsed_url = parse_url( $url ); + + if ( empty( $parsed_url['host'] ) && substr( $parsed_url['path'], 0, 1 ) === '/' ) + return true; + + if ( ! empty( $parsed_url['host'] ) && $parsed_url['host'] === parse_url( get_site_url(), PHP_URL_HOST ) ) + return true; + + } + + return false; + } + + /** + * @throw DepMin_Exception + * @return string|bool + * @since 1.0 + */ + public function get_contents() { + + $contents = false; + $url = $this->get_url(); + $path = $this->get_path(); + + if ( ! empty( $path ) ) + $contents = file_get_contents( $path ); + + if ( false === $contents && ! empty( $url ) ) { + + $response = wp_remote_get( $url ); + + if ( is_wp_error( $response ) ) { + + throw new DepMin_Exception( + sprintf( 'Failed to retrieve {%s}: %s', + $url, + $response->get_error_message() + ) + ); + + } elseif ( 200 !== (int) wp_remote_retrieve_response_code( $response ) ) { + + throw new DepMin_Exception( + sprintf( 'Request for %s returned with HTTP %d %s', + $url, + wp_remote_retrieve_response_code( $response ), + wp_remote_retrieve_response_message( $response ) + ) + ); + + } + + $contents = wp_remote_retrieve_body( $response ); + + } + + // Remove the BOM + if ( ! empty( $contents ) ) + $contents = preg_replace( "/^\xEF\xBB\xBF/", '', $contents ); + + return $contents; + } + + /** + * @throw DepMin_Exception + * @return void + * @since 1.0 + */ + protected function set_path( $path ) { + + if ( ! file_exists( $path ) ) + throw new DepMin_Exception( 'Invalid file path' ); + + $this->path = $path; + + } + + /** + * @throw DepMin_Exception + * @return void + * @since 1.0 + */ + protected function set_url( $url ) { + + if ( ! DepMin_is_vaild_url( $url ) ) + throw new DepMin_Exception( 'Invalid file URL' ); + + $this->url = $url; + + } + + /** + * @return string + * @since 1.0 + */ + public function get_path() { + + if ( empty( $this->path ) && $this->is_self_hosted() ) { + + $this->path = ltrim( parse_url( $this->url, PHP_URL_PATH ), '/' ); + $this->path = path_join( $_SERVER['DOCUMENT_ROOT'], $this->path ); + + } + + return $this->path; + } + + /** + * @return string + * @since 1.0 + */ + public function get_url() { + return $this->url; + } + +} + +/** + * URL Validation. + * + * @param string URL to be validated + * @return bool Validation result + */ +function DepMin_is_vaild_url( $url ) { + return (bool) filter_var( utf8_uri_encode( $url ), FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED + FILTER_FLAG_HOST_REQUIRED ); +} + +/** + * @var bool + * @since 1.0 + */ +function DepMin_is_frontend() { + + return ! ( + is_admin() + || + in_array( $GLOBALS['pagenow'], array( 'wp-login.php', 'wp-register.php' ) ) + ); + +} + +/** + * @var string + * @since 1.0 + */ +function DepMin_hash_array( array $r ) { + return md5( serialize( $r ) ); +} + +/** + * @var bool + * @since 1.0 + */ +function DepMin_is_self_hosted_src( $src ) { + + $parsed_url = parse_url( $src ); + return ( + ( + empty( $parsed_url['host'] ) + && + substr( $parsed_url['path'], 0, 1 ) === '/' + ) + || + ( + ! empty( $parsed_url['host'] ) + && + $parsed_url['host'] === parse_url( get_home_url(), PHP_URL_HOST ) + ) + ); + +} \ No newline at end of file diff --git a/inc/minifier.php b/inc/minifier.php new file mode 100644 index 0000000..65d0ffb --- /dev/null +++ b/inc/minifier.php @@ -0,0 +1,361 @@ +args = wp_parse_args( $args, array( + // @TODO: Add more minification options. + 'type' => '', // 'styles' or 'scripts' + ) ); + + return $this; + + } + + /** + * @param DepMin_SrcInfo[] $srcs + * @return DepMin_Minifier + * @since 1.0 + */ + public function set_srcs( array $srcs ) { + + foreach( $srcs as $src ) { + + if ( ! is_a( $src, 'DepMin_SrcInfo' ) ) + $src = new DepMin_SrcInfo( $src ); + + $this->srcs[]= $src; + + } + + return $this; + } + + /** + * @return mixed + * @since 1.0 + */ + public function get_args( $key = '' ) { + + if ( ! empty( $key ) ) { + + if ( isset( $this->args[ $key ] ) ) + return $this->args[ $key ]; + + return false; + + } + + return $this->args; + + } + + /** + * @return DepMin_SrcInfo[] + * @since 1.0 + */ + public function get_srcs() { + return $this->srcs; + } + + /** + * @throw DepMin_Exception + * @return array + * @since 1.0 + */ + abstract function minify(); + +} + +/** + * @since 1.0 + */ +class DepMin_Minifier_Default extends DepMin_Minifier { + + /** + * @return string + * @since 1.0 + */ + private function get_unminified_contents() { + + $i = 0; + $unminified = ''; + + foreach( $this->get_srcs() as $source ) { + + $contents = $source->get_contents(); + + if ( 'styles' === $this->get_args( 'type' ) ) { + + $dir_path = dirname( $source->get_path() ); + + // Rewrite relative paths in CSS. + if ( ! empty( $dir_path ) ) { + require_once Dependency_Minification::path( 'minify/CSS/UriRewriter.php' ); + $contents = Minify_CSS_UriRewriter::rewrite( $contents, $dir_path ); + } + + } + + $unminified .= $contents; + + if ( $i < ( count( $this->get_srcs() ) - 1 ) ) { + + /* + * @note + * Semicolon needed in case a file lacks trailing semicolon + * like `x = {a:1}` and the next file is IIFE (function(){}), + * then it would get combined as x={a:1}(function(){}) and attempt + * to pass the anonymous function into a function {a:1} which + * is of course an object and not a function. Culprit here + * is the comment-reply.js in WordPress. + */ + switch( $this->get_args( 'type' ) ) { + + case 'scripts': + $unminified .= "\n;;\n"; + break; + + case 'styles': + $unminified .= "\n\n"; + break; + + } + + } + + $i++; + + } + + return $unminified; + } + + /** + * @return array + * @since 1.0 + */ + public function minify() { + + $minified = ''; + $unminified = $this->get_unminified_contents(); + + switch( $this->get_args( 'type' ) ) { + + case 'styles': + require_once Dependency_Minification::path( 'minify/CSS/Compressor.php' ); + $minified = Minify_CSS_Compressor::process( $unminified ); + break; + + case 'scripts': + require_once Dependency_Minification::path( 'minify/JS/JSMin.php' ); + $minified = JSMin::minify( $unminified ); + break; + + } + + return array( + 'contents' => $minified, + 'minified_size' => strlen( $minified ), + 'unminified_size' => strlen( $unminified ), + ); + + } + +} + +/** + * @since 1.0 + */ +class DepMin_Minify { + + /** + * @var string + * @since 1.0 + */ + const CRON_ACTION = 'minify_dependencies'; + + /** + * @return array|bool + * @since 1.0 + */ + public static function minify( array $srcs, $type ) { + + $minifier = apply_filters( 'DepMin_minifier_class', 'DepMin_Minifier_Default' ); + + if ( ! empty( $minifier ) && class_exists( $minifier ) ) { + + $minifier = new $minifier(); + $minifier->set_srcs( $srcs ) + ->set_args( array( + 'type' => $type, + ) ); + + return $minifier->minify(); + + } + + return false; + } + + /** + * @return void + * @since 1.0 + */ + public static function cron_action( $args = '' ) { + + $args = wp_parse_args( $args, array( + 'unminified_size' => false, + 'minified_size' => false, + 'last_modified' => false, + 'contents' => false, + 'expires' => false, + 'pending' => true, + 'deps' => array(), + 'etag' => false, + 'type' => '', + ) ); + + $srcs = wp_list_pluck( $args['deps'], 'src' ); + $vers = wp_list_pluck( $args['deps'], 'ver' ); + + $src_hash = DepMin_hash_array( $srcs ); + $ver_hash = DepMin_hash_array( $vers ); + + try { + + foreach( $srcs as &$src ) { + + if ( ! preg_match( '|^(https?:)?//|', $src ) ) + $src = site_url( $src ); + + } + + if ( ( $minified = DepMin_Minify::minify( $srcs, $args['type'] ) ) ) { + + $args['contents'] = "/*! This minified dependency bundle includes:\n"; + + foreach ( $srcs as $key => $src ) + $args['contents'] .= sprintf( " * %02d. %s\n", $key + 1, $src ); + + $args['contents'] .= " */\n\n" . $minified['contents']; + $args['unminified_size'] = $minified['unminified_size']; + $args['minified_size'] = $minified['minified_size']; + + } + + $max_age = apply_filters( 'dependency_minification_cache_control_max_age', + (int) Dependency_Minification::$options['cache_control_max_age_cache'], + $srcs + ); + + $args['expires'] = time() + $max_age; + $args['error'] = null; + + } catch ( Exception $e ) { + + error_log( + sprintf( + '%s in %s: %s for srcs %s', + get_class( $e ), + __FUNCTION__, + $e->getMessage(), + implode( ',', $srcs ) + ) + ); + + $args['error'] = $e->getMessage(); + + $max_age = apply_filters( 'dependency_minification_cache_control_max_age_error', + (int) Dependency_Minification::$options['cache_control_max_age_error'], + $srcs + ); + + $args['expires'] = time() + $max_age; + + } + + $args['etag'] = implode( '.', array( $src_hash, $ver_hash ) ); + $args['last_modified'] = time(); + $args['pending'] = false; + + DepMin_Cache::set( DepMin_Cache::get_key( $src_hash ), $args ); + + } + + /** + * @param array $deps + * @param string $type (scripts or styles) + * @return string + * @since 1.0 + */ + public static function get_minified_dependency_url( array $deps, $type ) { + $srcs = wp_list_pluck( $deps, 'src' ); + $vars = wp_list_pluck( $deps, 'ver' ); + $handles = wp_list_pluck( $deps, 'handle' ); + + $src = trailingslashit( home_url( Dependency_Minification::$options['endpoint'] ) ); + $src .= implode( '.', array( + implode( ',', $handles ), + DepMin_hash_array( $srcs ), + DepMin_hash_array( $vars ), + $type === 'scripts' ? 'js' : 'css', + ) ); + + return $src; + } + + /** + * @return array + * @since 1.0 + */ + public static function get_pending_dependencies() { + + $list = array(); + foreach ( _get_cron_array() as $cron ) { + if ( isset( $cron[ self::CRON_ACTION ] ) ) { + foreach ( $cron[ self::CRON_ACTION ] as $event ) { + + $data = reset( $event['args'] ); + + if ( ! empty( $data['pending'] ) ) + $list[] = $data; + + } + } + } + + return $list; + } + + /** + * @return void + * @since 1.0 + */ + public static function hook_cron_action() { + add_action( self::CRON_ACTION, array( __CLASS__, 'cron_action' ) ); + } + +} \ No newline at end of file diff --git a/inc/options.php b/inc/options.php new file mode 100644 index 0000000..8e7d028 --- /dev/null +++ b/inc/options.php @@ -0,0 +1,84 @@ +get_options(), array( + 'endpoint' => '_minify', + 'default_exclude_remote_dependencies' => true, + 'cache_control_max_age_cache' => 2629743, // 1 month in seconds + 'cache_control_max_age_error' => 60 * 60, // 1 hour, to try minifying again + 'allow_not_modified_responses' => true, // only needs to be true if not Akamaized and max-age is short + 'admin_page_capability' => 'edit_theme_options', + 'show_error_messages' => ( defined( 'WP_DEBUG' ) && WP_DEBUG ), + 'disable_if_wp_debug' => true, + 'exclude_dependencies' => array(), + 'disabled_on_conditions' => array( + 'all' => false, + 'loggedin' => false, + 'admin' => false, + 'queryvar' => false, + ), + ) ); + + $options = apply_filters( 'dependency_minification_options', $options ); + + parent::__construct( $options ); + + } + + /** + * @access protected + * @return array + * @since 1.0 + */ + protected function get_options() { + return get_option( 'dependency_minification_options', array() ); + } + + /** + * @access protected + * @return bool + * @since 1.0 + */ + protected function set_options( array $options ) { + return update_option( 'dependency_minification_options', $options ); + } + + /*** ArrayObject Methods **************************************************/ + + public function exchangeArray( array $input ) { + + if ( $this->set_options( $input ) ) + return parent::exchangeArray( $input ); + + } + + public function offsetSet( $index, $newval ) { + + $options = $this->get_options(); + $options[ $index ] = $newval; + + if ( $this->set_options( $options ) ) + parent::offsetSet( $index, $newval ); + + } + + public function offsetUnset( $index ) { + + $options = $this->get_options(); + unset( $options[ $index ] ); + + if ( $this->set_options( $options ) ) + parent::offsetUnset( $index ); + + } + +}