ESDet / esdportal_api

src/EcDataUtils.php

Braces +12 added lines, -24 removed lines

@@ -25,11 +25,9 @@ 
   public static function getEcId($ec) {
     if (isset($ec->field_esd_ec_id['und']) && isset($ec->field_esd_ec_id['und'][0]) && isset($ec->field_esd_ec_id['und'][0]['value'])) {
       return $ec->field_esd_ec_id['und'][0]['value'];
-    }
-    elseif (gettype($ec->field_esd_ec_id) == 'string') {
+    } elseif (gettype($ec->field_esd_ec_id) == 'string') {
       return $ec->field_esd_ec_id;
-    }
-    else {
+    } else {
       return NULL;
     }
   }
@@ -132,8 +130,7 @@ 
               $cloned_entity->{$url_field_name} = $url;
             }
           }
-        }
-        else {
+        } else {
           // Otherwise loop over the field and generate each URL.
           $cloned_entity->{$url_field_name} = array();
           foreach ($clone_wrapper->{$field_name}->getIterator() as $delta => $field_wrapper) {
@@ -170,15 +167,13 @@ 
         if ($cloned_entity->{$field_name}) {
           $cloned_entity->{$field_name} = ['tid' => $term->tid, 'name' => $term->name];
         }
-      }
-      elseif ($clone_wrapper->{$field_name}->type() == 'list<taxonomy_term>') {
+      } elseif ($clone_wrapper->{$field_name}->type() == 'list<taxonomy_term>') {
         $new_val = [];
         foreach ($clone_wrapper->{$field_name}->value() as $term) {
           $new_val[] = ['tid' => $term->tid, 'name' => $term->name];
         }
         $cloned_entity->{$field_name} = $new_val;
-      }
-      elseif ($clone_wrapper->{$field_name}->type() == 'list<text>') {
+      } elseif ($clone_wrapper->{$field_name}->type() == 'list<text>') {
         $opts = $clone_wrapper->{$field_name}->optionsList();
         $newval = [];
         $iter = 0;
@@ -195,14 +190,12 @@ 
 
         $cloned_entity->{$field_name} = $newval;
         unset($newval);
-      }
-      elseif ($clone_wrapper->{$field_name}->type() == 'text' && $clone_wrapper->{$field_name}->label()) {
+      } elseif ($clone_wrapper->{$field_name}->type() == 'text' && $clone_wrapper->{$field_name}->label()) {
         $cloned_entity->{$field_name} = [
           'machine_name' => $clone_wrapper->{$field_name}->value(),
           'label' => $clone_wrapper->{$field_name}->label(),
         ];
-      }
-      else {
+      } else {
         $cloned_entity->{$field_name} = $clone_wrapper->{$field_name}->raw();
       }
     }
@@ -304,8 +297,7 @@ 
     // If a specific bundle's fields was requested, return just those.
     if (!empty($bundle)) {
       return $fields[$entity_type][$bundle];
-    }
-    else {
+    } else {
       // Otherwise combine all the fields for various bundles of the entity type
       // into a single return value.
       $combined_fields = array();
@@ -359,8 +351,7 @@ 
 
       if (in_array($filter_field, array_keys($properties), TRUE)) {
         $query->propertyCondition($properties[$filter_field], $filter_value, $operator);
-      }
-      else {
+      } else {
         // Look for the field name among the entity type's field list.
         foreach (self::entityTypeFields($entity_type) as $field_name => $field_type) {
           // If the filter field begins with a field name, then either the
@@ -384,8 +375,7 @@ 
               $column = key($field_info['columns']);
               $query->fieldCondition($field_name, $column, $filter_value, $operator);
               break;
-            }
-            else {
+            } else {
               // Otherwise if the filter field contains a valid column
               // specification for the field type, add the field condition to
               // the index query.
@@ -438,8 +428,7 @@ 
 
       if (in_array($sort_field, array_keys($properties), TRUE)) {
         $query->propertyOrderBy($properties[$sort_field], $direction);
-      }
-      else {
+      } else {
         // Look for the field name among the entity type's field list.
         foreach (self::entityTypeFields($entity_type) as $field_name => $field_type) {
           // If the sort field begins with a field name, then either the sort
@@ -453,8 +442,7 @@ 
               $column = key($field_info['columns']);
               $query->fieldOrderBy($field_name, $column, $direction);
               break;
-            }
-            else {
+            } else {
               // Otherwise if the sort field contains a valid column
               // specification for the field type, add the field condition to
               // the index query.

esdportal_api.module

Braces +17 added lines, -34 removed lines

@@ -583,8 +583,7 @@ 
 function _esdportal_api_retrieve_ec_state_rating($esd_ec_id, $batch_timestamp = NULL) {
   if (isset($batch_timestamp) && $batch_timestamp > 0) {
     $rating = db_query('SELECT * FROM {ec_state_ratings} WHERE timestamp=:batch_timestamp AND esd_ec_id=:esd_ec_id', array(':esd_ec_id' => $esd_ec_id, ':batch_timestamp' => $batch_timestamp))->fetchAssoc();
-  }
-  else {
+  } else {
     $rating = db_query('SELECT * FROM {ec_state_ratings} WHERE timestamp=(SELECT MAX(timestamp) FROM {ec_state_ratings}) AND esd_ec_id=:esd_ec_id', array(':esd_ec_id' => $esd_ec_id))->fetchAssoc();
   }
   return $rating;
@@ -615,8 +614,7 @@ 
 function _esdportal_api_index_ec_state_ratings($batch_timestamp = NULL) {
   if (isset($batch_timestamp) && $batch_timestamp > 0) {
     $ratings = db_query('SELECT * FROM {ec_state_ratings} WHERE timestamp=:batch_timestamp', array(':batch_timestamp' => $batch_timestamp))->fetchAssoc();
-  }
-  else {
+  } else {
     $ratings = db_query('SELECT * FROM {ec_state_ratings} WHERE timestamp=(SELECT MAX(timestamp) FROM {ec_state_ratings})')->fetchAll();
   }
 
@@ -794,16 +792,14 @@ 
     // Some schools don't have BCODEs.
     if (!isset($school->field_bcode[LANGUAGE_NONE])) {
       $school->bcode = NULL;
-    }
-    else {
+    } else {
       $school->bcode = $school->field_bcode[LANGUAGE_NONE][0]['value'];
     }
 
     // Some schools don't have ESD internal school IDs.
     if (!isset($school->field_esd_schid[LANGUAGE_NONE])) {
       $school->esd_schid = NULL;
-    }
-    else {
+    } else {
       $school->esd_schid = $school->field_esd_schid[LANGUAGE_NONE][0]['value'];
     }
 
@@ -843,13 +839,11 @@ 
 
           try {
             $res = $q->execute();
-          }
-          catch (Exception $e) {
+          } catch (Exception $e) {
             // No table?
             if ($e->getCode() == '42') {
               // Do nothing for now...
-            }
-            else {
+            } else {
               watchdog_exception('_esdportal_api_load_includes_for_schools', $e);
             }
           }
@@ -877,13 +871,11 @@ 
 
           try {
             $res = $q->execute();
-          }
-          catch (Exception $e) {
+          } catch (Exception $e) {
             // No table?
             if ($e->getCode() == '42') {
               // Do nothing for now...
-            }
-            else {
+            } else {
               watchdog_exception('_esdportal_api_load_includes_for_schools', $e);
             }
           }
@@ -919,8 +911,7 @@ 
     // Some ecs don't have program_ids.
     if (!isset($ec->field_esd_ec_id[LANGUAGE_NONE])) {
       $ec->program_id = NULL;
-    }
-    else {
+    } else {
       $ec->program_id = $ec->field_esd_ec_id[LANGUAGE_NONE][0]['value'];
     }
 
@@ -966,13 +957,11 @@ 
 
           try {
             $res = $q->execute();
-          }
-          catch (Exception $e) {
+          } catch (Exception $e) {
             // No table?
             if ($e->getCode() == '42') {
               // Do nothing for now...
-            }
-            else {
+            } else {
               watchdog_exception('_esdportal_api_load_includes_for_schools', $e);
             }
           }
@@ -1136,16 +1125,14 @@ 
   // Execute the query and load the terms it returns, if any.
   try {
     $result = $query->execute();
-  }
-  catch (Exception $e) {
+  } catch (Exception $e) {
     return services_error(t('request error'), 400);
   }
 
   if (!empty($result['taxonomy_term'])) {
     $tids = array_keys($result['taxonomy_term']);
     $terms = taxonomy_term_load_multiple($tids);
-  }
-  else {
+  } else {
     // Empty set.
     $terms = [];
   }
@@ -1240,14 +1227,12 @@ 
       if (!empty($args[$key])) {
         if (is_string($args[$key])) {
           $args[$key] = explode($value['commerce_services_explode'], $args[$key]);
-        }
-        elseif (is_array($args[$key])) {
+        } elseif (is_array($args[$key])) {
           foreach ($args[$key] as &$param) {
             $param = explode($value['commerce_services_explode'], $param);
           }
         }
-      }
-      else {
+      } else {
         // Otherwise ensure it is just converted to an array.
         $args[$key] = array();
       }
@@ -1278,8 +1263,7 @@ 
         // add it to the argument's value array now.
         if (in_array($param_key, array_keys(\Drupal\esdportal_api\EcDataUtils::entityTypeProperties($value['commerce_services_field_populate'])), TRUE)) {
           $args[$key][$param_key] = $param_value;
-        }
-        else {
+        } else {
           // Otherwise look and see if the parameter key begins with a field
           // name, assuming it must be either a field name or field column name.
           foreach (array_keys(\Drupal\esdportal_api\EcDataUtils::entityTypeFields($value['commerce_services_field_populate'])) as $field_name) {
@@ -1291,8 +1275,7 @@ 
               if ($field_name == $param_key && count($field_info['columns']) == 1) {
                 $args[$key][$param_key] = $param_value;
                 break;
-              }
-              else {
+              } else {
                 // Otherwise if the parameter key contains a valid column
                 // specification for the field type, add it to the argument's
                 // value array as well.