Merge staging with master (v6.1)

EvanHerman · Jul 11, 2016 · 1df65a8 · 1df65a8
1 parent 2f95aac
commit 1df65a8
Show file tree

Hide file tree

Showing 47 changed files with 3,749 additions and 649 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,51 +1,51 @@
-language: php
-
-sudo: false
-
-php:
-- 5.3
-- 5.4
-- 5.5
-- 5.6
-- 7.0
-- hhvm
-
-env:
-- WP_VERSION=latest WP_MULTISITE=0
-- WP_VERSION=4.4 WP_MULTISITE=0
-- WP_VERSION=4.3 WP_MULTISITE=0
-- WP_VERSION=4.2 WP_MULTISITE=0
-- WP_VERSION=4.1 WP_MULTISITE=0
-- WP_VERSION=4.0 WP_MULTISITE=0
-
-matrix:
-  include:
-    - php: 5.4
-      env: WP_VERSION=latest WP_MULTISITE=1
-  exclude:
-    - php: hhvm
-      env: WP_VERSION=4.0 WP_MULTISITE=0
-    - php: 5.3
-      env: WP_VERSION=latest WP_MULTISITE=0
-
-before_script:
-    - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
-
-script:
-- if [[ $TRAVIS_PHP_VERSION = '5.5' && $WP_VERSION = 'latest' && $WP_MULTISITE = '0'
-  ]]; then phpunit --coverage-clover=coverage.clover; else phpunit; fi
-
-after_script:
-- if [[ $TRAVIS_PHP_VERSION = '5.5' && $WP_VERSION = 'latest' && $WP_MULTISITE = '0'
-  ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-- if [[ $TRAVIS_PHP_VERSION = '5.5' && $WP_VERSION = 'latest' && $WP_MULTISITE = '0'
-  ]]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover;
-  fi
-
-
-notifications:
-  email:
-    on_success: change
-    on_failure: change
-  slack:
-    secure: Vl+EtMXcpx8JowBmLNrWhAyvebu/VF7hXVFX5BFMl/6vA5GBE6hnw3vI/TlB6PAso4Mv6yMVY4xUzzBYWow3ClwaTCYNlCTxQEUon2H7FIqGV3Wrir28zxGcSAX7VHGf3w6acHP7LnPIQrIctRjKqcbYVbjR36ha9gJgUU/OUeI=
+language: php
+
+sudo: false
+
+php:
+- 5.3
+- 5.4
+- 5.5
+- 5.6
+- 7.0
+- hhvm
+
+env:
+- WP_VERSION=latest WP_MULTISITE=0
+- WP_VERSION=4.4 WP_MULTISITE=0
+- WP_VERSION=4.3 WP_MULTISITE=0
+- WP_VERSION=4.2 WP_MULTISITE=0
+- WP_VERSION=4.1 WP_MULTISITE=0
+- WP_VERSION=4.0 WP_MULTISITE=0
+
+matrix:
+  include:
+    - php: 5.4
+      env: WP_VERSION=latest WP_MULTISITE=1
+  exclude:
+    - php: hhvm
+      env: WP_VERSION=4.0 WP_MULTISITE=0
+    - php: 5.3
+      env: WP_VERSION=latest WP_MULTISITE=0
+
+before_script:
+    - bash bin/install-wp-tests.sh wordpress_test root '' localhost $WP_VERSION
+
+script:
+- if [[ $TRAVIS_PHP_VERSION = '5.5' && $WP_VERSION = 'latest' && $WP_MULTISITE = '0'
+  ]]; then phpunit --coverage-clover=coverage.clover; else phpunit; fi
+
+after_script:
+- if [[ $TRAVIS_PHP_VERSION = '5.5' && $WP_VERSION = 'latest' && $WP_MULTISITE = '0'
+  ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi
+- if [[ $TRAVIS_PHP_VERSION = '5.5' && $WP_VERSION = 'latest' && $WP_MULTISITE = '0'
+  ]]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover;
+  fi
+
+
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+  slack:
+    secure: Vl+EtMXcpx8JowBmLNrWhAyvebu/VF7hXVFX5BFMl/6vA5GBE6hnw3vI/TlB6PAso4Mv6yMVY4xUzzBYWow3ClwaTCYNlCTxQEUon2H7FIqGV3Wrir28zxGcSAX7VHGf3w6acHP7LnPIQrIctRjKqcbYVbjR36ha9gJgUU/OUeI=
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,32 +1,32 @@
 'use strict';
 module.exports = function(grunt) {
 
-    grunt.initConfig({
-	
-        // js minification
-        uglify: {
-            dist: {
-                files: {
+	grunt.initConfig({
+
+		// js minification
+		uglify: {
+			dist: {
+				files: {
 					// admin scripts
-                    'admin/js/min/yikes-inc-easy-mailchimp-dashboard-widget.min.js': [ // widget specific script
-                        'admin/js/yikes-inc-easy-mailchimp-dashboard-widget.js'
-                    ],
-                    'admin/js/min/yikes-inc-easy-mailchimp-extender-admin.min.js': [ // global admin script
-                        'admin/js/yikes-inc-easy-mailchimp-extender-admin.js'
-                    ],
+					'admin/js/min/yikes-inc-easy-mailchimp-dashboard-widget.min.js': [ // widget specific script
+						'admin/js/yikes-inc-easy-mailchimp-dashboard-widget.js'
+					],
+					'admin/js/min/yikes-inc-easy-mailchimp-extender-admin.min.js': [ // global admin script
+						'admin/js/yikes-inc-easy-mailchimp-extender-admin.js'
+					],
 					'admin/js/min/yikes-inc-easy-mailchimp-extender-edit-form.min.js': [ // edit MailChimp form script
-                        'admin/js/yikes-inc-easy-mailchimp-extender-edit-form.js'
-                    ],
+						'admin/js/yikes-inc-easy-mailchimp-extender-edit-form.js'
+					],
 					'admin/js/min/yikes-inc-easy-mailchimp-tinymce-button.min.js': [ // custom tinyMCE button script
-                        'admin/js/yikes-inc-easy-mailchimp-tinymce-button.js'
-                    ],
+						'admin/js/yikes-inc-easy-mailchimp-tinymce-button.js'
+					],
 					// public scripts
 					'public/js/yikes-mc-ajax-forms.min.js': [ // public ajax script
-                        'public/js/yikes-mc-ajax-forms.js'
-                    ],
-                }
-            }
-        },
+						'public/js/yikes-mc-ajax-forms.js'
+					],
+				}
+			}
+		},
 
 		// css minify all contents of our directory and add .min.css extension
 		cssmin: {
@@ -58,8 +58,8 @@ module.exports = function(grunt) {
 			}
 		},
 
-        // watch our project for changes
-       watch: {
+		// watch our project for changes
+		watch: {
 			admin_css: { // admin css
 				files: 'admin/css/*.css',
 				tasks: ['cssmin'],
@@ -94,7 +94,7 @@ module.exports = function(grunt) {
 				},
 			},
 		},
-		
+
 		// Borwser Sync
 		browserSync: {
 			bsFiles: {
@@ -105,44 +105,53 @@ module.exports = function(grunt) {
 				watchTask : true
 			}
 		},
-		
+
 		// Autoprefixer for our CSS files
 		postcss: {
 			options: {
-                map: true,
-                processors: [
-                    require('autoprefixer-core')({
-                        browsers: ['last 2 versions']
-                    })
-                ]
-            },
+				map: true,
+				processors: [
+					require( 'autoprefixer-core' ) ({
+						browsers: ['last 2 versions']
+					})
+				]
+			},
 			dist: {
-			  src: [ 'admin/css/*.css' , 'public/css/*.css' ]
+				src: [ 'admin/css/*.css' , 'public/css/*.css' ]
 			}
 		},
-		
-		auto_install: { 
+
+		auto_install: {
 			local: {}
 		},
-
-    });
 
-    // load tasks
-    grunt.loadNpmTasks('grunt-contrib-uglify');
-    grunt.loadNpmTasks('grunt-contrib-cssmin');
+		/* Delete the error log - gets recreated in the next step */
+		clean: ['includes/error_log/yikes-easy-mailchimp-error-log.php' ],
+
+	});
+
+	// load tasks
+	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.loadNpmTasks('grunt-contrib-cssmin');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-browser-sync'); // browser-sync auto refresh
 	grunt.loadNpmTasks('grunt-postcss'); // CSS autoprefixer plugin (cross-browser auto pre-fixes)
 	grunt.loadNpmTasks('grunt-wp-i18n'); // wordpress localization plugin
 	grunt.loadNpmTasks('grunt-auto-install'); // autoload all of ourd ependencies (ideally, you install this one package, and run grunt auto_install to install our dependencies automagically)
+	grunt.loadNpmTasks('grunt-contrib-clean');
 
     // register task
-    grunt.registerTask('default', [
-		'uglify',
-        'cssmin',
-		'postcss',
-		'browserSync',
-        'watch',
+    grunt.registerTask( 'default', [
+			'uglify',
+			'cssmin',
+			'postcss',
+			'clean',
+			'emptyFile',
+			'watch',
     ]);
 
-};
+		grunt.registerTask( 'emptyFile', 'Creates an empty file', function() {
+			grunt.file.write('includes/error_log/yikes-easy-mailchimp-error-log.php', '');
+		});
+
+};