Merge branch 'release-2.21.0'

manifest.php

@@ -27,7 +27,7 @@
     'label' => 'Tao base',
     'description' => 'TAO meta-extension',
     'license' => 'GPL-2.0',
-    'version' => '2.20.0',
+    'version' => '2.21.0',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(
         'generis' => '>=2.12.0'

models/classes/controllerMap/Factory.php

@@ -156,7 +156,7 @@ private function isControllerClassNameValid($controllerClassName)
             // abstract so just move along
             $reflection = new \ReflectionClass($controllerClassName);
             if ($reflection->isAbstract()) {
-                common_Logger::w($controllerClassName.' is abstract');
+                common_Logger::i($controllerClassName.' is abstract');
                 $returnValue = false;
             }
         }

models/classes/mvc/Bootstrap.php

@@ -35,7 +35,6 @@
 use tao_helpers_Request;
 use tao_helpers_Uri;
 use Request;
-use HttpRequest;
 use HTTPToolkit;
 
 use Exception;
@@ -403,12 +402,12 @@ protected function setDefaultTimezone()
 	 *  @throws ActionEnforcingException in case of wrong module or action
 	 *  @throws tao_models_classes_UserException when a request try to acces a protected area
 	 */
-	protected function mvc()
-	{	
-		$re		= new HttpRequest();
-		$fc		= new TaoFrontController($re);
-		$fc->loadModule();
-	}
+    protected function mvc()
+    {
+        $re = \common_http_Request::currentRequest();
+        $fc = new TaoFrontController();
+        $fc->legacy($re);
+    }
 
 	/**
 	 * Load external resources for the current context

models/classes/routing/FlowController.php

@@ -27,7 +27,6 @@
 use common_ext_ExtensionsManager;
 use HTTPToolkit;
 use InterruptedActionException;
-use HttpRequest;
 use Context;
 use FlowController as ClearFwFlowController;
 use tao_helpers_Uri;

models/classes/routing/Resolver.php

@@ -50,7 +50,7 @@ class Resolver
     /**
      * Resolves a request to a method
      * 
-     * @param HttpRequest $pRequest
+     * @param common_http_Request $pRequest
      * @return string
      */
     public function __construct(common_http_Request $request) {

models/classes/routing/TaoFrontController.php

@@ -19,49 +19,35 @@
  */
 namespace oat\tao\model\routing;
 
-use FrontController;
-use HttpRequest;
 use Context;
 use InterruptedActionException;
 use common_ext_ExtensionsManager;
 use common_http_Request;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 
 /**
  * A simple controller to replace the ClearFw controller
  * 
  * @author Joel Bout, <[email protected]>
  */
-class TaoFrontController implements FrontController
+class TaoFrontController
 {
-    /**
-     * @var common_http_Request
-     */
-    private $httpRequest;
-
-    /**
-     * 
-     * @param HttpRequest $pRequest
-     */
-    public function __construct( HttpRequest $pRequest ) {
-        // ignore deprecated request class
-        $this->httpRequest = common_http_Request::currentRequest();
-    }
-
-    /**
-     * Returns the request to be executed
-     * 
-     * @return common_http_Request
-     */
-    protected function getRequest() {
-        return $this->httpRequest;
+
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response) {
+        $request->getUri();
+        $pRequest = \common_http_Request::currentRequest();
+        $this->legacy($pRequest, $response);
     }
 
     /**
-     * (non-PHPdoc)
-     * @see FrontController::loadModule()
+     * Run the controller
+     *
+     * @param common_http_Request $pRequest
+     * @param ResponseInterface $response
      */
-    public function loadModule() {
-        $resolver = new Resolver($this->getRequest());
+    public function legacy(common_http_Request $pRequest) {
+        $resolver = new Resolver($pRequest);
 
         // load the responsible extension
         $ext = common_ext_ExtensionsManager::singleton()->getExtensionById($resolver->getExtensionId());
@@ -89,7 +75,7 @@ public function loadModule() {
 
         try
         {
-            $enforcer = new ActionEnforcer($resolver->getExtensionId(), $resolver->getControllerClass(), $resolver->getMethodName(), $this->getRequest()->getParams());
+            $enforcer = new ActionEnforcer($resolver->getExtensionId(), $resolver->getControllerClass(), $resolver->getMethodName(), $pRequest->getParams());
             $enforcer->execute();
         }
         catch (InterruptedActionException $iE)

scripts/update/Updater.php

@@ -490,7 +490,7 @@ public function update($initialVersion) {
             $this->setVersion('2.19.0');
         }
 
-        $this->skip('2.19.0', '2.20.0');
+        $this->skip('2.19.0', '2.21.0');
 
     }
 

views/build/grunt/s3.js

@@ -7,6 +7,7 @@ module.exports = function(grunt) {
     var awsS3    = grunt.config('aws_s3') || {};
     var clean    = grunt.config('clean') || {};
     var root     = grunt.option('root');
+    var concurrency = grunt.option('s3-concurrency') || 20;                  // run the cli with --s3-concurrency=N
     var ext      = require('../tasks/helpers/extensions')(grunt, root);   //extension helper
     var out      = 'output';
 
@@ -40,7 +41,7 @@ module.exports = function(grunt) {
         accessKeyId: awsConfig.s3.accessKeyId,
         secretAccessKey: awsConfig.s3.secretKey,
         region: awsConfig.s3.region,
-        uploadConcurrency: 5,
+        uploadConcurrency: concurrency,
         bucket: awsConfig.s3.bucket
     };
     awsS3.clean = {