Skip to content

Commit 446ee95

Browse files
authored
Release 2.8.12 (#1159)
* Bump version to 2.8.12 * Update dependencies * Update translations POT file
1 parent e05a458 commit 446ee95

11 files changed

+522
-435
lines changed

DbCache_WpdbLegacy.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ class DbCache_WpdbLegacy extends DbCache_WpdbBase {
5555
/**
5656
* Constructor for initializing the DbCache_WpdbLegacy class.
5757
*
58-
* @param array|null $processors Array of processors to initialize.
58+
* @param array $processors Array of processors to initialize.
5959
*
60-
* @throws Exception If the processors parameter is invalid.
60+
* @throws \Exception If the processors parameter is invalid.
6161
*
6262
* @return void
6363
*/
64-
public function __construct( $processors = null ) {
64+
public function __construct( $processors = array() ) {
6565
// required to initialize $use_mysqli which is private.
6666
parent::__construct( '', '', '', '' );
6767

6868
// cant force empty parameter list due to wp requirements.
6969
if ( ! is_array( $processors ) ) {
70-
throw new Exception( esc_html__( 'Called incorrectly, use instance().', 'w3-total-cache' ) );
70+
throw new \Exception( esc_html__( 'Called incorrectly, use instance().', 'w3-total-cache' ) );
7171
}
7272

7373
$this->processors = $processors;
@@ -101,9 +101,8 @@ public function on_w3tc_plugins_loaded() {
101101
/**
102102
* Modifies the footer comment for W3TC.
103103
*
104-
* @param string $strings The footer comment strings.
105-
*
106-
* @return string Modified footer comment strings.
104+
* @param array $strings The footer comment strings.
105+
* @return array Modified footer comment strings.
107106
*/
108107
public function w3tc_footer_comment( $strings ) {
109108
foreach ( $this->processors as $processor ) {

DbCache_WpdbNew.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ class DbCache_WpdbNew extends DbCache_WpdbBase {
5555
/**
5656
* Initializes the DbCache_WpdbNew object.
5757
*
58-
* @param array|null $processors List of processors for this object.
58+
* @param array $processors List of processors for this object.
5959
*
60-
* @throws Exception If processors is not an array.
60+
* @throws \Exception If processors is not an array.
6161
*
6262
* @return void
6363
*/
64-
public function __construct( $processors = null ) {
64+
public function __construct( $processors = array() ) {
6565
// required to initialize $use_mysqli which is private.
6666
parent::__construct( '', '', '', '' );
6767

6868
// cant force empty parameter list due to wp requirements.
6969
if ( ! is_array( $processors ) ) {
70-
throw new Exception( esc_html__( 'Called incorrectly, use instance().', 'w3-total-cache' ) );
70+
throw new \Exception( esc_html__( 'Called incorrectly, use instance().', 'w3-total-cache' ) );
7171
}
7272

7373
$this->processors = $processors;
@@ -101,9 +101,8 @@ public function on_w3tc_plugins_loaded() {
101101
/**
102102
* Adds footer comments for W3TC.
103103
*
104-
* @param string $strings The footer strings to be modified.
105-
*
106-
* @return string Modified footer strings.
104+
* @param array $strings The footer strings to be modified.
105+
* @return array Modified footer strings.
107106
*/
108107
public function w3tc_footer_comment( $strings ) {
109108
foreach ( $this->processors as $processor ) {

Extension_FragmentCache_WpObjectCache.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -592,9 +592,8 @@ private function _can_cache() {
592592
/**
593593
* Returns debug info
594594
*
595-
* @param array $strings Strings.
596-
*
597-
* @return string
595+
* @param array $strings Strings.
596+
* @return array
598597
*/
599598
public function w3tc_footer_comment( $strings ) {
600599
$append = '' !== $this->cache_reject_reason ? sprintf( ' (%s)', $this->cache_reject_reason ) : '';

ObjectCache_Plugin.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,8 @@ public function w3tc_admin_bar_menu( $menu_items ) {
154154
/**
155155
* Adds a footer comment related to object cache to the strings.
156156
*
157-
* @param string $strings Existing footer strings.
158-
*
159-
* @return string Modified footer strings.
157+
* @param array $strings Existing footer strings.
158+
* @return array Modified footer strings.
160159
*/
161160
public function w3tc_footer_comment( $strings ) {
162161
$o = Dispatcher::component( 'ObjectCache_WpObjectCache_Regular' );

bin/release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ find vendor/ -name '.git' -type d -print -exec rm -rf {} +
99

1010
# Cleanup development and build contents.
1111
rm -f codecov coverage.xml package.* phpcs.xml
12-
rm -rf qa
12+
rm -rf .github qa
1313

1414
# Find and replace symlinks in the "vendor" directory.
1515
for i in $(find vendor/ -type l); do \cp -f --remove-destination $(realpath $i) $i;done

0 commit comments

Comments
 (0)