From 916f23de871942f21a906fb06289794eb94ee978 Mon Sep 17 00:00:00 2001
From: Zack Proser <zproser@cloudflare.com>
Date: Wed, 6 Mar 2019 12:19:25 -0800
Subject: [PATCH] Version bump to 3.3.3

---
 cloudflare.php |  2 +-
 composer.json  | 40 ++++++++++++++++++++--------------------
 config.js      |  2 +-
 readme.txt     | 15 +++++++++++----
 4 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/cloudflare.php b/cloudflare.php
index 4058670a..6f32fee5 100644
--- a/cloudflare.php
+++ b/cloudflare.php
@@ -3,7 +3,7 @@
 Plugin Name: Cloudflare
 Plugin URI: https://blog.cloudflare.com/new-wordpress-plugin/
 Description: Cloudflare speeds up and protects your WordPress site.
-Version: 3.3.2
+Version: 3.3.3
 Author: John Wineman, Furkan Yilmaz, Junade Ali (Cloudflare Team)
 License: BSD-3-Clause
 */
diff --git a/composer.json b/composer.json
index 01c65a42..31113632 100644
--- a/composer.json
+++ b/composer.json
@@ -3,32 +3,32 @@
         "psr-4": {
             "CF\\": "src/"
         }
-    },
-    "description": "A Cloudflare plugin for WordPress",
-    "license": "BSD-3-Clause",
-    "name": "cloudflare/wordpress-plugin",
+    }, 
+    "description": "A Cloudflare plugin for WordPress", 
+    "license": "BSD-3-Clause", 
+    "name": "cloudflare/wordpress-plugin", 
     "require": {
-        "cloudflare/cf-ip-rewrite": "^1.0.0",
-        "cloudflare/cloudflare-plugin-backend": "^1.1",
+        "cloudflare/cf-ip-rewrite": "^1.0.0", 
+        "cloudflare/cloudflare-plugin-backend": "^1.1", 
         "symfony/yaml": "~2.6"
-    },
+    }, 
     "require-dev": {
-        "johnkary/phpunit-speedtrap": "1.0.1",
-        "php-mock/php-mock-phpunit": "^1.1",
-        "phpunit/phpunit": "4.8.*",
-        "squizlabs/php_codesniffer": "2.*",
-        "wimg/php-compatibility": "*",
+        "johnkary/phpunit-speedtrap": "1.0.1", 
+        "php-mock/php-mock-phpunit": "^1.1", 
+        "phpunit/phpunit": "4.8.*", 
+        "squizlabs/php_codesniffer": "2.*", 
+        "wimg/php-compatibility": "*", 
         "simplyadmire/composer-plugins": "@dev"
-    },
+    }, 
     "scripts": {
-        "format": "php vendor/squizlabs/php_codesniffer/scripts/phpcs -d date.timezone=UTC -n --standard=phpcs.xml",
-        "test": "php vendor/phpunit/phpunit/phpunit",
-        "post-install-cmd": "@php-compatibility-install",
-        "post-update-cmd": "@php-compatibility-install",
+        "format": "php vendor/squizlabs/php_codesniffer/scripts/phpcs -d date.timezone=UTC -n --standard=phpcs.xml", 
+        "test": "php vendor/phpunit/phpunit/phpunit", 
+        "post-install-cmd": "@php-compatibility-install", 
+        "post-update-cmd": "@php-compatibility-install", 
         "php-compatibility-install": "rm -rf vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility; cp -rp vendor/wimg/php-compatibility vendor/squizlabs/php_codesniffer/CodeSniffer/Standards/PHPCompatibility"
-    },
+    }, 
     "_comment": [
         "php-compatibility-install comes from https://github.com/wimg/PHPCompatibility/issues/102#issuecomment-255778195"
-    ],
-    "version": "3.3.2"
+    ], 
+    "version": "3.3.3"
 }
\ No newline at end of file
diff --git a/config.js b/config.js
index 0dbef9bb..b0a3d426 100755
--- a/config.js
+++ b/config.js
@@ -25,5 +25,5 @@
     }, 
     "locale": "en", 
     "integrationName": "wordpress", 
-    "version": "3.3.2"
+    "version": "3.3.3"
 }
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 011791a2..7760a6f3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,9 +1,9 @@
 === Cloudflare ===
-Contributors: jwineman, furkan811, icyapril, manatarms
+Contributors: jwineman, furkan811, icyapril, manatarms, zproser
 Tags: cloudflare, seo, ssl, ddos, speed, security, cdn, performance, free
 Requires at least: 3.4
 Tested up to: 4.9.1
-Stable tag: 3.3.2
+Stable tag: 3.3.3
 License: BSD-3-Clause
 
 All of Cloudflare’s performance and security benefits in a simple one-click install of recommended settings specifically developed for WordPress.
@@ -83,11 +83,18 @@ Yes, Cloudflare works with, and helps speed up your site even more, if you have
 
 == Changelog ==
 
+= 3.3.3 - 2019-3-6 =
+
+*Fixed*
+
+* Bug in Hooks.php causing errors in PHP 7+
+* Bug preventing Autoptimize plugin's optimized asset urls from being used when present and when Cloudflare HTTP/2 Push was enabled
+
 = 3.3.2 - 2017-12-12 =
 
 *Fixed*
 
-* Bug in cf-ip-rewrite 
+* Bug in cf-ip-rewrite
 
 *Added*
 
@@ -115,7 +122,7 @@ Yes, Cloudflare works with, and helps speed up your site even more, if you have
 
 *Fixed*
 
-* Bug where domains which had capital letters not working. 
+* Bug where domains which had capital letters not working.
 * Bug where Automatic Cache Purge couldn't purge front page.
 * Bug related to work with IWP.
 * Bug where if PHP is compiled with ipv6-disable flag, it crashed the site.