PMCORE-3835

composer.json

@@ -31,8 +31,8 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "php": ">=7.1",
+        "php": "^7.4|^8.1",
-        "laravel/framework": "5.7.*",
+        "laravel/framework": "8.83.*",
         "luracast/restler": "3.0",
         "bshaffer/oauth2-server-php": "v1.0",
         "colosa/pmui": "release/3.7.5-dev",
@@ -41,8 +41,8 @@
         "colosa/taskscheduler": "release/1.0.3-dev",
         "google/apiclient": "1.1.6",
         "dapphp/securimage": "^3.6",
-        "psr/log": "1.0.0",
+        "psr/log": "1.0.1",
-        "monolog/monolog": "1.19.0",
+        "monolog/monolog": "^2.1",
         "geshi/geshi": "dev-master",
         "libchart/libchart": "1.4.0",
         "phpmailer/phpmailer": "^6.4",
@@ -52,10 +52,9 @@
         "ralouphie/getallheaders": "^2.0",
         "smarty/smarty": "2.6.31",
         "pdepend/pdepend": "@stable",
-        "chumper/zipper": "^1.0",
         "php-imap/php-imap": "^3.0",
         "nikic/php-parser": "3.1.5",
-        "laravel/tinker": "^1.0",
+        "laravel/tinker": "^2.0",
         "league/oauth2-client": "^2.4",
         "league/oauth2-google": "^3.0",
         "tecnickcom/tcpdf": "6.3.*",
@@ -63,13 +62,12 @@
         "predis/predis": "1.1.1",
         "phpmyadmin/sql-parser": "^5.3",
         "aws/aws-sdk-php": "~3.0",
-        "cretueusebiu/laravel-javascript": "^0.2.1",
         "stevenmaguire/oauth2-microsoft": "^2.2",
         "phpseclib/mcrypt_compat": "^2.0"
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^6.3",
-        "phpunit/phpunit": "~5.7",
+        "phpunit/phpunit": "8.5.26",
         "filp/whoops": "~2.0",
         "behat/behat": "^3.3",
         "behat/mink-selenium2-driver": "^1.3",
@@ -128,5 +126,11 @@
                 "bootstrap/classaliasmap.php"
             ]
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "kylekatarnls/update-helper": true,
+            "typo3/class-alias-loader": true
+        }
     }
 }

config/app.php

@@ -27,8 +27,7 @@ return [
         Illuminate\Bus\BusServiceProvider::class,
         Illuminate\Redis\RedisServiceProvider::class,
         App\Providers\AppServiceProvider::class,
-        App\Providers\ViewServiceProvider::class,
+        App\Providers\ViewServiceProvider::class
-        Eusebiu\JavaScript\JavaScriptServiceProvider::class
     ],
     'aliases' => [
         'Crypt' => Illuminate\Support\Facades\Crypt::class,

thirdparty/HTMLPurifier/HTMLPurifier.autoload.php

@@ -6,19 +6,10 @@
  * It also does some sanity checks.
  */
 
-if (function_exists('spl_autoload_register') && function_exists('spl_autoload_unregister')) {
+spl_autoload_register(function($class)
-    // We need unregister for our pre-registering functionality
-    HTMLPurifier_Bootstrap::registerAutoload();
-    if (function_exists('__autoload')) {
-        // Be polite and ensure that userland autoload gets retained
-        spl_autoload_register('__autoload');
-    }
-} elseif (!function_exists('__autoload')) {
-    function __autoload($class)
 {
     return HTMLPurifier_Bootstrap::autoload($class);
-    }
+});
-}
 
 if (ini_get('zend.ze1_compatibility_mode')) {
     trigger_error("HTML Purifier is not compatible with zend.ze1_compatibility_mode; please turn it off", E_USER_ERROR);

thirdparty/HTMLPurifier/HTMLPurifier/Encoder.php

@@ -154,7 +154,7 @@ class HTMLPurifier_Encoder
 
         $len = strlen($str);
         for ($i = 0; $i < $len; $i++) {
-            $in = ord($str{$i});
+            $in = ord($str[$i]);
             $char .= $str[$i]; // append byte to char
             if (0 == $mState) {
                 // When mState is zero we expect either a US-ASCII character

thirdparty/pake/pakeFinder.class.php

@@ -523,10 +523,10 @@ class pakeFinder
 
   public static function isPathAbsolute($path)
   {
-    if ($path{0} == '/' || $path{0} == '\\' ||
+    if ($path[0] == '/' || $path[0] == '\\' ||
-        (strlen($path) > 3 && ctype_alpha($path{0}) &&
+        (strlen($path) > 3 && ctype_alpha($path[0]) &&
-         $path{1} == ':' &&
+         $path[1] == ':' &&
-         ($path{2} == '\\' || $path{2} == '/')
+         ($path[2] == '\\' || $path[2] == '/')
         )
        )
     {

thirdparty/pake/pakeFunction.php

@@ -411,7 +411,6 @@ if (false !== strpos(PHP_SAPI, 'cgi'))
    set_time_limit(0);
    ini_set('track_errors', true);
    ini_set('html_errors', false);
-   ini_set('magic_quotes_runtime', false);
 
    // define stream constants
    define('STDIN', fopen('php://stdin', 'r'));
@@ -425,5 +424,5 @@ if (false !== strpos(PHP_SAPI, 'cgi'))
    }
 
    // close the streams on script termination
-   register_shutdown_function(create_function('', 'fclose(STDIN); fclose(STDOUT); fclose(STDERR); return true;'));
+   register_shutdown_function(function(){fclose(STDIN); fclose(STDOUT); fclose(STDERR); return true;});
 }

thirdparty/pake/pakeGetopt.class.php

@@ -50,14 +50,14 @@ class pakeGetopt
 
   public function add_option($long_opt, $short_opt, $mode = self::NO_ARGUMENT, $comment = '')
   {
-    if ($long_opt{0} == '-' && $long_opt{1} == '-')
+    if ($long_opt[0] == '-' && $long_opt[1] == '-')
     {
       $long_opt = substr($long_opt, 2);
     }
 
     if ($short_opt)
     {
-      if ($short_opt{0} == '-')
+      if ($short_opt[0] == '-')
       {
         $short_opt = substr($short_opt, 1);
       }
@@ -81,7 +81,7 @@ class pakeGetopt
       $args = $this->read_php_argv();
 
       // we strip command line program
-      if (isset($args[0]) && $args[0]{0} != '-')
+      if (isset($args[0]) && $args[0][0] != '-')
       {
         array_shift($args);
       }
@@ -101,12 +101,12 @@ class pakeGetopt
         break;
       }
 
-      if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$this->long_options))
+      if ($arg[0] != '-' || (strlen($arg) > 1 && $arg[1] == '-' && !$this->long_options))
       {
         $this->arguments = array_merge($this->arguments, array($arg), $this->args);
         break;
       }
-      elseif (strlen($arg) > 1 && $arg{1} == '-')
+      elseif (strlen($arg) > 1 && $arg[1] == '-')
       {
         $this->parse_long_option(substr($arg, 2));
       }
@@ -149,7 +149,7 @@ class pakeGetopt
   {
     for ($i = 0; $i < strlen($arg); $i++)
     {
-      $opt = $arg{$i};
+      $opt = $arg[$i];
       $opt_arg = true;
 
       /* option exists? */
@@ -169,7 +169,7 @@ class pakeGetopt
         else
         {
           // take next element as argument (if it doesn't start with a -)
-          if (count($this->args) && $this->args[0]{0} != '-')
+          if (count($this->args) && $this->args[0][0] != '-')
           {
             $this->options[$this->short_options[$opt]['name']] = array_shift($this->args);
             break;
@@ -189,7 +189,7 @@ class pakeGetopt
         else
         {
           // take next element as argument (if it doesn't start with a -)
-          if (count($this->args) && $this->args[0]{0} != '-')
+          if (count($this->args) && $this->args[0][0] != '-')
           {
             $this->options[$this->short_options[$opt]['name']] = array_shift($this->args);
           }

thirdparty/pake/pakeYaml.class.php

@@ -193,7 +193,7 @@
         } elseif ($this->_inBlock == true && empty($ifchk)) {
           $last =& $this->_allNodes[$this->_lastNode];
           $last->data[key($last->data)] .= "\n";
-        } elseif ($ifchk{0} != '#' && substr($ifchk,0,3) != '---') {
+        } elseif ($ifchk[0] != '#' && substr($ifchk,0,3) != '---') {
           // Create a new node and get its indent
           $node         = new pakeYAMLNode;
           $node->indent = $this->_getIndent($line);

workflow/engine/skinEngine/skinEngine.php

@@ -472,6 +472,7 @@ class SkinEngine
             if (!defined('NO_DISPLAY_USERNAME')) {
                 define('NO_DISPLAY_USERNAME', 0);
             }
+
             if (NO_DISPLAY_USERNAME == 0) {
                 $smarty->assign('userfullname', isset($_SESSION['USR_FULLNAME']) ? $_SESSION['USR_FULLNAME'] : '');
                 $smarty->assign('user', isset($_SESSION['USR_USERNAME']) ? '(' . $_SESSION['USR_USERNAME'] . ')' : '');
@@ -708,6 +709,9 @@ class SkinEngine
         $smarty->cache_dir = PATH_SMARTY_CACHE;
         $smarty->config_dir = PATH_THIRDPARTY . 'smarty/configs';
 
+        // Initializing template variables
+        $smarty->assign('userfullname', null);
+
         //To setup en extJS Theme for this Skin
 
         $oServerConf = ServerConf::getSingleton();
@@ -847,6 +851,7 @@ class SkinEngine
                 $smarty->assign('workspace', !empty(config("system.workspace")) ? config("system.workspace") : '');
                 $uws = (isset($_SESSION['USR_ROLENAME']) && $_SESSION['USR_ROLENAME'] != '') ? strtolower(G::LoadTranslation('ID_WORKSPACE_USING')) : G::LoadTranslation('ID_WORKSPACE_USING');
                 $smarty->assign('workspace_label', $uws);
+                $smarty->assign('msgVer', null);
 
                 $conf = new Configurations();
                 $conf->getFormats();

workflow/public_html/sysGeneric.php

@@ -860,7 +860,7 @@ if (substr(SYS_COLLECTION, 0, 8) === 'gulliver') {
         //if the method name is empty set default to index method
         $controllerAction = SYS_TARGET != '' ? SYS_TARGET : 'index';
         //if the method exists
-        if (is_callable(array($controllerClass, $controllerAction))) {
+        if (is_callable(array(new $controllerClass, $controllerAction))) {
             $isControllerCall = true;
         }