Update dev-lib and fix codesniff issues

WordPoints · Dec 5, 2016 · ffcbd2f · ffcbd2f
1 parent c1c4331
commit ffcbd2f
Show file tree

Hide file tree

Showing 25 changed files with 43 additions and 36 deletions.
diff --git a/.wordpoints-dev-lib-config.sh b/.wordpoints-dev-lib-config.sh
@@ -8,6 +8,12 @@ function wordpoints-dev-lib-config() {
 
 	# This needs to be set for caching to work.
 	export WP_HTTP_TC_HOST=example.com
+
+	# Exclude WP HTTP TestCase cache files from the disallowed strings check.
+	CODESNIFF_PATH_STRINGS=("${CODESNIFF_PATH_STRINGS[@]}" '!' -path './tests/phpunit/cache/wp-http-tc/*')
+
+	# Ignore lines that currently still need to have 'http' in them.
+	CODESNIFF_IGNORED_STRINGS=("${CODESNIFF_IGNORED_STRINGS[@]}" -e http://example.org -e 'this->url')
 }
 
 # EOF
diff --git a/LICENSE b/LICENSE
@@ -1,7 +1,7 @@
 GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <https://fsf.org/>
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.

diff --git a/dev-lib b/dev-lib
diff --git a/src/admin/includes/apis/edd-software-licensing.php b/src/admin/includes/apis/edd-software-licensing.php
@@ -360,8 +360,10 @@ public function wordpoints_modules_list_table_items( $modules ) {
 				} else {
 					wordpoints_show_admin_message( esc_html__( 'License deactivated.', 'wordpointsorg' ) );
 				}
-			}
-		}
+
+			} // End if ( activating license ) elseif ( deactivating license ).
+
+		} // End foreach ( $modules['all'] as $module ).
 
 		return $modules;
 	}

diff --git a/src/admin/includes/functions.php b/src/admin/includes/functions.php
@@ -640,7 +640,8 @@ function wordpointsorg_module_update_row( $file, $module_data ) {
 		</tr>
 
 		<?php
-	}
+
+	} // End if ( is_network_admin() || ! is_multisite() ).
 }
 
 /**

diff --git a/src/languages/wordpointsorg.pot b/src/languages/wordpointsorg.pot
@@ -252,13 +252,13 @@ msgid "WordPoints"
 msgstr ""
 
 #. Author URI of the module
-msgid "http://wordpoints.org/"
+msgid "https://wordpoints.org/"
 msgstr ""
 
 #. Module Name of the module
 msgid "WordPoints.org Modules"
 msgstr ""
 
 #. Module URI of the module
-msgid "http://wordpoints.org/modules/wordpoints-org/"
+msgid "https://wordpoints.org/modules/wordpoints-org/"
 msgstr ""
diff --git a/src/wordpointsorg.php b/src/wordpointsorg.php
@@ -12,8 +12,8 @@
 	'
 		Module Name: WordPoints.org Modules
 		Author:      WordPoints
-		Author URI:  http://wordpoints.org/
-		Module URI:  http://wordpoints.org/modules/wordpoints-org/
+		Author URI:  https://wordpoints.org/
+		Module URI:  https://wordpoints.org/modules/wordpoints-org/
 		Version:     1.1.4
 		License:     GPLv2+
 		Description: Update modules from WordPoints.org through your admin panel.

diff --git a/tests/phpunit/data/module-packages/module-6.zip b/tests/phpunit/data/module-packages/module-6.zip
diff --git a/tests/phpunit/data/module-packages/module-6/module-6.php b/tests/phpunit/data/module-packages/module-6/module-6.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Test 6
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Plugin URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Plugin URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/module-packages/module-7-update.bk.zip b/tests/phpunit/data/module-packages/module-7-update.bk.zip
diff --git a/tests/phpunit/data/module-packages/module-7-update/module-7.php b/tests/phpunit/data/module-packages/module-7-update/module-7.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Module 7
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.1
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/module-packages/module-7.zip b/tests/phpunit/data/module-packages/module-7.zip
diff --git a/tests/phpunit/data/module-packages/module-7/module-7.php b/tests/phpunit/data/module-packages/module-7/module-7.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Module 7
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/module-packages/module-8.zip b/tests/phpunit/data/module-packages/module-8.zip
diff --git a/tests/phpunit/data/module-packages/module-8/module-8.php b/tests/phpunit/data/module-packages/module-8/module-8.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Module 8
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/module-packages/no-module.bk.zip b/tests/phpunit/data/module-packages/no-module.bk.zip
diff --git a/tests/phpunit/data/module-packages/no-module/library/module.php b/tests/phpunit/data/module-packages/no-module/library/module.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Sub module
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/module-packages/no-module/module.txt b/tests/phpunit/data/module-packages/no-module/module.txt
@@ -3,8 +3,8 @@
 /**
  * Module Name: Not a module
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/module-packages/no-module/plugin.php b/tests/phpunit/data/module-packages/no-module/plugin.php
@@ -3,8 +3,8 @@
 /**
  * Plugin Name: Not a module
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Plugin URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Plugin URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/modules/module-7/module-7.php b/tests/phpunit/data/modules/module-7/module-7.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Module 7
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/modules/module-8/module-8.php b/tests/phpunit/data/modules/module-8/module-8.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Module 8
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/modules/test-1.php b/tests/phpunit/data/modules/test-1.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Test 1
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tests/phpunit/data/modules/test-2.php b/tests/phpunit/data/modules/test-2.php
@@ -3,8 +3,8 @@
 /**
  * Module Name: Test 2
  * Author:      J.D. Grimes
- * Author URI:  http://codesymphony.co/
- * Module URI:  http://codesymphony.co/
+ * Author URI:  https://codesymphony.co/
+ * Module URI:  https://codesymphony.co/
  * Version:     1.0.0
  * License:     GPLv2+
  * Description: Description.

diff --git a/tools/wp-l10n-validator/cache.json b/tools/wp-l10n-validator/cache.json
@@ -11,8 +11,8 @@
             "errors": false
         },
         "\/admin\/includes\/apis\/edd-software-licensing.php": {
-            "size": 20115,
-            "hash": "1ee05936abf4bc4d05cd90d20be8e103",
+            "size": 20116,
+            "hash": "9b01bae6cc714691ed8c1f2d554e23e1",
             "errors": false
         },
         "\/admin\/includes\/class-bulk-module-upgrader-skin.php": {
@@ -71,5 +71,5 @@
             "errors": false
         }
     },
-    "config_signature": "50004c7a59d855e646f34b5aa3dfcf00"
+    "config_signature": "c3b6985eed6e2932c09bfa8dd0c1fb43"
 }
diff --git a/tools/wp-l10n-validator/ignores-cache.json b/tools/wp-l10n-validator/ignores-cache.json
@@ -18,8 +18,6 @@
             "438": false
         },
         "-": {
-            "441": false,
-            "445": false,
             "446": false
         }
     },
+5 −3		.travis.yml
+30 −0		CHANGELOG.md
+19 −5		bin/env.sh
+85 −12		bin/functions.sh
+30 −6		bin/init.sh
+9 −2		bin/update-version.sh
+8 −0		bin/update-year.sh
+11 −4		bin/verify-php-autoloader
+2 −0		git/.gitignore
+51 −0		grunt/Gruntfile.js
+7 −0		grunt/package.json
+7 −5		grunt/tasks/autoloader.js
+1 −0		jshint/.jshintrc
+1 −0		l10n-validator/php.php
+119 −5		l10n-validator/wordpoints.php
+2 −0		l10n-validator/wordpress.php
+5 −0		phpcs/WordPoints/Sniffs/PHP/DisallowedFunctionsSniff.php
+2 −0		phpcs/WordPoints/Sniffs/PHP/MissingEchoSniff.php
+2 −0		phpcs/WordPoints/Tests/PHP/DisallowedFunctionsUnitTest.inc
+1 −0		phpcs/WordPoints/Tests/PHP/DisallowedFunctionsUnitTest.php
+18 −4		phpcs/WordPoints/ruleset.xml
+128 −0		phpunit/classes/class/autoloader.php
+35 −0		phpunit/classes/testcase/module/uninstall.php
+20 −0		phpunit/composer.json
+95 −2		phpunit/functions.php
+59 −3		phpunit/module-bootstrap.php
+16 −0		phpunit/phpunit.uninstall.xml.dist
+17 −0		phpunit/simulate-module-use.php
+53 −0		phpunit/test-uninstall.php
+20 −0		phpunit/test.php
+104 −0		phpunit/wpppb-init
+19 −0		run
+35 −6		travis/commands.sh
+3 −2		travis/module.yml
+3 −2		travis/wordpoints.yml
+1 −1		wpcept/bootstrap.php
+163 −20		wpcept/includes/AcceptanceTester.php
+52 −0		wpcept/includes/BlackHoleCache.php
+60 −0		wpcept/includes/Element.php
+133 −0		wpcept/includes/Element/Reaction.php
+48 −0		wpcept/includes/Element/ReactionCondition.php
+55 −31		wpcept/includes/Modules/WordPointsLoader.php
+4 −4		wpcept/includes/TestLoader.php
+1 −1		wpcept/module.yml
+3 −3		wpcept/scaffold/_support/AcceptanceTester.php
+2 −2		wpcept/scaffold/acceptance/bootstrap.php
+1 −1		wpcept/wordpoints.yml
-Original file line number
+Diff line change
@@ Expand Up @@
     		</tr>
     		<?php
-    	}
+    	} // End if ( is_network_admin() || ! is_multisite() ).
     }
     /**
@@ Expand Down @@