Upgrade code - step 1

gulliver/bin/tasks/pakeGulliver.php

@@ -44,10 +44,8 @@ pake_task('new-plugin', 'project_exists');
 pake_desc("Update the plugin attributes in all workspaces\n   args: <plugin-name>");
 pake_task("update-plugin-attributes", "project_exists");
 
-/*----------------------------------********---------------------------------*/
 pake_desc("Check disabled code in plugins\n   args: [enterprise-plugin|custom-plugin|all|<plugin-name>]");
 pake_task("check-plugin-disabled-code", "project_exists");
-/*----------------------------------********---------------------------------*/
 
 pake_desc("pack plugin in .tar file \n   args: <plugin>");
 pake_task('pack-plugin', 'project_exists');
@@ -55,10 +53,8 @@ pake_task('pack-plugin', 'project_exists');
 pake_desc("generate basic CRUD files for an existing class\n   args: <class-name> <table-name> <plugin-name>");
 pake_task('propel-build-crud', 'project_exists');
 
-/*----------------------------------********---------------------------------*/
 pake_desc("check standard code\n   args: <directory>");
 pake_task('check-standard-code', 'project_exists');
-/*----------------------------------********---------------------------------*/
 
 /**
    * Function run_version
@@ -2254,8 +2250,8 @@ function checkFileStandardCode($file)
         $aFiles[] = array( 'file' => $rootFolder, 'tab' => $bTabs, 'utf' => $bUtf8, 'dos' => $bDos );
     }
 }
-/*----------------------------------********---------------------------------*/
-/*function checkFolderStandardCode ( $folder, $bSubFolders ) {
+
+function checkFolderStandardCode ( $folder, $bSubFolders ) {
   global $aFiles;
     $rootFolder = str_replace ( PATH_TRUNK, '', $folder );
   //printf("%s \n", pakeColor::colorize($rootFolder, 'INFO'));
@@ -2272,10 +2268,8 @@ function checkFileStandardCode($file)
       }
     }
   }
-}*/
-/*----------------------------------********---------------------------------*/
+}
 
-/*----------------------------------********---------------------------------*/
 function run_check_standard_code($task, $options)
 {
     global $aFiles;
@@ -2306,7 +2300,7 @@ function run_check_standard_code($task, $options)
     );
     }
 }
-/*----------------------------------********---------------------------------*/
+
 function run_update_plugin_attributes($task, $args)
 {
     try {

gulliver/bin/tasks/templates/dbInfo.php.tpl

@@ -68,7 +68,7 @@ function lookup($target)
       try {
           switch ($driver) {
         case 'mysql':
-            $results = \Illuminate\Support\Facades\DB::select(DB::raw("select version()"));
+            $results = \Illuminate\Support\Facades\DB::select(rawQuery("select version()"));
 
             preg_match('@[0-9]+\.[0-9]+\.[0-9]+@', $results[0]->{'version()'}, $version);
 

gulliver/system/class.bootstrap.php

@@ -220,7 +220,7 @@ class Bootstrap
                     return false;
                 }
                 if ($localPath != 'jsMethod') {
-                    $realPath = $localPath . $match[1];
+                    $realPath = $localPath . (isset($match[1]) ? $match[1] : '');
                 } else {
                     $realPath = $localPath;
                 }

gulliver/system/class.controller.php

@@ -75,6 +75,8 @@ class Controller
      *
      * @param string $name
      * @return string or NULL if the internal var doesn't exist
+     * 
+     * phpcs:ignore PHPCompatibility.FunctionUse.ArgumentFunctionsReportCurrentValue.NeedsInspection
      */
     public function __get($name)
     {

gulliver/system/class.database_mysql.php

@@ -916,7 +916,7 @@ class database extends database_base
             InstallerModule::setNewConnection($connection, $host, $user, $pass, $database, $port);
 
             $results = DB::connection($connection)
-                ->select(DB::raw('select version()'));
+                ->select(rawQuery('select version()'));
 
             preg_match($this->getRegexVersionMysql(), $results[0]->{'version()'}, $version);
 

gulliver/system/class.g.php

@@ -504,6 +504,11 @@ class G
         }
 
         if (is_dir($dirName)) {
+            // Compatibility with Alpine Linux
+            if (!defined('GLOB_BRACE')) {
+                define('GLOB_BRACE', 0);
+            }
+
             foreach (glob($dirName . '/{,.}*', GLOB_BRACE) as $file) {
                 if ($file == $dirName . '/.' || $file == $dirName . '/..') {
                     continue;