Merge pull request #34 from itmundi/bypass-craft-caching-system

Bypass craft caching system
nerds-and-company · Feb 23, 2016 · cffd709 · cffd709
2 parents c36d9f9 + 4ff521a
commit cffd709
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -70,6 +70,10 @@ public function registerSchematicFieldModels()
 
 ## Changelog
 
+###3.1.4###
+ - Reset craft field service cache before each import
+ - Get section entry types by section id in stead of from section
+
 ###3.1.3###
  - Added array_key_exists checks for AssetField settings
 

diff --git a/src/Services/Fields.php b/src/Services/Fields.php
@@ -138,6 +138,7 @@ public function import(array $groupDefinitions, $force = false)
             $contentService->fieldContext = 'global';
             $contentService->contentTable = 'content';
 
+            $this->resetCraftFieldsServiceCache();
             $this->groups = $this->getFieldsService()->getAllGroups('name');
             $this->fields = $this->getFieldsService()->getAllFields('handle');
 
@@ -424,4 +425,16 @@ private function getPrepareFieldLayout(array $fieldLayoutDef)
             'required' => $requiredFields,
         ];
     }
+
+    /**
+     * Reset craft fields service cache using reflection
+     */
+    private function resetCraftFieldsServiceCache()
+    {
+        $obj         = $this->getFieldsService();
+        $refObject   = new \ReflectionObject( $obj );
+        $refProperty = $refObject->getProperty( '_fetchedAllGroups' );
+        $refProperty->setAccessible( true );
+        $refProperty->setValue($obj, false);
+    }
 }
diff --git a/src/Services/Sections.php b/src/Services/Sections.php
@@ -186,7 +186,7 @@ public function import(array $sectionDefinitions, $force = false)
                 continue;
             }
 
-            $entryTypes = $section->getEntryTypes('handle');
+            $entryTypes = Craft::app()->sections->getEntryTypesBySectionId($section->id, 'handle');
 
             foreach ($sectionDefinition['entryTypes'] as $entryTypeHandle => $entryTypeDefinition) {
                 $entryType = array_key_exists($entryTypeHandle, $entryTypes)