#39 #34 added the option to ignore children

TobiasFranek · Aug 31, 2018 · 3c61399 · 3c61399
1 parent 42d8b2d
commit 3c61399
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/Configuration/WebuntisConfiguration.php b/src/Configuration/WebuntisConfiguration.php
@@ -5,6 +5,8 @@
 
 use Webuntis\Repositories\Repository;
 use Webuntis\WebuntisFactory;
+use Webuntis\Models\AbstractModel;
+use Webuntis\Models\Interfaces\ConfigurationModelInterface;
 
 /**
  * manages the different configurations and passes them to the WebuntisFactory
@@ -32,6 +34,27 @@ public static function addConfig(array $config) : void
         WebuntisFactory::setConfig($newConfig);
     }
 
+    /**
+     * gets the right instance config from given model
+     * @param AbstractModel $model 
+     * @return array
+     */
+    public static function getConfigByModel(AbstractModel $model) : array
+    {
+        $config = WebuntisFactory::getConfig();
+        $model = get_class($model);
+        $interfaces = class_implements($model);
+        if (isset($interfaces[ConfigurationModelInterface::class])) {
+            $configName = $model::CONFIG_NAME;
+        } else if (isset($config['only_admin']) && $config['only_admin']) {
+            $configName = 'admin';
+        } else {
+            $configName = 'default';
+        }
+
+        return $config[$configName];
+    } 
+
     /**
      * gets the current config
      * @return array

diff --git a/src/Types/TypeHandler.php b/src/Types/TypeHandler.php
@@ -5,6 +5,7 @@
 
 
 use Webuntis\Configuration\YAMLConfiguration;
+use Webuntis\Configuration\WebuntisConfiguration;
 use Webuntis\Exceptions\TypeException;
 use Webuntis\Models\AbstractModel;
 use Webuntis\Types\Interfaces\TypeInterface;
@@ -67,10 +68,15 @@ public static function getAllTypes() : array
      */
     public function handle(AbstractModel &$model, array $data, array $fields) : void 
     {
+        $instanceConfig = WebuntisConfiguration::getConfigByModel($model);
         foreach ($fields as $key => $value) {
             $implements = class_implements(self::$types[$value['type']]);
             if (isset($implements[TypeInterface::class])) {
-                self::$types[$value['type']]::execute($model, $data, [$key => $value]);
+                if(($value['type'] == 'model' || $value['type'] == 'modelCollection') && (isset($instanceConfig['ignore_children']) && $instanceConfig['ignore_children'])) {
+                    self::$types['array']::execute($model, $data, [$key => $value]);
+                } else {
+                    self::$types[$value['type']]::execute($model, $data, [$key => $value]);
+                }
             } else {
                 throw new TypeException('this type is not supported');
             }