Afform - Regenerate civix files

diff --git a/ext/afform/admin/afform_admin.civix.php b/ext/afform/admin/afform_admin.civix.php
index 9db46b2caab539d6d0a53773d953166c6631cd73..1a1fcfc28ef0ad27a365f32a9925ebd9ac19abea 100644 (file)
--- a/ext/afform/admin/afform_admin.civix.php
+++ b/ext/afform/admin/afform_admin.civix.php
@@ -7,9 +7,9 @@
  * extension.
  */
 class CRM_AfformAdmin_ExtensionUtil {
-  const SHORT_NAME = "afform_admin";
-  const LONG_NAME = "org.civicrm.afform_admin";
-  const CLASS_PREFIX = "CRM_AfformAdmin";
+  const SHORT_NAME = 'afform_admin';
+  const LONG_NAME = 'org.civicrm.afform_admin';
+  const CLASS_PREFIX = 'CRM_AfformAdmin';
 
   /**
    * Translate a string using the extension's domain.
@@ -221,7 +221,8 @@ function _afform_admin_civix_upgrader() {
  * Search directory tree for files which match a glob pattern.
  *
  * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
- * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ * Note: Delegate to CRM_Utils_File::findFiles(), this function kept only
+ * for backward compatibility of extension code that uses it.
  *
  * @param string $dir base dir
  * @param string $pattern , glob pattern, eg "*.txt"
@@ -229,32 +230,7 @@ function _afform_admin_civix_upgrader() {
  * @return array
  */
 function _afform_admin_civix_find_files($dir, $pattern) {
-  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
-    return CRM_Utils_File::findFiles($dir, $pattern);
-  }
-
-  $todos = [$dir];
-  $result = [];
-  while (!empty($todos)) {
-    $subdir = array_shift($todos);
-    foreach (_afform_admin_civix_glob("$subdir/$pattern") as $match) {
-      if (!is_dir($match)) {
-        $result[] = $match;
-      }
-    }
-    if ($dh = opendir($subdir)) {
-      while (FALSE !== ($entry = readdir($dh))) {
-        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
-        if ($entry[0] == '.') {
-        }
-        elseif (is_dir($path)) {
-          $todos[] = $path;
-        }
-      }
-      closedir($dh);
-    }
-  }
-  return $result;
+  return CRM_Utils_File::findFiles($dir, $pattern);
 }
 
 /**

diff --git a/ext/afform/core/afform.civix.php b/ext/afform/core/afform.civix.php
index a43b055281f8ec09b4b95aedc6adf6fbd09d4e92..1ab6c2b2cfdcde99ee80518f04d3a0ed92e0e3b9 100644 (file)
--- a/ext/afform/core/afform.civix.php
+++ b/ext/afform/core/afform.civix.php
@@ -7,9 +7,9 @@
  * extension.
  */
 class CRM_Afform_ExtensionUtil {
-  const SHORT_NAME = "afform";
-  const LONG_NAME = "org.civicrm.afform";
-  const CLASS_PREFIX = "CRM_Afform";
+  const SHORT_NAME = 'afform';
+  const LONG_NAME = 'org.civicrm.afform';
+  const CLASS_PREFIX = 'CRM_Afform';
 
   /**
    * Translate a string using the extension's domain.
@@ -221,7 +221,8 @@ function _afform_civix_upgrader() {
  * Search directory tree for files which match a glob pattern.
  *
  * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
- * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ * Note: Delegate to CRM_Utils_File::findFiles(), this function kept only
+ * for backward compatibility of extension code that uses it.
  *
  * @param string $dir base dir
  * @param string $pattern , glob pattern, eg "*.txt"
@@ -229,32 +230,7 @@ function _afform_civix_upgrader() {
  * @return array
  */
 function _afform_civix_find_files($dir, $pattern) {
-  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
-    return CRM_Utils_File::findFiles($dir, $pattern);
-  }
-
-  $todos = [$dir];
-  $result = [];
-  while (!empty($todos)) {
-    $subdir = array_shift($todos);
-    foreach (_afform_civix_glob("$subdir/$pattern") as $match) {
-      if (!is_dir($match)) {
-        $result[] = $match;
-      }
-    }
-    if ($dh = opendir($subdir)) {
-      while (FALSE !== ($entry = readdir($dh))) {
-        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
-        if ($entry[0] == '.') {
-        }
-        elseif (is_dir($path)) {
-          $todos[] = $path;
-        }
-      }
-      closedir($dh);
-    }
-  }
-  return $result;
+  return CRM_Utils_File::findFiles($dir, $pattern);
 }
 
 /**

diff --git a/ext/afform/html/afform_html.civix.php b/ext/afform/html/afform_html.civix.php
index 948f0ce17b7ab3e47da272eeef59cf4191628c7e..eb663989c5d5cc15005fce0f2b3d01beeca7f97a 100644 (file)
--- a/ext/afform/html/afform_html.civix.php
+++ b/ext/afform/html/afform_html.civix.php
@@ -7,9 +7,9 @@
  * extension.
  */
 class CRM_AfformHtml_ExtensionUtil {
-  const SHORT_NAME = "afform_html";
-  const LONG_NAME = "org.civicrm.afform-html";
-  const CLASS_PREFIX = "CRM_AfformHtml";
+  const SHORT_NAME = 'afform_html';
+  const LONG_NAME = 'org.civicrm.afform-html';
+  const CLASS_PREFIX = 'CRM_AfformHtml';
 
   /**
    * Translate a string using the extension's domain.
@@ -221,7 +221,8 @@ function _afform_html_civix_upgrader() {
  * Search directory tree for files which match a glob pattern.
  *
  * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
- * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ * Note: Delegate to CRM_Utils_File::findFiles(), this function kept only
+ * for backward compatibility of extension code that uses it.
  *
  * @param string $dir base dir
  * @param string $pattern , glob pattern, eg "*.txt"
@@ -229,32 +230,7 @@ function _afform_html_civix_upgrader() {
  * @return array
  */
 function _afform_html_civix_find_files($dir, $pattern) {
-  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
-    return CRM_Utils_File::findFiles($dir, $pattern);
-  }
-
-  $todos = [$dir];
-  $result = [];
-  while (!empty($todos)) {
-    $subdir = array_shift($todos);
-    foreach (_afform_html_civix_glob("$subdir/$pattern") as $match) {
-      if (!is_dir($match)) {
-        $result[] = $match;
-      }
-    }
-    if ($dh = opendir($subdir)) {
-      while (FALSE !== ($entry = readdir($dh))) {
-        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
-        if ($entry[0] == '.') {
-        }
-        elseif (is_dir($path)) {
-          $todos[] = $path;
-        }
-      }
-      closedir($dh);
-    }
-  }
-  return $result;
+  return CRM_Utils_File::findFiles($dir, $pattern);
 }
 
 /**

diff --git a/ext/afform/mock/afform_mock.civix.php b/ext/afform/mock/afform_mock.civix.php
index 32aad3e5563d02c3fcb87e68ea1ec0744ddc6519..37f78752702257a75f98d4039ee1eaf3d83f9c38 100644 (file)
--- a/ext/afform/mock/afform_mock.civix.php
+++ b/ext/afform/mock/afform_mock.civix.php
@@ -7,9 +7,9 @@
  * extension.
  */
 class CRM_AfformMock_ExtensionUtil {
-  const SHORT_NAME = "afform_mock";
-  const LONG_NAME = "org.civicrm.afform-mock";
-  const CLASS_PREFIX = "CRM_AfformMock";
+  const SHORT_NAME = 'afform_mock';
+  const LONG_NAME = 'org.civicrm.afform-mock';
+  const CLASS_PREFIX = 'CRM_AfformMock';
 
   /**
    * Translate a string using the extension's domain.
@@ -221,7 +221,8 @@ function _afform_mock_civix_upgrader() {
  * Search directory tree for files which match a glob pattern.
  *
  * Note: Dot-directories (like "..", ".git", or ".svn") will be ignored.
- * Note: In Civi 4.3+, delegate to CRM_Utils_File::findFiles()
+ * Note: Delegate to CRM_Utils_File::findFiles(), this function kept only
+ * for backward compatibility of extension code that uses it.
  *
  * @param string $dir base dir
  * @param string $pattern , glob pattern, eg "*.txt"
@@ -229,32 +230,7 @@ function _afform_mock_civix_upgrader() {
  * @return array
  */
 function _afform_mock_civix_find_files($dir, $pattern) {
-  if (is_callable(['CRM_Utils_File', 'findFiles'])) {
-    return CRM_Utils_File::findFiles($dir, $pattern);
-  }
-
-  $todos = [$dir];
-  $result = [];
-  while (!empty($todos)) {
-    $subdir = array_shift($todos);
-    foreach (_afform_mock_civix_glob("$subdir/$pattern") as $match) {
-      if (!is_dir($match)) {
-        $result[] = $match;
-      }
-    }
-    if ($dh = opendir($subdir)) {
-      while (FALSE !== ($entry = readdir($dh))) {
-        $path = $subdir . DIRECTORY_SEPARATOR . $entry;
-        if ($entry[0] == '.') {
-        }
-        elseif (is_dir($path)) {
-          $todos[] = $path;
-        }
-      }
-      closedir($dh);
-    }
-  }
-  return $result;
+  return CRM_Utils_File::findFiles($dir, $pattern);
 }
 
 /**