From ee23391455545e54cc8649cbdbb772b5fa87eb6a Mon Sep 17 00:00:00 2001
From: USAMI Kenta <tadsan@pixiv.com>
Date: Sun, 29 Jul 2018 18:55:40 +0900
Subject: [PATCH] Replace php-mode project URL

GitHub-Issue: #387
Special-thanks: @ejmr
---
 Changelog.md                         | 24 ++++++++++++------------
 README.ja.md                         | 12 ++++++------
 README.md                            | 10 +++++-----
 php-mode-test.el                     |  4 ++--
 php-mode.el                          | 10 +++++-----
 php-project.el                       |  2 +-
 tests/README.md                      |  2 +-
 tests/comments.php                   |  2 +-
 tests/comments.php.faces             |  2 +-
 tests/issue-100.php                  |  2 +-
 tests/issue-102.php                  |  2 +-
 tests/issue-115.php                  |  2 +-
 tests/issue-124.php                  |  2 +-
 tests/issue-129.php                  |  2 +-
 tests/issue-130.php                  |  2 +-
 tests/issue-135.php                  |  2 +-
 tests/issue-136.php                  |  2 +-
 tests/issue-136.php.faces            |  2 +-
 tests/issue-14.php                   |  2 +-
 tests/issue-144.php                  |  2 +-
 tests/issue-145.php                  |  2 +-
 tests/issue-16.php                   |  2 +-
 tests/issue-174.php                  |  2 +-
 tests/issue-175.php                  |  2 +-
 tests/issue-178.php                  |  2 +-
 tests/issue-18.php                   |  8 ++++----
 tests/issue-184.php                  |  2 +-
 tests/issue-186.php                  |  2 +-
 tests/issue-19.php                   |  2 +-
 tests/issue-197.php                  |  2 +-
 tests/issue-197.php.faces            |  2 +-
 tests/issue-200.php                  |  2 +-
 tests/issue-201.php                  |  2 +-
 tests/issue-201.php.faces            |  2 +-
 tests/issue-21.php                   |  2 +-
 tests/issue-211.php                  |  2 +-
 tests/issue-22.php                   |  2 +-
 tests/issue-227.php                  |  2 +-
 tests/issue-237.php                  |  2 +-
 tests/issue-253.php                  |  2 +-
 tests/issue-259.php                  |  2 +-
 tests/issue-27.php                   |  2 +-
 tests/issue-28.php                   |  2 +-
 tests/issue-29.php                   |  2 +-
 tests/issue-305.php                  |  2 +-
 tests/issue-305.php.faces            |  2 +-
 tests/issue-333.php                  |  2 +-
 tests/issue-42.php                   |  2 +-
 tests/issue-439.php                  |  2 +-
 tests/issue-439.php.faces            |  2 +-
 tests/issue-443.php                  |  2 +-
 tests/issue-443.php.faces            |  2 +-
 tests/issue-53.php                   |  2 +-
 tests/issue-66-bracket-namespace.php |  2 +-
 tests/issue-66-multi-namespace.php   |  2 +-
 tests/issue-66-namespace.php         |  2 +-
 tests/issue-66-use-namespace.php     |  2 +-
 tests/issue-66.php                   |  2 +-
 tests/issue-68.php                   |  2 +-
 tests/issue-73.php                   |  2 +-
 tests/issue-8.php                    |  2 +-
 tests/issue-8.php.faces              |  2 +-
 tests/issue-83.php                   |  2 +-
 tests/issue-9.php                    |  2 +-
 tests/issue-99.php                   |  2 +-
 tests/template.php                   |  2 +-
 66 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a34bc10f..ed21ec46 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,26 +7,26 @@ All notable changes of the PHP Mode 1.19.1 release series are documented in this
 ### Added
 
  * Add some functions/variables in `php-project` package
-    * `php-project-get-php-executable` ([#436](https://github.com/ejmr/php-mode/pull/436))
-    * `php-project-get-phan-executable` ([#436](https://github.com/ejmr/php-mode/pull/436))
+    * `php-project-get-php-executable` ([#436](https://github.com/emacs-php/php-mode/pull/436))
+    * `php-project-get-phan-executable` ([#436](https://github.com/emacs-php/php-mode/pull/436))
  * Add `php-debug` command for reporting a bug
 
 ### Changed
 
- * Add highlighting of return types for abstract functions ([#461](https://github.com/ejmr/php-mode/pull/461) by [@fabacino](https://github.com/fabacino))
+ * Add highlighting of return types for abstract functions ([#461](https://github.com/emacs-php/php-mode/pull/461) by [@fabacino](https://github.com/fabacino))
 
 ### Fixed
 
- * Fix `c-anchored-cpp-prefix` in Emacs 26 ([#453](https://github.com/ejmr/php-mode/pull/453))
- * Fix (re-implemteed) `php-complete-function` ([#454](https://github.com/ejmr/php-mode/pull/454))
+ * Fix `c-anchored-cpp-prefix` in Emacs 26 ([#453](https://github.com/emacs-php/php-mode/pull/453))
+ * Fix (re-implemteed) `php-complete-function` ([#454](https://github.com/emacs-php/php-mode/pull/454))
  * Fix some problem of `php-set-style` *(disabled on default)*
-   * Fix lazy evaluation of php-set-style ([#444](https://github.com/ejmr/php-mode/pull/444))
-   * Do not use `php-mode-enable-backup-style-variables` in initialize ([#452](https://github.com/ejmr/php-mode/pull/452))
-   * Temporarily disable `php-mode-enable-project-coding-style`  ([#450](https://github.com/ejmr/php-mode/pull/450))
- * Fix heredoc/nowdoc syntax problem ([#440](https://github.com/ejmr/php-mode/pull/440))
- * Delete duplicate font locks with keywords not related to PHP language ([#432](https://github.com/ejmr/php-mode/pull/432))
- * Make `php-project-root` variable accept a string ([#458](https://github.com/ejmr/php-mode/pull/458))
+   * Fix lazy evaluation of php-set-style ([#444](https://github.com/emacs-php/php-mode/pull/444))
+   * Do not use `php-mode-enable-backup-style-variables` in initialize ([#452](https://github.com/emacs-php/php-mode/pull/452))
+   * Temporarily disable `php-mode-enable-project-coding-style`  ([#450](https://github.com/emacs-php/php-mode/pull/450))
+ * Fix heredoc/nowdoc syntax problem ([#440](https://github.com/emacs-php/php-mode/pull/440))
+ * Delete duplicate font locks with keywords not related to PHP language ([#432](https://github.com/emacs-php/php-mode/pull/432))
+ * Make `php-project-root` variable accept a string ([#458](https://github.com/emacs-php/php-mode/pull/458))
 
 ## Before 1.19.0
 
-See [Changelog · ejmr/php-mode Wiki](https://github.com/ejmr/php-mode/wiki/Changelog).
+See [Changelog · emacs-php/php-mode Wiki](https://github.com/emacs-php/php-mode/wiki/Changelog).
diff --git a/README.ja.md b/README.ja.md
index be909971..2b719b23 100644
--- a/README.ja.md
+++ b/README.ja.md
@@ -22,7 +22,7 @@ PHP 5.4以降を開発しやすくするための機能をアップデートす
 
 1. USAMI Kenta (@zonuexe)
 
-[PHPモードのGitHubプロジェクト](https://github.com/ejmr/php-mode)にissueを作成してバグ報告や機能リクエストを送ってください。
+[PHPモードのGitHubプロジェクト](https://github.com/emacs-php/php-mode)にissueを作成してバグ報告や機能リクエストを送ってください。
 
 インストール
 ------------
@@ -79,7 +79,7 @@ Settings
 
 ### CC Mode, CEDET, EDE, and Semantic ###
 
-In 2013 Daniel Haxney began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode.  This laid the foundation for incorporating some of the inherit IDE-ish features of Emacs, such as CEDET, EDE, and Semantic.  Support for these tools continues to improve thanks to the work of Andrea Turso, Steven Rémot, Joris Steyn, and others.  If you wish to test, contribute to, or simply experiment with such features then [this thread is a good place to start](https://github.com/ejmr/php-mode/issues/256).
+In 2013 Daniel Haxney began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode.  This laid the foundation for incorporating some of the inherit IDE-ish features of Emacs, such as CEDET, EDE, and Semantic.  Support for these tools continues to improve thanks to the work of Andrea Turso, Steven Rémot, Joris Steyn, and others.  If you wish to test, contribute to, or simply experiment with such features then [this thread is a good place to start](https://github.com/emacs-php/php-mode/issues/256).
 
 ### PHP7サポート
 
@@ -336,9 +336,9 @@ PHP Mode uses the [GNU General Public License 3](http://www.gnu.org/copyleft/gpl
 Contributors
 ------------
 
-PHPモードの改善に協力したすべての貢献者のリストは[README.md#contributors](https://github.com/ejmr/php-mode/blob/master/README.md#contributors)に掲載されています。
+PHPモードの改善に協力したすべての貢献者のリストは[README.md#contributors](https://github.com/emacs-php/php-mode/blob/master/README.md#contributors)に掲載されています。
 
-[wiki]: https://github.com/ejmr/php-mode/wiki
+[wiki]: https://github.com/emacs-php/php-mode/wiki
 [ert]: http://www.gnu.org/software/emacs/manual/html_node/ert/index.html
 [cc mode]: https://www.gnu.org/software/emacs/manual/html_mono/ccmode.html
 [Subword Mode]: https://www.gnu.org/software/emacs/manual/html_node/ccmode/Subword-Movement.html
@@ -347,8 +347,8 @@ PHPモードの改善に協力したすべての貢献者のリストは[README.
 [MELPA]: http://melpa.milkbox.net/
 [Marmalade]: http://marmalade-repo.org/
 [Web Mode]: http://web-mode.org/
-[travis-badge]: https://travis-ci.org/ejmr/php-mode.svg
-[travis-link]: https://travis-ci.org/ejmr/php-mode
+[travis-badge]: https://travis-ci.org/emacs-php/php-mode.svg
+[travis-link]: https://travis-ci.org/emacs-php/php-mode
 [melpa-link]: http://melpa.org/#/php-mode
 [melpa-stable-link]: http://stable.melpa.org/#/php-mode
 [melpa-badge]: http://melpa.org/packages/php-mode-badge.svg
diff --git a/README.md b/README.md
index 74e389aa..aac17c46 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ The current maintainer is:
 
 1. USAMI Kenta (@zonuexe)
 
-Please submit any bug reports or feature requests by creating issues on [the GitHub page for PHP Mode](https://github.com/ejmr/php-mode).
+Please submit any bug reports or feature requests by creating issues on [the GitHub page for PHP Mode](https://github.com/emacs-php/php-mode).
 
 
 Installation
@@ -51,7 +51,7 @@ Experimental and In-Progress Features
 
 ### CC Mode, CEDET, EDE, and Semantic ###
 
-In 2013 Daniel Haxney began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode.  This laid the foundation for incorporating some of the inherit IDE-ish features of Emacs, such as CEDET, EDE, and Semantic.  Support for these tools continues to improve thanks to the work of Andrea Turso, Steven Rémot, Joris Steyn, and others.  If you wish to test, contribute to, or simply experiment with such features then [this thread is a good place to start](https://github.com/ejmr/php-mode/issues/256).
+In 2013 Daniel Haxney began rewriting parts of PHP Mode in terms of Emacs' built-in CC Mode.  This laid the foundation for incorporating some of the inherit IDE-ish features of Emacs, such as CEDET, EDE, and Semantic.  Support for these tools continues to improve thanks to the work of Andrea Turso, Steven Rémot, Joris Steyn, and others.  If you wish to test, contribute to, or simply experiment with such features then [this thread is a good place to start](https://github.com/emacs-php/php-mode/issues/256).
 
 ### PHP 7 Support ###
 
@@ -400,7 +400,7 @@ In chronological order:
 76. [Mark A. Hershberger](https://github.com/hexmode)
 
 
-[wiki]: https://github.com/ejmr/php-mode/wiki
+[wiki]: https://github.com/emacs-php/php-mode/wiki
 [ert]: http://www.gnu.org/software/emacs/manual/html_node/ert/index.html
 [cc mode]: https://www.gnu.org/software/emacs/manual/html_mono/ccmode.html
 [Subword Mode]: https://www.gnu.org/software/emacs/manual/html_node/ccmode/Subword-Movement.html
@@ -409,8 +409,8 @@ In chronological order:
 [MELPA]: http://melpa.milkbox.net/
 [Marmalade]: http://marmalade-repo.org/
 [Web Mode]: http://web-mode.org/
-[travis-badge]: https://travis-ci.org/ejmr/php-mode.svg
-[travis-link]: https://travis-ci.org/ejmr/php-mode
+[travis-badge]: https://travis-ci.org/emacs-php/php-mode.svg
+[travis-link]: https://travis-ci.org/emacs-php/php-mode
 [melpa-link]: http://melpa.org/#/php-mode
 [melpa-stable-link]: http://stable.melpa.org/#/php-mode
 [melpa-badge]: http://melpa.org/packages/php-mode-badge.svg
diff --git a/php-mode-test.el b/php-mode-test.el
index 2379efdc..adf7d42b 100644
--- a/php-mode-test.el
+++ b/php-mode-test.el
@@ -4,7 +4,7 @@
 ;;               2014, 2015 Eric James Michael Ritz
 
 ;; Author: Daniel Hackney <dan@haxney.org>
-;; URL: https://github.com/ejmr/php-mode
+;; URL: https://github.com/emacs-php/php-mode
 
 ;;; License
 
@@ -371,7 +371,7 @@ style from Drupal."
     (search-forward "@copyright")
     (should (equal (get-text-property (match-beginning 0) 'face)
                    '(php-doc-annotation-tag font-lock-doc-face)))
-    (search-forward-regexp "@link +\\(https://github.com/ejmr/php-mode\\)")
+    (search-forward-regexp "@link +\\(https://github.com/emacs-php/php-mode\\)")
     (should (equal (get-text-property (match-beginning 1) 'face)
                    '(link font-lock-doc-face)))
     (search-forward-regexp "@package +\\(Emacs\\\\PHPMode\\)")
diff --git a/php-mode.el b/php-mode.el
index d8f58941..695967cb 100644
--- a/php-mode.el
+++ b/php-mode.el
@@ -6,7 +6,7 @@
 
 ;; Author: Eric James Michael Ritz
 ;; Maintainer: USAMI Kenta <tadsan@zonu.me>
-;; URL: https://github.com/ejmr/php-mode
+;; URL: https://github.com/emacs-php/php-mode
 ;; Keywords: languages php
 ;; Version: 1.19.1
 ;; Package-Requires: ((emacs "24.3") (cl-lib "0.5"))
@@ -101,7 +101,7 @@
   (if (and (= emacs-major-version 24) (>= emacs-minor-version 4))
     (require 'cl)))
 
-;; Work around https://github.com/ejmr/php-mode/issues/310.
+;; Work around https://github.com/emacs-php/php-mode/issues/310.
 ;;
 ;; In emacs 24.4 and 24.5, lines after functions with a return type
 ;; are incorrectly analyzed as member-init-cont.
@@ -126,8 +126,8 @@
   :tag "PHP"
   :prefix "php-"
   :group 'languages
-  :link '(url-link :tag "Official Site" "https://github.com/ejmr/php-mode")
-  :link '(url-link :tag "PHP Mode Wiki" "https://github.com/ejmr/php-mode/wiki"))
+  :link '(url-link :tag "Official Site" "https://github.com/emacs-php/php-mode")
+  :link '(url-link :tag "PHP Mode Wiki" "https://github.com/emacs-php/php-mode/wiki"))
 
 (defcustom php-executable (or (executable-find "php")
                               "/usr/bin/php")
@@ -1190,7 +1190,7 @@ After setting the stylevars run hooks according to STYLENAME
   (require 'pkg-info nil t)
   (php-mode-debug--buffer 'init)
   (php-mode-debug--message "Feel free to report on GitHub what you noticed!")
-  (php-mode-debug--message "https://github.com/ejmr/php-mode/issues/new")
+  (php-mode-debug--message "https://github.com/emacs-php/php-mode/issues/new")
   (php-mode-debug--message "")
   (php-mode-debug--message "Pasting the following information on the issue will help us to investigate the cause.")
   (php-mode-debug--message "```")
diff --git a/php-project.el b/php-project.el
index 53275b97..2f4d5717 100644
--- a/php-project.el
+++ b/php-project.el
@@ -4,7 +4,7 @@
 
 ;; Author: USAMI Kenta <tadsan@zonu.me>
 ;; Keywords: tools, files
-;; URL: https://github.com/ejmr/php-mode
+;; URL: https://github.com/emacs-php/php-mode
 ;; Version: 1.19.1
 ;; Package-Requires: ((emacs "24.3") (cl-lib "0.5"))
 ;; License: GPL-3.0-or-later
diff --git a/tests/README.md b/tests/README.md
index 9eea1e38..fd808372 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -15,4 +15,4 @@ tests cases.
 
 
 
-[github]: https://github.com/ejmr/php-mode
+[github]: https://github.com/emacs-php/php-mode
diff --git a/tests/comments.php b/tests/comments.php
index 3a194584..c2a726b6 100644
--- a/tests/comments.php
+++ b/tests/comments.php
@@ -7,7 +7,7 @@
  * @copyright 2008 Aaron S. Hawley
  * @copyright 2011, 2012, 2013, 2014, 2015, 2016 Eric James Michael Ritz
  * @author    USAMI Kenta <tadsan@pixiv.com>
- * @link      https://github.com/ejmr/php-mode
+ * @link      https://github.com/emacs-php/php-mode
  * @package   Emacs\PHPMode
  */
 
diff --git a/tests/comments.php.faces b/tests/comments.php.faces
index da2ef812..6248c704 100644
--- a/tests/comments.php.faces
+++ b/tests/comments.php.faces
@@ -12,7 +12,7 @@
  ("    USAMI Kenta <tadsan@pixiv.com>\n * " . font-lock-doc-face)
  ("@link" php-doc-annotation-tag font-lock-doc-face)
  ("      " . font-lock-doc-face)
- ("https://github.com/ejmr/php-mode" link font-lock-doc-face)
+ ("https://github.com/emacs-php/php-mode" link font-lock-doc-face)
  ("\n * " . font-lock-doc-face)
  ("@package" php-doc-annotation-tag font-lock-doc-face)
  ("   " . font-lock-doc-face)
diff --git a/tests/issue-100.php b/tests/issue-100.php
index d1053ccc..7d6d857d 100644
--- a/tests/issue-100.php
+++ b/tests/issue-100.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/100
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/100
  *
  * The code below should appear like so:
  *
diff --git a/tests/issue-102.php b/tests/issue-102.php
index 95d7adbd..4adc1f53 100644
--- a/tests/issue-102.php
+++ b/tests/issue-102.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/102
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/102
  *
  * Every line of code in the form of
  *
diff --git a/tests/issue-115.php b/tests/issue-115.php
index d40cf675..926a139b 100644
--- a/tests/issue-115.php
+++ b/tests/issue-115.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/115
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/115
  *
  * This tests for aligning method calls within arrays, similar to what
  * we do in the test for issue 19.  The method calls below should all
diff --git a/tests/issue-124.php b/tests/issue-124.php
index 418d4ee5..ceb67439 100644
--- a/tests/issue-124.php
+++ b/tests/issue-124.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/124
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/124
  *
  * PHP Mode must highlight the heredoc string below using
  * font-lock-string-face.  The presence of the apostrophe or anything
diff --git a/tests/issue-129.php b/tests/issue-129.php
index 2767615f..4a548605 100644
--- a/tests/issue-129.php
+++ b/tests/issue-129.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/129
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/129
  *
  * PHP Mode should use 'font-lock-keyword-face' to highlight 'final'
  * in the method below.
diff --git a/tests/issue-130.php b/tests/issue-130.php
index ac89f7ec..b7caba88 100644
--- a/tests/issue-130.php
+++ b/tests/issue-130.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/130
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/130
  *
  * Test indentation arrays
  */
diff --git a/tests/issue-135.php b/tests/issue-135.php
index b1496c01..9c8ae1c2 100644
--- a/tests/issue-135.php
+++ b/tests/issue-135.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/135
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/135
  *
  * Test indentation of method calls
  */
diff --git a/tests/issue-136.php b/tests/issue-136.php
index 97de245f..e8e9a78c 100644
--- a/tests/issue-136.php
+++ b/tests/issue-136.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/136
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/136
  *
  * The code below contains strings with interpolated variables.  PHP
  * Mode must use font-lock-variable-name-face to highlight all of
diff --git a/tests/issue-136.php.faces b/tests/issue-136.php.faces
index da2ef812..6248c704 100644
--- a/tests/issue-136.php.faces
+++ b/tests/issue-136.php.faces
@@ -12,7 +12,7 @@
  ("    USAMI Kenta <tadsan@pixiv.com>\n * " . font-lock-doc-face)
  ("@link" php-doc-annotation-tag font-lock-doc-face)
  ("      " . font-lock-doc-face)
- ("https://github.com/ejmr/php-mode" link font-lock-doc-face)
+ ("https://github.com/emacs-php/php-mode" link font-lock-doc-face)
  ("\n * " . font-lock-doc-face)
  ("@package" php-doc-annotation-tag font-lock-doc-face)
  ("   " . font-lock-doc-face)
diff --git a/tests/issue-14.php b/tests/issue-14.php
index 96f49fda..75512e92 100644
--- a/tests/issue-14.php
+++ b/tests/issue-14.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/14
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/14
  *
  * The code below should be formatted like so if we run indent-region
  * on it:
diff --git a/tests/issue-144.php b/tests/issue-144.php
index e222f742..8553c968 100644
--- a/tests/issue-144.php
+++ b/tests/issue-144.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/144
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/144
  *
  * Indentation test '#' comment line has single quote.
  *
diff --git a/tests/issue-145.php b/tests/issue-145.php
index affb0a0d..55c6c638 100644
--- a/tests/issue-145.php
+++ b/tests/issue-145.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/145
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/145
  *
  * This tests closure indentation.
  *
diff --git a/tests/issue-16.php b/tests/issue-16.php
index ddd3ff61..12b5dde5 100644
--- a/tests/issue-16.php
+++ b/tests/issue-16.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues16
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues16
  *
  * The third 'use' statement, with comma-separated namespaces, should
  * appear in the same syntax highlighting as the first two 'use'
diff --git a/tests/issue-174.php b/tests/issue-174.php
index 1f4e442d..a8e7f62c 100644
--- a/tests/issue-174.php
+++ b/tests/issue-174.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/174
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/174
  *
  * Test highlighting of string literals containing escaped quotes
  */
diff --git a/tests/issue-175.php b/tests/issue-175.php
index f70c1e0b..323049f6 100644
--- a/tests/issue-175.php
+++ b/tests/issue-175.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/175
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/175
  *
  * PHP mode should not highlight more than 2 digit charcter
  *
diff --git a/tests/issue-178.php b/tests/issue-178.php
index 89774cfb..753084c5 100644
--- a/tests/issue-178.php
+++ b/tests/issue-178.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/178
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/178
  *
  * Test highlighting of "as" keyword
  */
diff --git a/tests/issue-18.php b/tests/issue-18.php
index d59e8455..8f2dd406 100644
--- a/tests/issue-18.php
+++ b/tests/issue-18.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/18
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/18
  *
  * If we run indent-region on the code below then it should appear
  * like so:
@@ -9,7 +9,7 @@
  * $a = 'github';
  *
  * if ($a === 'github') {
- *     header('Location: http://github.com');
+ *     header('Location: https://github.com');
  * }
  *
  * This tests for a bug where '//' inside of a string would cause an
@@ -19,5 +19,5 @@
 $a = 'github';
 
 if ($a === 'github') {
-    header('Location: http://github.com'); // ###php-mode-test### ((indent c-basic-offset))
-}
\ No newline at end of file
+    header('Location: https://github.com'); // ###php-mode-test### ((indent c-basic-offset))
+}
diff --git a/tests/issue-184.php b/tests/issue-184.php
index 1d3e1b72..a544b640 100644
--- a/tests/issue-184.php
+++ b/tests/issue-184.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/184
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/184
  *
  * Test indentation of statements at beginning of line.
  *
diff --git a/tests/issue-186.php b/tests/issue-186.php
index 1aa0cf57..c8490cff 100644
--- a/tests/issue-186.php
+++ b/tests/issue-186.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/186
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/186
  *
  * Test indentation of case body preceeded by multiple case labels
  * that fall through
diff --git a/tests/issue-19.php b/tests/issue-19.php
index 39f73d07..fc028986 100644
--- a/tests/issue-19.php
+++ b/tests/issue-19.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/19
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/19
  *
  * If we run indent-region on the code below then it should appear
  * like this with the '->' operators aligned:
diff --git a/tests/issue-197.php b/tests/issue-197.php
index 69aeb30d..b8dcdf35 100644
--- a/tests/issue-197.php
+++ b/tests/issue-197.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/197
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/197
  *
  * Test that member highlighting goes before highlighting of cc-mode
  * types
diff --git a/tests/issue-197.php.faces b/tests/issue-197.php.faces
index e22bb957..cd223c5b 100644
--- a/tests/issue-197.php.faces
+++ b/tests/issue-197.php.faces
@@ -2,7 +2,7 @@
 (("<?php" . php-php-tag)
  ("\n\n")
  ("/**\n * GitHub Issue:    " . font-lock-doc-face)
- ("https://github.com/ejmr/php-mode/issues/197" link font-lock-doc-face)
+ ("https://github.com/emacs-php/php-mode/issues/197" link font-lock-doc-face)
  ("\n *\n * Test that member highlighting goes before highlighting of cc-mode\n * types\n */" . font-lock-doc-face)
  ("\n")
  ("$" . php-variable-sigil)
diff --git a/tests/issue-200.php b/tests/issue-200.php
index ad4275a0..3e936be1 100644
--- a/tests/issue-200.php
+++ b/tests/issue-200.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/200
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/200
  *
  * There are extra whitespaces in the code below. In PSR-2 mode, those must be
  * highlighted and stripped upon save (be careful when editing and saving,
diff --git a/tests/issue-201.php b/tests/issue-201.php
index 13007008..6a26ce35 100644
--- a/tests/issue-201.php
+++ b/tests/issue-201.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/201
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/201
  *
  * Test highighting of $this
  */
diff --git a/tests/issue-201.php.faces b/tests/issue-201.php.faces
index 7e56028d..b6291119 100644
--- a/tests/issue-201.php.faces
+++ b/tests/issue-201.php.faces
@@ -2,7 +2,7 @@
 (("<?php" . php-php-tag)
  ("\n\n")
  ("/**\n * GitHub Issue:    " . font-lock-doc-face)
- ("https://github.com/ejmr/php-mode/issues/201" link font-lock-doc-face)
+ ("https://github.com/emacs-php/php-mode/issues/201" link font-lock-doc-face)
  ("\n *\n * Test highighting of " . font-lock-doc-face)
  ("$" php-doc-$this-sigil php-doc-variable-sigil font-lock-doc-face)
  ("this" php-doc-$this php-variable-name font-lock-doc-face)
diff --git a/tests/issue-21.php b/tests/issue-21.php
index fb73983e..956bd917 100644
--- a/tests/issue-21.php
+++ b/tests/issue-21.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/21
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/21
  *
  * This test contains a multiline string.  Emacs should highlight the
  * string properly even though it contains newline characters.
diff --git a/tests/issue-211.php b/tests/issue-211.php
index da37a93e..813215fe 100644
--- a/tests/issue-211.php
+++ b/tests/issue-211.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/211
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/211
  *
  * Indentation of string concatination
  */
diff --git a/tests/issue-22.php b/tests/issue-22.php
index d0987298..b7a57219 100644
--- a/tests/issue-22.php
+++ b/tests/issue-22.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/22
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/22
  *
  * Emacs should highlight all three comments below using
  * font-lock-comment-face.  The first two comments must have the same
diff --git a/tests/issue-227.php b/tests/issue-227.php
index 56a7d49e..daf9200f 100644
--- a/tests/issue-227.php
+++ b/tests/issue-227.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/227
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/227
  *
  * Indentation of multi-line strings
  */
diff --git a/tests/issue-237.php b/tests/issue-237.php
index 0381cffd..bf80f95f 100644
--- a/tests/issue-237.php
+++ b/tests/issue-237.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/237
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/237
  *
  * Indentation of chaining method for PSR2
  */
diff --git a/tests/issue-253.php b/tests/issue-253.php
index 1c11dc18..9539da9f 100644
--- a/tests/issue-253.php
+++ b/tests/issue-253.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/253
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/253
  *
  * Highlighting fails after a string with too many escaped quotes
  */
diff --git a/tests/issue-259.php b/tests/issue-259.php
index 10e6a7cc..07b0efbb 100644
--- a/tests/issue-259.php
+++ b/tests/issue-259.php
@@ -1,5 +1,5 @@
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/259
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/259
  *
  * This code shows how writing a closure which imports external
  * variables with the `use` keyword causes php-mode to incorrectly
diff --git a/tests/issue-27.php b/tests/issue-27.php
index 25082e24..44b7f751 100644
--- a/tests/issue-27.php
+++ b/tests/issue-27.php
@@ -2,7 +2,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/27
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/27
  *
  * The file tests indentation on a script beginning with a shebang.
  * If you place the cursor on the line '// Tab' and indent it should
diff --git a/tests/issue-28.php b/tests/issue-28.php
index 71f654fe..c19223f4 100644
--- a/tests/issue-28.php
+++ b/tests/issue-28.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/28
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/28
  *
  * This is a performance test that (likely) relates to syntax
  * highlighting.  Scrolling up and down this file should produce no
diff --git a/tests/issue-29.php b/tests/issue-29.php
index 9b9174ef..bb6c98d1 100644
--- a/tests/issue-29.php
+++ b/tests/issue-29.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/29
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/29
  *
  * The mode should format the code below like so:
  *
diff --git a/tests/issue-305.php b/tests/issue-305.php
index 72887bd3..45f15113 100644
--- a/tests/issue-305.php
+++ b/tests/issue-305.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/305
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/305
  *
  * Test highighting of $this_foo, $that_foo
  */
diff --git a/tests/issue-305.php.faces b/tests/issue-305.php.faces
index ffe4ed4a..f8934adc 100644
--- a/tests/issue-305.php.faces
+++ b/tests/issue-305.php.faces
@@ -2,7 +2,7 @@
 (("<?php" . php-php-tag)
  ("\n\n")
  ("/**\n * GitHub Issue:    " . font-lock-doc-face)
- ("https://github.com/ejmr/php-mode/issues/305" link font-lock-doc-face)
+ ("https://github.com/emacs-php/php-mode/issues/305" link font-lock-doc-face)
  ("\n *\n * Test highighting of " . font-lock-doc-face)
  ("$" php-doc-variable-sigil font-lock-doc-face)
  ("this_foo" php-variable-name font-lock-doc-face)
diff --git a/tests/issue-333.php b/tests/issue-333.php
index c75da224..bb0404a4 100644
--- a/tests/issue-333.php
+++ b/tests/issue-333.php
@@ -7,7 +7,7 @@
 
 /**
  * @author Charlie McMackin
- * @see https://github.com/ejmr/php-mode/issues/333
+ * @see https://github.com/emacs-php/php-mode/issues/333
  */
 class Hello
 {
diff --git a/tests/issue-42.php b/tests/issue-42.php
index 9c2fa07a..22f7607d 100644
--- a/tests/issue-42.php
+++ b/tests/issue-42.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/42
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/42
  *
  * Indenting the code below, particularly the closures, should not
  * cause any problems such as the long backtrace reported in the issue
diff --git a/tests/issue-439.php b/tests/issue-439.php
index 8ca36676..6d5a92d8 100644
--- a/tests/issue-439.php
+++ b/tests/issue-439.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:  https://github.com/ejmr/php-mode/issues/439
+ * GitHub Issue:  https://github.com/emacs-php/php-mode/issues/439
  */
 
 $a = <<<ABC
diff --git a/tests/issue-439.php.faces b/tests/issue-439.php.faces
index 3a8a1b5c..91377cef 100644
--- a/tests/issue-439.php.faces
+++ b/tests/issue-439.php.faces
@@ -2,7 +2,7 @@
 (("<?php" . php-php-tag)
  ("\n\n")
  ("/**\n * GitHub Issue:  " . font-lock-doc-face)
- ("https://github.com/ejmr/php-mode/issues/439" link font-lock-doc-face)
+ ("https://github.com/emacs-php/php-mode/issues/439" link font-lock-doc-face)
  ("\n */" . font-lock-doc-face)
  ("\n\n")
  ("$" . php-variable-sigil)
diff --git a/tests/issue-443.php b/tests/issue-443.php
index a527efef..ebddcc0c 100644
--- a/tests/issue-443.php
+++ b/tests/issue-443.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types=1); ?>
-/** GitHub Issue: https://github.com/ejmr/php-mode/issues/443 */
+/** GitHub Issue: https://github.com/emacs-php/php-mode/issues/443 */
 <?xml version="1.0" encoding="UTF-8"?>
 <?hh echo "Hack open tag" ?>
 <? echo "obsolete short open tag" ?>
diff --git a/tests/issue-443.php.faces b/tests/issue-443.php.faces
index c9edc162..0624cc2c 100644
--- a/tests/issue-443.php.faces
+++ b/tests/issue-443.php.faces
@@ -8,7 +8,7 @@
  ("?>" . php-php-tag)
  ("\n")
  ("/** GitHub Issue: " . font-lock-doc-face)
- ("https://github.com/ejmr/php-mode/issues/443" link font-lock-doc-face)
+ ("https://github.com/emacs-php/php-mode/issues/443" link font-lock-doc-face)
  (" */" . font-lock-doc-face)
  ("\n")
  ("<?xml" . php-php-tag)
diff --git a/tests/issue-53.php b/tests/issue-53.php
index d5ff2956..ecac2691 100644
--- a/tests/issue-53.php
+++ b/tests/issue-53.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/53
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/53
  *
  * Test if switching from Drupal coding style to other coding styles updates
  * the whitespace effects.
diff --git a/tests/issue-66-bracket-namespace.php b/tests/issue-66-bracket-namespace.php
index 423ab149..5097ec47 100644
--- a/tests/issue-66-bracket-namespace.php
+++ b/tests/issue-66-bracket-namespace.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/66
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/66
  *
  * Namespace examples from
  * http://www.php.net/manual/en/language.namespaces.definitionmultiple.php
diff --git a/tests/issue-66-multi-namespace.php b/tests/issue-66-multi-namespace.php
index 6df15485..05a9f5db 100644
--- a/tests/issue-66-multi-namespace.php
+++ b/tests/issue-66-multi-namespace.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/66
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/66
  *
  * Namespace examples from
  * http://www.php.net/manual/en/language.namespaces.definitionmultiple.php
diff --git a/tests/issue-66-namespace.php b/tests/issue-66-namespace.php
index 11c3ba46..9141da02 100644
--- a/tests/issue-66-namespace.php
+++ b/tests/issue-66-namespace.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/66
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/66
  *
  * Namespace examples from
  * http://www.php.net/manual/en/language.namespaces.rationale.php
diff --git a/tests/issue-66-use-namespace.php b/tests/issue-66-use-namespace.php
index 2768afb3..fce72168 100644
--- a/tests/issue-66-use-namespace.php
+++ b/tests/issue-66-use-namespace.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/66
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/66
  *
  * Namespace examples from user comment on
  * http://www.php.net/manual/en/language.namespaces.definitionmultiple.php
diff --git a/tests/issue-66.php b/tests/issue-66.php
index 199399e4..95b4dd39 100644
--- a/tests/issue-66.php
+++ b/tests/issue-66.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/66
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/66
  *
  * A large battery of tests to exercise the new cc-mode-based indentation and
  * fontification code.
diff --git a/tests/issue-68.php b/tests/issue-68.php
index a152ab31..2f4d53cd 100644
--- a/tests/issue-68.php
+++ b/tests/issue-68.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/68
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/68
  *
  * The 'catch' keywords should align with 'try' and not march
  * off to the right side of the screen like they do in the bug
diff --git a/tests/issue-73.php b/tests/issue-73.php
index 87476ef5..47e59b0f 100644
--- a/tests/issue-73.php
+++ b/tests/issue-73.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/73
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/73
  *
  * The `delete-indentation' function should work properly for PHP.
  * This means modifying the logic of `fixup-whitespace' so that it
diff --git a/tests/issue-8.php b/tests/issue-8.php
index 07479530..35aeb369 100644
--- a/tests/issue-8.php
+++ b/tests/issue-8.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/8
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/8
  *
  * The code below contains annotations in the comments which begin
  * with the '@' character.  The highlighting for these annotations
diff --git a/tests/issue-8.php.faces b/tests/issue-8.php.faces
index 64fb7094..9e086e8f 100644
--- a/tests/issue-8.php.faces
+++ b/tests/issue-8.php.faces
@@ -2,7 +2,7 @@
 (("<?php" . php-php-tag)
  ("\n\n")
  ("/**\n * Github Issue:    " . font-lock-doc-face)
- ("https://github.com/ejmr/php-mode/issues/8" link font-lock-doc-face)
+ ("https://github.com/emacs-php/php-mode/issues/8" link font-lock-doc-face)
  ("\n *\n * The code below contains annotations in the comments which begin\n * with the '@' character.  The highlighting for these annotations\n * should be different from that used for comments.  At the very least\n * php-mode should highlight the part up to the first backslash.\n */" . font-lock-doc-face)
  ("\n\n")
  ("/**\n * " . font-lock-doc-face)
diff --git a/tests/issue-83.php b/tests/issue-83.php
index 86117ece..bca4f187 100644
--- a/tests/issue-83.php
+++ b/tests/issue-83.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/83
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/83
  *
  * All static methods should appear on imenu whether 'static' keyword
  * is placed before or after visibility.
diff --git a/tests/issue-9.php b/tests/issue-9.php
index 0f2449fb..4bbb41c7 100644
--- a/tests/issue-9.php
+++ b/tests/issue-9.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/9
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/9
  *
  * The HTML below contains a single quote as part of "We'll".  The bug
  * for issue 9 shows how the presence of this single quote makes
diff --git a/tests/issue-99.php b/tests/issue-99.php
index 84927590..eef5eac7 100644
--- a/tests/issue-99.php
+++ b/tests/issue-99.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Github Issue:    https://github.com/ejmr/php-mode/issues/99
+ * Github Issue:    https://github.com/emacs-php/php-mode/issues/99
  *
  * The code below contains a 'foreach' without any braces.  We use CC
  * Mode to customize indentation and it treats continued differently
diff --git a/tests/template.php b/tests/template.php
index cc454d2a..30ad5296 100644
--- a/tests/template.php
+++ b/tests/template.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * GitHub Issue:    https://github.com/ejmr/php-mode/issues/NNN
+ * GitHub Issue:    https://github.com/emacs-php/php-mode/issues/NNN
  *
  * ---------------------------------------------------------------------- 
  * Add the correct issue number to the URL above, replacing the 'NNN',