Completed
Pull Request — master (#223)
by
unknown
01:56
created
classes/autoptimizeBase.php 2 patches
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
      *
65 65
      * @param string $url URL to transform.
66 66
      *
67
-     * @return bool|string
67
+     * @return false|string
68 68
      */
69 69
     public function getpath( $url )
70 70
     {
@@ -610,7 +610,7 @@  discard block
 block discarded – undo
610 610
     /**
611 611
      * Logs given `$data` for debugging purposes (when debug logging is on).
612 612
      *
613
-     * @param mixed $data Data to log.
613
+     * @param string $data Data to log.
614 614
      *
615 615
      * @return void
616 616
      */
@@ -632,7 +632,7 @@  discard block
 block discarded – undo
632 632
      *
633 633
      * @param string $filepath Filepath.
634 634
      *
635
-     * @return bool|string to be minified code or false.
635
+     * @return false|string to be minified code or false.
636 636
      */
637 637
     protected function prepare_minify_single( $filepath )
638 638
     {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -412,7 +412,7 @@
 block discarded – undo
412 412
          * First element is the filepath, second is the md5 hash of contents
413 413
          * the filepath had when it was being processed.
414 414
          * If we don't have those, we'll bail out early.
415
-        */
415
+         */
416 416
         $filepath = null;
417 417
         $filehash = null;
418 418
 
Please login to merge, or discard this patch.
classes/autoptimizeCache.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -434,7 +434,7 @@
 block discarded – undo
434 434
      * size = total filesize (in bytes) of found files
435 435
      * timestamp = unix timestamp when the scan was last performed/finished.
436 436
      *
437
-     * @return array
437
+     * @return integer[]
438 438
      */
439 439
     protected static function stats_scan()
440 440
     {
Please login to merge, or discard this patch.
classes/autoptimizeConfig.php 1 patch
Doc Comments   +6 added lines patch added patch discarded remove patch
@@ -752,6 +752,9 @@  discard block
 block discarded – undo
752 752
         return $preload_onload;
753 753
     }
754 754
 
755
+    /**
756
+     * @param string $key
757
+     */
755 758
     public function get($key)
756 759
     {
757 760
         if ( ! is_array( $this->config ) ) {
@@ -778,6 +781,9 @@  discard block
 block discarded – undo
778 781
         return false;
779 782
     }
780 783
 
784
+    /**
785
+     * @param string $url
786
+     */
781 787
     private function getFutttaFeeds($url) {
782 788
         if ( $this->settings_screen_do_remote_http ) {
783 789
             $rss = fetch_feed( $url );
Please login to merge, or discard this patch.
classes/autoptimizeExtra.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -437,6 +437,9 @@
 block discarded – undo
437 437
         }
438 438
     }
439 439
 
440
+    /**
441
+     * @return string
442
+     */
440 443
     private function get_imgopt_base_url()
441 444
     {
442 445
         static $imgopt_base_url = null;
Please login to merge, or discard this patch.
classes/autoptimizeHTML.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
     /**
105 105
      * Doesn't do much in case of HTML (no cache in css/js sense there)
106 106
      *
107
-     * @return true
107
+     * @return boolean
108 108
      */
109 109
     public function cache()
110 110
     {
Please login to merge, or discard this patch.
classes/autoptimizeMain.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -253,7 +253,7 @@
 block discarded – undo
253 253
      *
254 254
      * @param bool $doing_tests Allows overriding the optimization of only
255 255
      *                          deciding once per request (for use in tests).
256
-     * @return bool
256
+     * @return boolean|null
257 257
      */
258 258
     public function should_buffer( $doing_tests = false )
259 259
     {
Please login to merge, or discard this patch.
classes/autoptimizeScripts.php 1 patch
Doc Comments   +9 added lines, -1 removed lines patch added patch discarded remove patch
@@ -418,6 +418,10 @@  discard block
 block discarded – undo
418 418
     }
419 419
 
420 420
     // Checks against the white- and blacklists
421
+
422
+    /**
423
+     * @param string $tag
424
+     */
421 425
     private function ismergeable($tag)
422 426
     {
423 427
         if ( ! $this->aggregate ) {
@@ -457,6 +461,10 @@  discard block
 block discarded – undo
457 461
     }
458 462
 
459 463
     // Checks agains the blacklist
464
+
465
+    /**
466
+     * @param string $tag
467
+     */
460 468
     private function ismovable($tag)
461 469
     {
462 470
         if ( true !== $this->include_inline || apply_filters( 'autoptimize_filter_js_unmovable', true ) ) {
@@ -538,7 +546,7 @@  discard block
 block discarded – undo
538 546
      * @param string $filepath Filepath.
539 547
      * @param bool $cache_miss Optional. Force a cache miss. Default false.
540 548
      *
541
-     * @return bool|string Url pointing to the minified js file or false.
549
+     * @return false|string Url pointing to the minified js file or false.
542 550
      */
543 551
     public function minify_single( $filepath, $cache_miss = false )
544 552
     {
Please login to merge, or discard this patch.
config/default.php 1 patch
Indentation   +42 added lines, -42 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@  discard block
 block discarded – undo
2 2
 
3 3
 //Check everything exists before using it
4 4
 if(!isset($_SERVER['HTTP_ACCEPT_ENCODING']))
5
-	$_SERVER['HTTP_ACCEPT_ENCODING'] = '';
5
+    $_SERVER['HTTP_ACCEPT_ENCODING'] = '';
6 6
 if(!isset($_SERVER['HTTP_USER_AGENT']))
7
-	$_SERVER['HTTP_USER_AGENT'] = '';
7
+    $_SERVER['HTTP_USER_AGENT'] = '';
8 8
 
9 9
 // Determine supported compression method
10 10
 $gzip = strstr($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip');
@@ -15,30 +15,30 @@  discard block
 block discarded – undo
15 15
 
16 16
 // Check for buggy versions of Internet Explorer
17 17
 if (!strstr($_SERVER['HTTP_USER_AGENT'], 'Opera') &&
18
-	preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
18
+    preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches))
19 19
 {
20
-	$version = floatval($matches[1]);
20
+    $version = floatval($matches[1]);
21 21
 
22
-	if ($version < 6)
23
-		$encoding = 'none';
22
+    if ($version < 6)
23
+        $encoding = 'none';
24 24
 
25
-	if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
26
-		$encoding = 'none';
25
+    if ($version == 6 && !strstr($_SERVER['HTTP_USER_AGENT'], 'EV1'))
26
+        $encoding = 'none';
27 27
 }
28 28
 
29 29
 //Some servers compress the output of PHP - Don't break in those cases
30 30
 if(ini_get('output_handler') == 'ob_gzhandler' || ini_get('zlib.output_compression') == 1)
31
-	$encoding = 'none';
31
+    $encoding = 'none';
32 32
 
33 33
 $iscompressed = file_exists(__FILE__.'.'.$encoding);
34 34
 if($encoding != 'none' && $iscompressed == false)
35 35
 {
36
-	$flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
37
-	$code = file_get_contents(__FILE__.'.none');
38
-	$contents = gzencode($code,9,$flag);
36
+    $flag = ($encoding == 'gzip' ? FORCE_GZIP : FORCE_DEFLATE);
37
+    $code = file_get_contents(__FILE__.'.none');
38
+    $contents = gzencode($code,9,$flag);
39 39
 }else{
40
-	//Get data
41
-	$contents = file_get_contents(__FILE__.'.'.$encoding);
40
+    //Get data
41
+    $contents = file_get_contents(__FILE__.'.'.$encoding);
42 42
 }
43 43
 
44 44
 // first check if we have to send 304
@@ -52,36 +52,36 @@  discard block
 block discarded – undo
52 52
 $modTimeMatch = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']) === $modTime);
53 53
 
54 54
 if (($modTimeMatch)||($eTagMatch)) {
55
-	header('HTTP/1.1 304 Not Modified');
56
-	header('Connection: close');
55
+    header('HTTP/1.1 304 Not Modified');
56
+    header('Connection: close');
57 57
 } else {
58
-	// send all sorts of headers
59
-	$expireTime=60*60*24*355; // 1y max according to RFC
60
-	if ($encoding != 'none') {
61
-		header('Content-Encoding: '.$encoding);
62
-	}
63
-	header('Vary: Accept-Encoding');
64
-	header('Content-Length: '.strlen($contents));
65
-	header('Content-type: %%CONTENT%%; charset=utf-8');
66
-	header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
67
-	header('Cache-Control: max-age='.$expireTime.', public, immutable');
68
-	header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
69
-	header('ETag: ' . $eTag);
70
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
58
+    // send all sorts of headers
59
+    $expireTime=60*60*24*355; // 1y max according to RFC
60
+    if ($encoding != 'none') {
61
+        header('Content-Encoding: '.$encoding);
62
+    }
63
+    header('Vary: Accept-Encoding');
64
+    header('Content-Length: '.strlen($contents));
65
+    header('Content-type: %%CONTENT%%; charset=utf-8');
66
+    header('Cache-Control: max-age='.$expireTime.', public, must-revalidate');
67
+    header('Cache-Control: max-age='.$expireTime.', public, immutable');
68
+    header('Expires: '.gmdate('D, d M Y H:i:s', time() + $expireTime).' GMT');
69
+    header('ETag: ' . $eTag);
70
+    header('Last-Modified: '.gmdate('D, d M Y H:i:s', $modTime).' GMT');
71 71
 
72
-	// send output
73
-	echo $contents;
72
+    // send output
73
+    echo $contents;
74 74
 
75
-	//And write to filesystem cache if not done yet
76
-	if($encoding != 'none' && $iscompressed == false)
77
-	{
78
-		//Write the content we sent
79
-		file_put_contents(__FILE__.'.'.$encoding,$contents);
75
+    //And write to filesystem cache if not done yet
76
+    if($encoding != 'none' && $iscompressed == false)
77
+    {
78
+        //Write the content we sent
79
+        file_put_contents(__FILE__.'.'.$encoding,$contents);
80 80
 
81
-		//And write the new content
82
-		$flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
83
-		$ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
84
-		$contents = gzencode($code,9,$flag);
85
-		file_put_contents(__FILE__.'.'.$ext,$contents);
86
-	}
81
+        //And write the new content
82
+        $flag = ($encoding == 'gzip' ? FORCE_DEFLATE : FORCE_GZIP);
83
+        $ext = ($encoding == 'gzip' ? 'deflate' : 'gzip');
84
+        $contents = gzencode($code,9,$flag);
85
+        file_put_contents(__FILE__.'.'.$ext,$contents);
86
+    }
87 87
 }
Please login to merge, or discard this patch.
classes/autoptimizeStyles.php 1 patch
Doc Comments   +19 added lines, -2 removed lines patch added patch discarded remove patch
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
282 282
      * be inlined into a data: URI. Defaults to 4096, passed through
283 283
      * `autoptimize_filter_css_datauri_maxsize` filter.
284 284
      *
285
-     * @return mixed
285
+     * @return integer|null
286 286
      */
287 287
     private function get_datauri_maxsize()
288 288
     {
@@ -303,6 +303,9 @@  discard block
 block discarded – undo
303 303
         return $max_size;
304 304
     }
305 305
 
306
+    /**
307
+     * @param false|string $url
308
+     */
306 309
     private function check_datauri_exclude_list( $url )
307 310
     {
308 311
         static $exclude_list = null;
@@ -328,6 +331,9 @@  discard block
 block discarded – undo
328 331
         return $matched;
329 332
     }
330 333
 
334
+    /**
335
+     * @param false|string $path
336
+     */
331 337
     private function build_or_get_datauri_image( $path )
332 338
     {
333 339
         /**
@@ -746,6 +752,11 @@  discard block
 block discarded – undo
746 752
         return true;
747 753
     }
748 754
 
755
+    /**
756
+     * @param string $code
757
+     *
758
+     * @return string
759
+     */
749 760
     public function run_minifier_on( $code )
750 761
     {
751 762
         if ( ! $this->alreadyminified ) {
@@ -945,6 +956,9 @@  discard block
 block discarded – undo
945 956
         return $code;
946 957
     }
947 958
 
959
+    /**
960
+     * @param string $tag
961
+     */
948 962
     private function ismovable( $tag )
949 963
     {
950 964
         if ( ! $this->aggregate ) {
@@ -1005,7 +1019,7 @@  discard block
 block discarded – undo
1005 1019
      * @param string $filepath Filepath.
1006 1020
      * @param bool   $cache_miss Optional. Force a cache miss. Default false.
1007 1021
      *
1008
-     * @return bool|string Url pointing to the minified css file or false.
1022
+     * @return false|string Url pointing to the minified css file or false.
1009 1023
      */
1010 1024
     public function minify_single( $filepath, $cache_miss = false )
1011 1025
     {
@@ -1057,6 +1071,9 @@  discard block
 block discarded – undo
1057 1071
         $this->options = $options;
1058 1072
     }
1059 1073
 
1074
+    /**
1075
+     * @param string $name
1076
+     */
1060 1077
     public function setOption( $name, $value )
1061 1078
     {
1062 1079
         $this->options[$name] = $value;
Please login to merge, or discard this patch.