ESDet / esdportal_api

src/EcDataUtils.php

Doc Comments +1 added lines

@@ -210,6 +210,7 @@
 
   /**
    * Converts underscore_name to camelName.
+   * @param string $underscore_name
    */
   public static function underscoreToCamel($underscore_name) {
     $underscore_name[0] = strtoupper($underscore_name[0]);

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.

src/Serializers/EcSerializer.php

Spacing +3 added lines, -3 removed lines

@@ -62,7 +62,7 @@ 
    * Handles inclusion of ec_profiles.
    */
   protected function ec_profile() {
-    return function ($ec, $include, $included) {
+    return function($ec, $include, $included) {
       $serializer = new EcProfileSerializer($included);
 
       if (!$ec->ec_profile_id) {
@@ -81,7 +81,7 @@ 
    * Handles inclusion of most_recent_ec_state_ratings.
    */
   protected function most_recent_ec_state_rating() {
-    return function ($ec, $include, $included) {
+    return function($ec, $include, $included) {
       $serializer = new EcStateRatingSerializer($included);
 
       if (!isset($ec->most_recent_ec_state_rating)) {
@@ -106,7 +106,7 @@ 
     self::$potentialDataTables = \Drupal\esdportal_api\EcDataUtils::getDataTablesWithProgramIds();
     self::$potentialDataTableNames = \Drupal\esdportal_api\EcDataUtils::extractDataTableNames(self::$potentialDataTables);
 
-    return function ($ec, $include, $included) use ($method) {
+    return function($ec, $include, $included) use ($method) {
       // The actual called method is underscore-separated...
       $table_name = $method;
 

src/Serializers/SchoolSerializer.php

Spacing +2 added lines, -2 removed lines

@@ -84,7 +84,7 @@ 
    * Handles inclusion of school_profiles.
    */
   protected function school_profile() {
-    return function ($school, $include, $included) {
+    return function($school, $include, $included) {
       $serializer = new SchoolProfileSerializer($included);
 
       if (!$school->school_profile_id) {
@@ -109,7 +109,7 @@ 
     self::$potentialDataTables = \Drupal\esdportal_api\EcDataUtils::getDataTablesWithBcodes();
     self::$potentialDataTableNames = \Drupal\esdportal_api\EcDataUtils::extractDataTableNames(self::$potentialDataTables);
 
-    return function ($school, $include, $included) use ($method) {
+    return function($school, $include, $included) use ($method) {
       // The actual called method is underscore-separated...
       $table_name = $method;