better error message when trying to generate a migration for the crea…

…tion of a Role fails
ezecosystem · Nov 11, 2017 · a9c4cbb · a9c4cbb
1 parent 91c2e2c
commit a9c4cbb
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/Core/Executor/RepositoryExecutor.php b/Core/Executor/RepositoryExecutor.php
@@ -135,13 +135,17 @@ protected function getUserContentType($step)
         return isset($step->dsl['user_content_type']) ? $step->dsl['user_content_type'] : $this->getUserContentTypeFromContext($step->context);
     }
 
+    /**
+     * @param array $context
+     * @return string
+     */
     protected function getUserContentTypeFromContext($context)
     {
         return isset($context['userContentType']) ? $context['userContentType'] : self::USER_CONTENT_TYPE;
     }
 
     /**
-     * @param $context we have to return FALSE if that is set as adminUserLogin, whereas if NULL is set, we return the default admin
+     * @param array $context we have to return FALSE if that is set as adminUserLogin, whereas if NULL is set, we return the default admin
      * @return int|string|false
      */
     protected function getAdminUserIdentifierFromContext($context)

diff --git a/Core/Executor/RoleManager.php b/Core/Executor/RoleManager.php
@@ -246,6 +246,9 @@ public function generateMigration(array $matchCondition, $mode, array $context =
                     $limitations = array();
 
                     foreach ($policy->getLimitations() as $limitation) {
+                        if ($limitation === null) {
+                            throw new \Exception("The role contains NULL as limitation for policy {$policy->module}/{$policy->function}, we can not reliably generate its definition.");
+                        }
                         $limitations[] = $this->limitationConverter->getLimitationArrayWithIdentifiers($limitation);
                     }
 

diff --git a/WHATSNEW.md b/WHATSNEW.md
@@ -13,6 +13,9 @@ Version 4.4 (unreleased)
 * New: support the value '*' for the `remove_attributes` parameter in ContentType definitions. This allows to remove all
     the attributes which already exist in the ContentType, except for the ones defined in the `attributes` parameter
 
+* Improved: better error message when trying to generate a migration for the creation of a Role which has Policies with
+    limitations that can not be exported
+
 
 Version 4.3
 ===========