Merge branch 4.5 into master

[civicrm-core.git] / api / v3 / Entity.php

diff --git a/api/v3/Entity.php b/api/v3/Entity.php
index 3a38c7961ae01206ee0b54f76d1781eef1408467..982876b8a5301cb8d9c055619cf78da2bca1de3e 100644 (file)
--- a/api/v3/Entity.php
+++ b/api/v3/Entity.php
@@ -1,45 +1,21 @@
 <?php
 
-require_once 'api/v3/utils.php';
-
 /**
- *  returns the list of all the entities that you can manipulate via the api. The entity of this API call is the entity, that isn't a real civicrm entity as in something stored in the DB, but an abstract meta object. My head is going to explode. In a meta way.
+ * @deprecated api notice
+ * @param array entities
+ * @return array
+   *   of deprecated api entities
  */
-function civicrm_api3_entity_get($params) {
-
-  civicrm_api3_verify_mandatory($params);
-  $entities = array();
-  $include_dirs = array_unique(explode(PATH_SEPARATOR, get_include_path()));
-  #$include_dirs = array(dirname(__FILE__). '/../../');
-  foreach ($include_dirs as $include_dir) {
-    $api_dir = implode(DIRECTORY_SEPARATOR, array($include_dir, 'api', 'v3'));
-    if (! is_dir($api_dir)) {
-      continue;
-    }
-    $iterator = new DirectoryIterator($api_dir);
-  foreach ($iterator as $fileinfo) {
-    $file = $fileinfo->getFilename();
-
-      // Check for entities with a master file ("api/v3/MyEntity.php")
-    $parts = explode(".", $file);
-      if (end($parts) == "php" && $file != "utils.php" && !preg_match('/Tests?.php$/', $file) ) {
-      // without the ".php"
-      $entities[] = substr($file, 0, -4);
-    }
-
-      // Check for entities with standalone action files ("api/v3/MyEntity/MyAction.php")
-      $action_dir = $api_dir . DIRECTORY_SEPARATOR . $file;
-      if (preg_match('/^[A-Z][A-Za-z0-9]*$/', $file) && is_dir($action_dir)) {
-        if (count(glob("$action_dir/[A-Z]*.php")) > 0) {
-          $entities[] = $file;
-  }
+function _civicrm_api3_entity_deprecation($entities) {
+  $deprecated = array();
+  if (!empty($entities['values'])) {
+    foreach ($entities['values'] as $entity) {
+      if (is_string(_civicrm_api3_deprecation_check($entity))) {
+        $deprecated[] = $entity;
       }
     }
   }
-  $entities = array_diff($entities, array('Generic'));
-  $entities = array_unique($entities);
-  sort($entities);
-  return civicrm_api3_create_success($entities);
+  return $deprecated;
 }
 
 /**
@@ -64,4 +40,3 @@ function civicrm_api3_entity_getfields($params) {
   // without putting an exception in for entity
   return civicrm_api3_create_success(array());
 }
-