Merge branch 'MDL-41827_master' of git://github.com/dmonllao/moodle

Conflicts:
	admin/tool/generator/classes/site_backend.php

admin/tool/generator/cli/maketestcourse.php

@@ -35,6 +35,7 @@ list($options, $unrecognized) = cli_get_params(
         'shortname' => false,
         'size' => false,
         'fixeddataset' => false,
+        'filesizelimit' => false,
         'bypasscheck' => false,
         'quiet' => false
     ),
@@ -52,11 +53,12 @@ Not for use on live sites; only normally works if debugging is set to DEVELOPER
 level.
 
 Options:
---shortname    Shortname of course to create (required)
---size         Size of course to create XS, S, M, L, XL, or XXL (required)
---fixeddataset Use a fixed data set instead of randomly generated data
---bypasscheck  Bypasses the developer-mode check (be careful!)
---quiet        Do not show any output
+--shortname      Shortname of course to create (required)
+--size           Size of course to create XS, S, M, L, XL, or XXL (required)
+--fixeddataset   Use a fixed data set instead of randomly generated data
+--filesizelimit  Limits the size of the generated files to the specified bytes
+--bypasscheck    Bypasses the developer-mode check (be careful!)
+--quiet          Do not show any output
 
 -h, --help     Print out this help
 
@@ -76,6 +78,7 @@ if (empty($options['bypasscheck']) && !debugging('', DEBUG_DEVELOPER)) {
 $shortname = $options['shortname'];
 $sizename = $options['size'];
 $fixeddataset = $options['fixeddataset'];
+$filesizelimit = $options['filesizelimit'];
 
 // Check size.
 try {
@@ -93,5 +96,5 @@ if ($error = tool_generator_course_backend::check_shortname_available($shortname
 \core\session\manager::set_user(get_admin());
 
 // Do backend code to generate course.
-$backend = new tool_generator_course_backend($shortname, $size, $fixeddataset, empty($options['quiet']));
+$backend = new tool_generator_course_backend($shortname, $size, $fixeddataset, $filesizelimit, empty($options['quiet']));
 $id = $backend->make();

admin/tool/generator/cli/maketestsite.php

@@ -34,6 +34,7 @@ list($options, $unrecognized) = cli_get_params(
         'help' => false,
         'size' => false,
         'fixeddataset' => false,
+        'filesizelimit' => false,
         'bypasscheck' => false,
         'quiet' => false
     ),
@@ -57,10 +58,11 @@ Consider that, depending on the size you select, this CLI tool can really genera
 $sitesizes
 
 Options:
---size         Size of the generated site, this value affects the number of courses and their size. Accepted values: XS, S, M, L, XL, or XXL (required)
---fixeddataset Use a fixed data set instead of randomly generated data
---bypasscheck  Bypasses the developer-mode check (be careful!)
---quiet        Do not show any output
+--size           Size of the generated site, this value affects the number of courses and their size. Accepted values: XS, S, M, L, XL, or XXL (required)
+--fixeddataset   Use a fixed data set instead of randomly generated data
+--filesizelimit  Limits the size of the generated files to the specified bytes
+--bypasscheck    Bypasses the developer-mode check (be careful!)
+--quiet          Do not show any output
 
 -h, --help     Print out this help
 
@@ -79,6 +81,7 @@ if (empty($options['bypasscheck']) && !$CFG->debugdeveloper) {
 // Get options.
 $sizename = $options['size'];
 $fixeddataset = $options['fixeddataset'];
+$filesizelimit = $options['filesizelimit'];
 
 // Check size.
 try {
@@ -91,5 +94,5 @@ try {
 \core\session\manager::set_user(get_admin());
 
 // Do backend code to generate site.
-$backend = new tool_generator_site_backend($size, $options['bypasscheck'], $fixeddataset, empty($options['quiet']));
+$backend = new tool_generator_site_backend($size, $options['bypasscheck'], $fixeddataset, $filesizelimit, empty($options['quiet']));
 $backend->make();