Merge branch 'angular-tests' of https://github.com/giant-rabbit/civicrm-core into...

[civicrm-core.git] / CRM / Core / Region.php

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index 63953d104b95b1ce7b86f5f2e58c275475e1316d..15d76aa184ec376a2b123e1236f72978ea33cc5f 100644 (file)
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -13,7 +13,7 @@ class CRM_Core_Region {
    * @param bool $autocreate whether to automatically create an empty region
    * @return CRM_Core_Region
    */
-  static function &instance($name, $autocreate = TRUE) {
+  public static function &instance($name, $autocreate = TRUE) {
     if ( $autocreate && ! isset( self::$_instances[$name] ) ) {
       self::$_instances[$name] = new CRM_Core_Region($name);
     }
@@ -42,7 +42,7 @@ class CRM_Core_Region {
   var $_isSorted;
 
   /**
-   * @param $name
+   * @param string $name
    */
   public function __construct($name) {
     // Templates injected into regions should normally be file names, but sometimes inline notation is handy.
@@ -126,7 +126,7 @@ class CRM_Core_Region {
   }
 
   /**
-   * @param $name
+   * @param string $name
    * @param $snippet
    */
   public function update($name, $snippet) {
@@ -135,7 +135,7 @@ class CRM_Core_Region {
   }
 
   /**
-   * @param $name
+   * @param string $name
    *
    * @return mixed
    */
@@ -221,7 +221,7 @@ class CRM_Core_Region {
    *
    * @return int
    */
-  static function _cmpSnippet($a, $b) {
+  public static function _cmpSnippet($a, $b) {
     if ($a['weight'] < $b['weight']) return -1;
     if ($a['weight'] > $b['weight']) return 1;
     // fallback to name sort; don't really want to do this, but it makes results more stable