Merge branch 'feature/add-trunk' into trunk

Author: jamesmorrison

composer.json

@@ -2,7 +2,7 @@
 	"name": "jamesmorrison/display-git-branch",
 	"description": "Display Git Branch",
 	"homepage": "https://github.com/jamesmorrison/display-git-branch",
-	"version": "0.1.0",
+	"version": "0.1.1",
 	"keywords": [
 		"wordpress"
 	],
@@ -11,8 +11,8 @@
 	"authors": [
 		{
 			"name": "James Morrison",
-			"email": "james@morrison.me",
-			"homepage": "http://www.jamesmorrison.me"
+			"email": "james@morrison.uk",
+			"homepage": "https://morrison.uk"
 		}
 	],
 	"support": {

display-git-branch.php

@@ -3,17 +3,19 @@
  * Plugin Name: Display Git Branch
  * Plugin URI:  https://github.com/jamesmorrison/display-git-branch/
  * Description: Shows which Git branch you're working on. Highlights configurable restricted branches in red.
- * Version:     0.1.0
+ * Version:     0.1.1
  * Author:      James Morrison
- * Author URI:  http://www.jamesmorrison.me/
+ * Author URI:  https://morrison.uk/
  * Text Domain: display-git-branch
+ *
+ * @package Display_Git_Branch
  **/
 
 // Security check
 defined( 'ABSPATH' ) || die();
 
 // Useful global constants
-define( 'DISPLAY_GIT_BRANCH_VERSION', '0.1.0' );
+define( 'DISPLAY_GIT_BRANCH_VERSION', '0.1.1' );
 define( 'DISPLAY_GIT_BRANCH_URL', plugin_dir_url( __FILE__ ) );
 define( 'DISPLAY_GIT_BRANCH_PATH', dirname( __FILE__ ) . '/' );
 define( 'DISPLAY_GIT_BRANCH_INC', DISPLAY_GIT_BRANCH_PATH . 'includes/' );

includes/core.php

@@ -96,8 +96,9 @@ function restricted_branches() {
 
 	return apply_filters( 'display_git_branch_restricted_branches',
 		[
-			'master',
-			'develop',
+			'trunk',
+			'master',  // WARNING: this will be deprecated in a future release
+			'develop', // WARNING: this will be deprecated in a future release
 		]
 	);