gurucomkz / silverstripe-eagerloading

src/DataFilterEagerLoadingExtension.php

Spacing +4 added lines, -4 removed lines

@@ -13,12 +13,12 @@
     public $withList = [];
     public function with($list) {
         // return $this->owner;
-        if(!isset($this->owner->withList)){
+        if (!isset($this->owner->withList)) {
             $this->owner->withList = [];
         }
-        if(!is_array($list)) $list = [$list];
-        $list = array_map(function($e){return explode('.',$e); },$list);
-        $this->owner->withList = array_merge($this->owner->withList,$list);
+        if (!is_array($list)) $list = [$list];
+        $list = array_map(function($e) {return explode('.', $e); },$list);
+        $this->owner->withList = array_merge($this->owner->withList, $list);
         return EagerLoadedDataList::cloneFrom($this->owner);
     }
 

Braces +3 added lines, -1 removed lines

@@ -16,7 +16,9 @@
         if(!isset($this->owner->withList)){
             $this->owner->withList = [];
         }
-        if(!is_array($list)) $list = [$list];
+        if(!is_array($list)) {
+            $list = [$list];
+        }
         $list = array_map(function($e){return explode('.',$e); },$list);
         $this->owner->withList = array_merge($this->owner->withList,$list);
         return EagerLoadedDataList::cloneFrom($this->owner);

src/GridFieldEagerLoadManipulator.php

Spacing +8 added lines, -8 removed lines

@@ -34,21 +34,21 @@
         $config = Config::forClass($class);
         $vars = $gridField->getForm()->getController()->getRequest()->requestVars();
         $eager = $config->get('eager_loading');
-        if(in_array('Export to CSV',$vars)) {
+        if (in_array('Export to CSV', $vars)) {
             $export_fields = $config->get('export_fields');
-            if($export_fields) {
+            if ($export_fields) {
                 $export_eager = [];
-                foreach($export_fields as $field=>$_title) {
-                    $parts = explode('.',$field);
-                    if(count($parts) < 2) continue;
-                    $main = implode('.', array_slice($parts,0,-1));
-                    if(!in_array($main,$eager)){
+                foreach ($export_fields as $field=>$_title) {
+                    $parts = explode('.', $field);
+                    if (count($parts) < 2) continue;
+                    $main = implode('.', array_slice($parts, 0, -1));
+                    if (!in_array($main, $eager)) {
                         $eager[] = $main;
                     }
                 }
             }
         }
-        if($eager) return $dataList->with($eager);
+        if ($eager) return $dataList->with($eager);
         return $dataList;
     }
 }

Braces +6 added lines, -2 removed lines

@@ -40,7 +40,9 @@ 
                 $export_eager = [];
                 foreach($export_fields as $field=>$_title) {
                     $parts = explode('.',$field);
-                    if(count($parts) < 2) continue;
+                    if(count($parts) < 2) {
+                        continue;
+                    }
                     $main = implode('.', array_slice($parts,0,-1));
                     if(!in_array($main,$eager)){
                         $eager[] = $main;
@@ -48,7 +50,9 @@ 
                 }
             }
         }
-        if($eager) return $dataList->with($eager);
+        if($eager) {
+            return $dataList->with($eager);
+        }
         return $dataList;
     }
 }

src/EagerLoaderMultiAccessor.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 trait EagerLoaderMultiAccessor {
     public function __call($method, $arguments)
     {
-        if ($method !== 'tryEagerLoadingRelation'){
+        if ($method !== 'tryEagerLoadingRelation') {
             if (null !== ($eagerResult = $this->tryEagerLoadingRelation($method))) {
                 return $eagerResult;
             }

src/ProxyDBCounterExtension.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     public function updateProxy(ProxyGenerator &$proxy)
     {
         // In the closure, $this is the proxied database
-        $callback = function ($args, $next) {
+        $callback = function($args, $next) {
 
             // The first argument is always the sql query
             $sql = $args[0];

tests/EagerloadTest.php

Spacing +13 added lines, -13 removed lines

@@ -29,12 +29,12 @@ 
 
         $players = Player::get()->with('Team');
 
-        foreach($players as $player) {
+        foreach ($players as $player) {
             $team = $player->Team->Title;
         }
         $post_fetch_count = ProxyDBCounterExtension::getQueriesCount();
 
-        $this->assertEquals($pre_fetch_count + $expectedQueries,$post_fetch_count);
+        $this->assertEquals($pre_fetch_count + $expectedQueries, $post_fetch_count);
     }
 
     public function testHasMany()
@@ -45,12 +45,12 @@ 
 
         $teams = Team::get()->with('Players');
 
-        foreach($teams as $team) {
+        foreach ($teams as $team) {
             $players = $team->Players()->map()->toArray();
         }
         $post_fetch_count = ProxyDBCounterExtension::getQueriesCount();
 
-        $this->assertEquals($pre_fetch_count + $expectedQueries,$post_fetch_count);
+        $this->assertEquals($pre_fetch_count + $expectedQueries, $post_fetch_count);
     }
 
     public function testManyMany()
@@ -61,13 +61,13 @@ 
 
         $players = Player::get()->with('Listens');
 
-        foreach($players as $player) {
+        foreach ($players as $player) {
             $music = $player->Listens()->map()->toArray();
             // print_r($music);
         }
         $post_fetch_count = ProxyDBCounterExtension::getQueriesCount();
 
-        $this->assertEquals($pre_fetch_count + $expectedQueries,$post_fetch_count);
+        $this->assertEquals($pre_fetch_count + $expectedQueries, $post_fetch_count);
     }
 
     // public function testBelongsToManyMany()
@@ -94,9 +94,9 @@ 
         ProxyDBCounterExtension::resetQueries();
         $pre_fetch_count = ProxyDBCounterExtension::getQueriesCount();
 
-        $players = Player::get()->with(['Team','Origin']);
+        $players = Player::get()->with(['Team', 'Origin']);
 
-        foreach($players as $player) {
+        foreach ($players as $player) {
             $team = $player->Team->Title;
             $origin = $player->Origin->Title;
         }
@@ -104,7 +104,7 @@ 
 
         // print_r(ProxyDBCounterExtension::getQueries());
 
-        $this->assertEquals($pre_fetch_count + $expectedQueries,$post_fetch_count);
+        $this->assertEquals($pre_fetch_count + $expectedQueries, $post_fetch_count);
     }
 
     public function testHasOneChain()
@@ -115,14 +115,14 @@ 
 
         $players = Player::get()->with(['Team.Origin']);
 
-        foreach($players as $player) {
+        foreach ($players as $player) {
             $team = $player->Team->Origin->Title;
         }
         $post_fetch_count = ProxyDBCounterExtension::getQueriesCount();
 
         // print_r(ProxyDBCounterExtension::getQueries());
 
-        $this->assertEquals($pre_fetch_count + $expectedQueries,$post_fetch_count);
+        $this->assertEquals($pre_fetch_count + $expectedQueries, $post_fetch_count);
     }
 
     public function testChainOneMany()
@@ -133,12 +133,12 @@ 
 
         $players = Player::get()->with(['Team.Players']);
 
-        foreach($players as $player) {
+        foreach ($players as $player) {
             $team = $player->Team->Players()->map()->toArray();
         }
         $post_fetch_count = ProxyDBCounterExtension::getQueriesCount();
 
-        $this->assertEquals($pre_fetch_count + $expectedQueries,$post_fetch_count);
+        $this->assertEquals($pre_fetch_count + $expectedQueries, $post_fetch_count);
     }
 
 }

src/EagerLoadedDataList.php

Spacing +67 added lines, -67 removed lines

@@ -10,7 +10,7 @@ 
  * Replaces DataList when EagerLoading is used. Fetches data when the main query is actually executed.
  * Appends related objects when a DataObject is actually created.
  */
-class EagerLoadedDataList extends DataList{
+class EagerLoadedDataList extends DataList {
 
     const ID_LIMIT = 5000;
     public $withList = [];
@@ -22,7 +22,7 @@ 
 
     public function __construct($classOrList)
     {
-        if(is_string($classOrList)) {
+        if (is_string($classOrList)) {
             parent::__construct($classOrList);
         } else {
             parent::__construct($classOrList->dataClass());
@@ -40,10 +40,10 @@ 
         return $clone;
     }
 
-    public static function extractField($arr,$field)
+    public static function extractField($arr, $field)
     {
         $result = [];
-        foreach($arr as $record){
+        foreach ($arr as $record) {
             $result[is_object($record) ? $record->ID : $record['ID']] = is_object($record) ? $record->$field : $record[$field];
         }
         return $result;
@@ -51,8 +51,8 @@ 
     public static function reverseMap($arr)
     {
         $result = [];
-        foreach($arr as $k => $v){
-            if(!isset($result[$v])) $result[$v] = [];
+        foreach ($arr as $k => $v) {
+            if (!isset($result[$v])) $result[$v] = [];
             $result[$v][] = $k;
         }
         return $result;
@@ -76,35 +76,35 @@ 
     private $relationsPrepared = false;
 
     public function prepareEagerRelations() {
-        if($this->relationsPrepared) return;
+        if ($this->relationsPrepared) return;
         $this->relationsPrepared = true;
         $localClass = $this->dataClass();
         $config = Config::forClass($localClass);
-        $hasOnes = (array)$config->get('has_one');
-        $hasManys = (array)$config->get('has_many');
-        $manyManys = (array)$config->get('many_many');
+        $hasOnes = (array) $config->get('has_one');
+        $hasManys = (array) $config->get('has_many');
+        $manyManys = (array) $config->get('many_many');
 
         //collect has_ones
-        $withHasOnes = array_filter($this->withList,function($dep)use($hasOnes){ return array_key_exists($dep[0],$hasOnes); });
-        $withHasManys = array_filter($this->withList,function($dep)use($hasManys){ return array_key_exists($dep[0],$hasManys); });
-        $withManyManys = array_filter($this->withList,function($dep)use($manyManys){ return array_key_exists($dep[0],$manyManys); });
+        $withHasOnes = array_filter($this->withList, function($dep)use($hasOnes){ return array_key_exists($dep[0], $hasOnes); });
+        $withHasManys = array_filter($this->withList, function($dep)use($hasManys){ return array_key_exists($dep[0], $hasManys); });
+        $withManyManys = array_filter($this->withList, function($dep)use($manyManys){ return array_key_exists($dep[0], $manyManys); });
 
-        if(!count($withHasOnes) && !count($withHasManys) && !count($withManyManys)){
+        if (!count($withHasOnes) && !count($withHasManys) && !count($withManyManys)) {
             // do nothing if no matches
             /** @todo report errors */
             return;
         }
 
         $data = $this->column('ID');
-        if(count($withHasOnes)){
+        if (count($withHasOnes)) {
             $this->_prepareCache($hasOnes, $withHasOnes);
             $this->eagerLoadHasOne($data, $hasOnes, $withHasOnes);
         }
-        if(count($withHasManys)){
+        if (count($withHasManys)) {
             $this->_prepareCache($hasManys, $withHasManys);
             $this->eagerLoadHasMany($data, $hasManys, $withHasManys);
         }
-        if(count($withManyManys)){
+        if (count($withManyManys)) {
             $this->_prepareCache($manyManys, $withManyManys);
             $this->eagerLoadManyMany($data, $manyManys, $withManyManys);
         }
@@ -117,15 +117,15 @@ 
 
         //collect required IDS
         $fields = ['ID'];
-        foreach($withHasOnes as $depSeq) {
+        foreach ($withHasOnes as $depSeq) {
             $dep = $depSeq[0];
             $fields[] = "{$dep}ID";
         }
         $table = Config::forClass($this->dataClass)->get('table_name');
-        $data = new SQLSelect(implode(',',$fields),[$table],["ID IN (".implode(',',$ids).")"]);
-        $data = self::EnsureArray($data->execute(),'ID');
+        $data = new SQLSelect(implode(',', $fields), [$table], ["ID IN (".implode(',', $ids).")"]);
+        $data = self::EnsureArray($data->execute(), 'ID');
 
-        foreach($withHasOnes as $depSeq) {
+        foreach ($withHasOnes as $depSeq) {
             $dep = $depSeq[0];
             $depClass = $hasOnes[$dep];
 
@@ -137,17 +137,17 @@ 
 
             $component = $schema->hasOneComponent($this->dataClass, $dep);
 
-            $descriptor['map'] = self::extractField($data,$descriptor['localField']);
+            $descriptor['map'] = self::extractField($data, $descriptor['localField']);
             $uniqueIDs = array_unique($descriptor['map']);
-            while(count($uniqueIDs)) {
-                $IDsubset = array_splice($uniqueIDs,0,self::ID_LIMIT);
-                $result = DataObject::get($depClass)->filter('ID',$IDsubset);
-                if(count($depSeq)>1){
+            while (count($uniqueIDs)) {
+                $IDsubset = array_splice($uniqueIDs, 0, self::ID_LIMIT);
+                $result = DataObject::get($depClass)->filter('ID', $IDsubset);
+                if (count($depSeq) > 1) {
                     $result = $result
-                        ->with(implode('.',array_slice($depSeq,1)));
+                        ->with(implode('.', array_slice($depSeq, 1)));
                 }
 
-                foreach($result as $depRecord) {
+                foreach ($result as $depRecord) {
                     $this->_relatedCache[$depClass][$depRecord->ID] = $depRecord;
                 }
             }
@@ -160,9 +160,9 @@ 
     public function eagerLoadHasMany($data, $hasManys, $withHasManys)
     {
         $localClass = $this->dataClass();
-        $localClassTail = basename(str_replace('\\','/',$localClass));
+        $localClassTail = basename(str_replace('\\', '/', $localClass));
 
-        foreach($withHasManys as $depSeq) {
+        foreach ($withHasManys as $depSeq) {
             $dep = $depSeq[0];
             $depClass = $hasManys[$dep];
             $localNameInDep = $localClassTail;
@@ -173,18 +173,18 @@ 
                 'remoteField' => $depKey,
                 'map' => [],
             ];
-            $result = DataObject::get($depClass)->filter($depKey,$data);
-            if(count($depSeq)>1){
+            $result = DataObject::get($depClass)->filter($depKey, $data);
+            if (count($depSeq) > 1) {
                 $result = $result
-                    ->with(implode('.',array_slice($depSeq,1)));
+                    ->with(implode('.', array_slice($depSeq, 1)));
             }
 
             $collection = [];
 
-            foreach($data as $localRecordID){
+            foreach ($data as $localRecordID) {
                 $collection[$localRecordID] = [];
             }
-            foreach($result as $depRecord) {
+            foreach ($result as $depRecord) {
 
                 $this->_relatedCache[$depClass][$depRecord->ID] = $depRecord;
                 $collection[$depRecord->$depKey][] = $depRecord->ID;
@@ -200,7 +200,7 @@ 
         $localClass = $this->dataClass();
         $schema = DataObject::getSchema();
 
-        foreach($withManyManys as $depSeq) {
+        foreach ($withManyManys as $depSeq) {
             $dep = $depSeq[0];
             $depClass = $manyManys[$dep];
 
@@ -212,30 +212,30 @@ 
             ];
 
             $idsQuery = SQLSelect::create(
-                implode(',',[$component['childField'],$component['parentField']]),
+                implode(',', [$component['childField'], $component['parentField']]),
                 $component['join'],
                 [
-                    $component['parentField'].' IN (' . implode(',',$data).')'
+                    $component['parentField'].' IN ('.implode(',', $data).')'
                 ]
                 )->execute();
 
             $collection = [];
             $relListReverted = [];
-            foreach($idsQuery as $row){
+            foreach ($idsQuery as $row) {
                 $relID = $row[$component['childField']];
                 $localID = $row[$component['parentField']];
-                if(!isset($collection[$localID])) $collection[$localID] = [];
+                if (!isset($collection[$localID])) $collection[$localID] = [];
                 $collection[$localID][] = $relID;
-                $relListReverted[$relID] = 1;//use ids as keys to avoid
+                $relListReverted[$relID] = 1; //use ids as keys to avoid
             }
 
-            $result = DataObject::get($depClass)->filter('ID',array_keys($relListReverted));
-            if(count($depSeq)>1){
+            $result = DataObject::get($depClass)->filter('ID', array_keys($relListReverted));
+            if (count($depSeq) > 1) {
                 $result = $result
-                    ->with(implode('.',array_slice($depSeq,1)));
+                    ->with(implode('.', array_slice($depSeq, 1)));
             }
 
-            foreach($result as $depRecord) {
+            foreach ($result as $depRecord) {
                 $this->_relatedCache[$depClass][$depRecord->ID] = $depRecord;
             }
 
@@ -249,11 +249,11 @@ 
 
     public function fulfillEagerRelations(DataObject $item)
     {
-        foreach($this->_relatedMaps['has_one'] as $dep => $depInfo){
+        foreach ($this->_relatedMaps['has_one'] as $dep => $depInfo) {
             $depClass = $depInfo['class'];
-            if(isset($depInfo['map'][$item->ID])) {
+            if (isset($depInfo['map'][$item->ID])) {
                 $depID = $depInfo['map'][$item->ID];
-                if(isset($this->_relatedCache[$depClass][$depID]))
+                if (isset($this->_relatedCache[$depClass][$depID]))
                 {
                     $depRecord = $this->_relatedCache[$depClass][$depID];
                     $item->setComponent($dep, $depRecord);
@@ -261,31 +261,31 @@ 
             }
         }
 
-        foreach($this->_relatedMaps['has_many'] as $dep => $depInfo){
+        foreach ($this->_relatedMaps['has_many'] as $dep => $depInfo) {
             $depClass = $depInfo['class'];
             $collection = [];
-            if(isset($depInfo['map'][$item->ID])){
-                foreach($depInfo['map'][$item->ID] as $depID){
-                    if(isset($this->_relatedCache[$depClass][$depID]))
+            if (isset($depInfo['map'][$item->ID])) {
+                foreach ($depInfo['map'][$item->ID] as $depID) {
+                    if (isset($this->_relatedCache[$depClass][$depID]))
                     {
                         $depRecord = $this->_relatedCache[$depClass][$depID];
                         $collection[] = $depRecord;
                     }
                 }
             }
-            if(!method_exists($item,'addEagerRelation')) {
+            if (!method_exists($item, 'addEagerRelation')) {
                 throw new \Exception("Model {$item->ClassName} must include Gurucomkz\EagerLoading\EagerLoaderMultiAccessor trait to use eager loading for \$has_many");
             }
             $item->addEagerRelation($dep, $collection);
         }
 
-        foreach($this->_relatedMaps['many_many'] as $dep => $depInfo){
+        foreach ($this->_relatedMaps['many_many'] as $dep => $depInfo) {
             $depClass = $depInfo['class'];
             $collection = [];
-            if(isset($depInfo['map'][$item->ID])){
-                foreach($depInfo['map'][$item->ID] as $depIDlist){
-                    foreach($depIDlist as $depID){
-                        if(isset($this->_relatedCache[$depClass][$depID]))
+            if (isset($depInfo['map'][$item->ID])) {
+                foreach ($depInfo['map'][$item->ID] as $depIDlist) {
+                    foreach ($depIDlist as $depID) {
+                        if (isset($this->_relatedCache[$depClass][$depID]))
                         {
                             $depRecord = $this->_relatedCache[$depClass][$depID];
                             $collection[] = $depRecord;
@@ -293,7 +293,7 @@ 
                     }
                 }
             }
-            if(!method_exists($item,'addEagerRelation')) {
+            if (!method_exists($item, 'addEagerRelation')) {
                 throw new \Exception("Model {$item->ClassName} must include Gurucomkz\EagerLoading\EagerLoaderMultiAccessor trait to use eager loading for \$many_many");
             }
             $item->addEagerRelation($dep, $collection);
@@ -314,25 +314,25 @@ 
         }
     }
 
-    private function _prepareCache($all,$selected)
+    private function _prepareCache($all, $selected)
     {
-        foreach($selected as $depSeq) {
+        foreach ($selected as $depSeq) {
             $dep = $depSeq[0];
             $depClass = $all[$dep];
-            if(!isset($this->_relatedCache[$depClass])) { $this->_relatedCache[$depClass] = []; }
+            if (!isset($this->_relatedCache[$depClass])) { $this->_relatedCache[$depClass] = []; }
         }
     }
 
 
     public static function EnsureArray($arr, $kfield = null)
     {
-        if(is_array($arr)) return $arr;
+        if (is_array($arr)) return $arr;
         $result = [];
-        foreach($arr as $k => $v){
+        foreach ($arr as $k => $v) {
             $key = $k;
-            if($kfield!==null) {
-                if(is_array($v) && isset($v[$kfield])) $key = $v[$kfield];
-                elseif(is_object($v) && isset($v->$kfield)) $key = $v->$kfield;
+            if ($kfield !== null) {
+                if (is_array($v) && isset($v[$kfield])) $key = $v[$kfield];
+                elseif (is_object($v) && isset($v->$kfield)) $key = $v->$kfield;
             }
             $result[$key] = $v;
         }

Braces +17 added lines, -6 removed lines

@@ -52,7 +52,9 @@ 
     {
         $result = [];
         foreach($arr as $k => $v){
-            if(!isset($result[$v])) $result[$v] = [];
+            if(!isset($result[$v])) {
+                $result[$v] = [];
+            }
             $result[$v][] = $k;
         }
         return $result;
@@ -76,7 +78,9 @@ 
     private $relationsPrepared = false;
 
     public function prepareEagerRelations() {
-        if($this->relationsPrepared) return;
+        if($this->relationsPrepared) {
+            return;
+        }
         $this->relationsPrepared = true;
         $localClass = $this->dataClass();
         $config = Config::forClass($localClass);
@@ -224,7 +228,9 @@ 
             foreach($idsQuery as $row){
                 $relID = $row[$component['childField']];
                 $localID = $row[$component['parentField']];
-                if(!isset($collection[$localID])) $collection[$localID] = [];
+                if(!isset($collection[$localID])) {
+                    $collection[$localID] = [];
+                }
                 $collection[$localID][] = $relID;
                 $relListReverted[$relID] = 1;//use ids as keys to avoid
             }
@@ -326,13 +332,18 @@ 
 
     public static function EnsureArray($arr, $kfield = null)
     {
-        if(is_array($arr)) return $arr;
+        if(is_array($arr)) {
+            return $arr;
+        }
         $result = [];
         foreach($arr as $k => $v){
             $key = $k;
             if($kfield!==null) {
-                if(is_array($v) && isset($v[$kfield])) $key = $v[$kfield];
-                elseif(is_object($v) && isset($v->$kfield)) $key = $v->$kfield;
+                if(is_array($v) && isset($v[$kfield])) {
+                    $key = $v[$kfield];
+                } elseif(is_object($v) && isset($v->$kfield)) {
+                    $key = $v->$kfield;
+                }
             }
             $result[$key] = $v;
         }