prepare docker

Author: Ser1ous

Dockerfile

@@ -5,8 +5,12 @@ define('MODX_API_MODE', true);
 
 require __DIR__ . '/bootstrap.php';
 
-if (! defined('IN_INSTALL_MODE')) {
-    define('IN_INSTALL_MODE', false);
+if (!defined('IN_INSTALL_MODE')) {
+    if (!file_exists(__DIR__ . 'config/database/connections/default.php')) {
+        define('IN_INSTALL_MODE', true);
+    } else {
+        define('IN_INSTALL_MODE', false);
+    }
 }
 
 if (!defined('IN_MANAGER_MODE')) {

core/artisan

@@ -67,7 +67,8 @@
     "predis/predis": "*",
     "james-heinrich/phpthumb": "1.*",
     "evolutioncms-services/user-manager": "1.*",
-    "evolutioncms-services/document-manager": "1.*"
+    "evolutioncms-services/document-manager": "1.*",
+    "evolution-cms/salo": "1.x-dev"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master"

core/composer.json

@@ -66,6 +66,7 @@
         'Evolution_Routing' => EvolutionCMS\Providers\RoutingServiceProvider::class,
         'Evolution_Config' => EvolutionCMS\Providers\ConfigServiceProvider::class,
         'Evolution_Session' => EvolutionCMS\Providers\SessionServiceProvider::class,
+        'Evolution_Salo' => \EvolutionCMS\Salo\SaloServiceProvider::class,
 
         'Fix_DLTemplate' => EvolutionCMS\Providers\DLTemplateServiceProvider::class,
         'Fix_Phx' => EvolutionCMS\Providers\PhxServiceProvider::class,

core/config/app.php

@@ -91,8 +91,6 @@ public function query($sql, $watchError = true)
     }
 
 
-
-
     /**
      * {@inheritDoc}
      */
@@ -245,7 +243,7 @@ public function getValue($result)
     {
         $out = false;
 
-        if(is_string($result)){
+        if (is_string($result)) {
             $result = $this->query($result);
         }
 
@@ -805,8 +803,13 @@ public function prepareDate($timestamp, $fieldType = 'DATETIME')
 
     public function prepareNativeConfig()
     {
-        $this->config = $this->getConfig();
-        $this->config['table_prefix'] = $this->getConfig('prefix');
+        try {
+            $this->config = $this->getConfig();
+            $this->config['table_prefix'] = $this->getConfig('prefix');
+        } catch (Exception $e) {
+            if (!is_cli())
+                throw $e;
+        }
     }
 
     public function begin()
@@ -826,6 +829,6 @@ public function rollback()
 
     public function optimize($table_name)
     {
-        DB::statement('OPTIMIZE TABLE '.$table_name);
+        DB::statement('OPTIMIZE TABLE ' . $table_name);
     }
 }

core/src/Database.php

@@ -35,7 +35,7 @@ public function path($path = '')
      */
     public function basePath($path = '')
     {
-        return EVO_CORE_PATH;
+        return EVO_CORE_PATH . $path;
     }
 
     /**
@@ -75,9 +75,9 @@ public function environmentPath()
      *
      * @return string
      */
-    public function publicPath()
+    public function publicPath($path = '')
     {
-        return MODX_BASE_PATH;
+        return MODX_BASE_PATH . $path;
     }
 
     /**
@@ -229,7 +229,7 @@ public function getSitePublishingFilePath()
      */
     public function bootstrapWith(array $bootstrappers)
     {
-        return [ ];
+        return [];
     }
 
     /**

core/src/Traits/Path.php

@@ -249,7 +249,13 @@ public static function getRawData()
         @trigger_error('getRawData only returns the first dataset loaded, which may not be what you expect. Use getAllRawData() instead which returns all datasets for all autoloaders present in the process.', E_USER_DEPRECATED);
 
         if (null === self::$installed) {
-            self::$installed = include __DIR__ . '/installed.php';
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = include __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
         }
 
         return self::$installed;
@@ -316,7 +322,13 @@ private static function getInstalled()
         }
 
         if (null === self::$installed) {
-            self::$installed = require __DIR__ . '/installed.php';
+            // only require the installed.php file if this file is loaded from its dumped location,
+            // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
+            if (substr(__DIR__, -8, 1) !== 'C') {
+                self::$installed = require __DIR__ . '/installed.php';
+            } else {
+                self::$installed = array();
+            }
         }
         $installed[] = self::$installed;