change start configurations

skeeks-cms · Apr 21, 2016 · 9906558 · 9906558
1 parent 4478abe
commit 9906558
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 21 deletions.
diff --git a/components/Cms.php b/components/Cms.php
@@ -323,13 +323,19 @@ public function generateTmpConfig()
             $result = \yii\helpers\ArrayHelper::merge($result, $fileData);
         }
 
-        $file = new File(TMP_CONFIG_FILE_EXTENSIONS);
-        if ($file->isExist())
-        {
-            $file->remove();
+        if (!file_exists(dirname(TMP_CONFIG_FILE_EXTENSIONS))) {
+            mkdir(dirname(TMP_CONFIG_FILE_EXTENSIONS), 0777, true);
         }
-        $file->write(serialize($result));
-        return $file->isExist();
+
+        $string = var_export($result, true);
+        file_put_contents(TMP_CONFIG_FILE_EXTENSIONS, "<?php\n\nreturn $string;\n");
+
+        // invalidate opcache of extensions.php if exists
+        if (function_exists('opcache_invalidate')) {
+            opcache_invalidate(TMP_CONFIG_FILE_EXTENSIONS, true);
+        }
+
+        return file_exists(TMP_CONFIG_FILE_EXTENSIONS);
     }
 
     /**
@@ -352,13 +358,19 @@ public function generateTmpConsoleConfig()
             $result = \yii\helpers\ArrayHelper::merge($result, $fileData);
         }
 
-        $file = new File(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS);
-        if ($file->isExist())
-        {
-            $file->remove();
+        if (!file_exists(dirname(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS))) {
+            mkdir(dirname(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS), 0777, true);
         }
-        $file->write(serialize($result));
-        return $file->isExist();
+
+        $string = var_export($result, true);
+        file_put_contents(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS, "<?php\n\nreturn $string;\n");
+
+        // invalidate opcache of extensions.php if exists
+        if (function_exists('opcache_invalidate')) {
+            opcache_invalidate(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS, true);
+        }
+
+        return file_exists(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS);
     }
 
     /**

diff --git a/global.php b/global.php
@@ -31,8 +31,8 @@
 
 defined('COMMON_CONFIG_DIR') or define('COMMON_CONFIG_DIR', ROOT_DIR . '/common/config');
 
-define("TMP_CONFIG_FILE_EXTENSIONS", VENDOR_DIR . '/skeeks/tmp-config-extensions.cache.conf' );
-define("TMP_CONSOLE_CONFIG_FILE_EXTENSIONS", VENDOR_DIR . '/skeeks/tmp-console-config-extensions.cache.conf' );
+define("TMP_CONFIG_FILE_EXTENSIONS", VENDOR_DIR . '/skeeks/tmp-config-extensions.php' );
+define("TMP_CONSOLE_CONFIG_FILE_EXTENSIONS", VENDOR_DIR . '/skeeks/tmp-console-config-extensions.php' );
 
 /**
  * Глобальный файл где задается настройка окружения.

diff --git a/tmp-config-console-extensions.php b/tmp-config-console-extensions.php
@@ -1,11 +1,8 @@
 <?php
-$tmpConfig = [];
 if (file_exists(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS))
 {
-    $tmpConfig = unserialize(file_get_contents(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS));
+    return (array) require(TMP_CONSOLE_CONFIG_FILE_EXTENSIONS);
 } else
 {
     return (array) require(__DIR__ . '/config/main-console.php');
 }
-
-return $tmpConfig;
diff --git a/tmp-config-extensions.php b/tmp-config-extensions.php
@@ -1,10 +1,8 @@
 <?php
-$tmpConfig = [];
 if (file_exists(TMP_CONFIG_FILE_EXTENSIONS))
 {
-    $tmpConfig = unserialize(file_get_contents(TMP_CONFIG_FILE_EXTENSIONS));
+    return (array) require(TMP_CONFIG_FILE_EXTENSIONS);
 } else
 {
     return (array) require(__DIR__ . '/config/main.php');
 }
-return $tmpConfig;