user helper to ensure upper and lower bounds

Author: trepmal

concat-utils.php

@@ -5,6 +5,12 @@
 }
 
 class WPCOM_Concat_Utils {
+
+	public static function get_concat_max() {
+		// no less than 10, no more than 150
+		return min( max( intval( VIP_CONCAT_MAX ), 10 ), 150 );
+	}
+
 	public static function is_internal_url( $test_url, $site_url ) {
 		$test_url_parsed = parse_url( is_string( $test_url ) ? $test_url : '' );
 		$site_url_parsed = parse_url( $site_url );

cssconcat.php

@@ -99,7 +99,7 @@ function do_items( $handles = false, $group = false ) {
 
 				$stylesheets[ $stylesheet_group_index ][ $media ][ $handle ] = $css_url_parsed['path'];
 
-				if ( count( $stylesheets[ $stylesheet_group_index ][ $media ] ) >= VIP_CONCAT_MAX ) {
+				if ( count( $stylesheets[ $stylesheet_group_index ][ $media ] ) >= WPCOM_Concat_Utils::get_concat_max() ) {
 					$stylesheet_group_index++;
 				}
 				$this->done[] = $handle;

jsconcat.php

@@ -129,7 +129,7 @@ function do_items( $handles = false, $group = false ) {
 				$javascripts[$level]['paths'][] = $js_url_parsed['path'];
 				$javascripts[$level]['handles'][] = $handle;
 
-				if ( count( $javascripts[$level]['paths'] ) >= VIP_CONCAT_MAX ) {
+				if ( count( $javascripts[$level]['paths'] ) >= WPCOM_Concat_Utils::get_concat_max() ) {
 					$level++;
 				}
 

ngx-http-concat.php

@@ -113,7 +113,7 @@ function concat_get_path( $uri ) {
 	concat_http_status_exit( 400 );
 
 // array( '/foo/bar.css', '/foo1/bar/baz.css' )
-if ( 0 == count( $args ) || count( $args ) > VIP_CONCAT_MAX )
+if ( 0 == count( $args ) || count( $args ) > WPCOM_Concat_Utils::get_concat_max() )
 	concat_http_status_exit( 400 );
 
 // If we're in a subdirectory context, use that as the root.