X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FGitInfo.php;h=6b092d96c693c6b6c1ed7663330437d308e3ed17;hb=d8545438bfdd2cb4fb5c62c90078d9bd9e8b4c12;hp=877c2d24e515f3dbd3aa947c58215e26ec78ee9a;hpb=a5b5f90fb956605601bd14aed695c8c962b0d064;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/GitInfo.php b/includes/GitInfo.php index 877c2d24e5..6b092d96c6 100644 --- a/includes/GitInfo.php +++ b/includes/GitInfo.php @@ -82,18 +82,18 @@ class GitInfo { * @return string The HEAD */ public function getHead() { - $HEADfile = "{$this->basedir}/HEAD"; + $headFile = "{$this->basedir}/HEAD"; - if ( !is_readable( $HEADfile ) ) { + if ( !is_readable( $headFile ) ) { return false; } - $HEAD = file_get_contents( $HEADfile ); + $head = file_get_contents( $headFile ); - if ( preg_match( "/ref: (.*)/", $HEAD, $m ) ) { + if ( preg_match( "/ref: (.*)/", $head, $m ) ) { return rtrim( $m[1] ); } else { - return rtrim( $HEAD ); + return rtrim( $head ); } } @@ -102,20 +102,20 @@ class GitInfo { * @return string A SHA1 or false */ public function getHeadSHA1() { - $HEAD = $this->getHead(); + $head = $this->getHead(); // If detached HEAD may be a SHA1 - if ( self::isSHA1( $HEAD ) ) { - return $HEAD; + if ( self::isSHA1( $head ) ) { + return $head; } // If not a SHA1 it may be a ref: - $REFfile = "{$this->basedir}/{$HEAD}"; - if ( !is_readable( $REFfile ) ) { + $refFile = "{$this->basedir}/{$head}"; + if ( !is_readable( $refFile ) ) { return false; } - $sha1 = rtrim( file_get_contents( $REFfile ) ); + $sha1 = rtrim( file_get_contents( $refFile ) ); return $sha1; } @@ -150,11 +150,11 @@ class GitInfo { * @return string The branch name, HEAD, or false */ public function getCurrentBranch() { - $HEAD = $this->getHead(); - if ( $HEAD && preg_match( "#^refs/heads/(.*)$#", $HEAD, $m ) ) { + $head = $this->getHead(); + if ( $head && preg_match( "#^refs/heads/(.*)$#", $head, $m ) ) { return $m[1]; } else { - return $HEAD; + return $head; } }