Merge remote-tracking branch 'origin/jelix-1.7.x'

jelix · Jul 23, 2017 · 7dddbb0 · 7dddbb0
2 parents d389691 + 770c4de
commit 7dddbb0
Show file tree

Hide file tree

Showing 66 changed files with 1,793 additions and 1,215 deletions.
diff --git a/build/manifests/jelix-lib.mn b/build/manifests/jelix-lib.mn
@@ -844,6 +844,8 @@ cd lib/Jelix/Installer
   Installer.php
   EntryPoint.php
   Migration.php
+  GLobalSetup.php
+
 cd lib/Jelix/Installer/Reporter
   Console.php
   Html.php
@@ -858,19 +860,22 @@ cd lib/Jelix/Installer/Checker
   CheckerPage.php
 
 cd lib/Jelix/Legacy/installer
+  ghostInstallReporter.php
   jInstallerModuleInfos.php
   jInstallerException.php
   jInstallerBase.php
-  jInstallerModule.php
+  jInstallerModule2.php
   jIInstallerComponent.php
+  jIInstallerComponent2.php
   jIInstallReporter.php
   jInstallerComponentBase.php
   jInstallerComponentModule.php
   jInstaller.php
-  jInstallerEntryPoint.php
+  jInstallerEntryPoint2.php
   jInstallerMessageProvider.php
   jInstallerMigration.php
   jInstallChecker.php
+
 cd lib/Jelix/Mailer
   composer.json
   Mailer.php

diff --git a/composer.json b/composer.json
@@ -20,10 +20,10 @@
         "jelix/fakeserverconf": "1.0.*",
         "jelix/composer-module-setup": "0.*",
         "phpmailer/phpmailer": "^5.2.18",
-        "jelix/soap-server-module": "^1.7.5",
+        "jelix/soap-server-module": "^1.7.6",
         "jelix/castor": "1.0.*",
-        "jelix/feeds-module": "^1.7.1",
-        "jelix/inifile": "^2.0.1",
+        "jelix/feeds-module": "^1.7.2",
+        "jelix/inifile": "^2.4.0",
         "jelix/wikirenderer-plugin": "^1.7.1",
         "symfony/console":"^3.2.0",
         "jelix/file-utilities": "1.8.*",

diff --git a/lib/Jelix/Core/Config/Compiler.php b/lib/Jelix/Core/Config/Compiler.php
@@ -84,18 +84,18 @@ protected function readConfigFiles($configFile, $additionalOptions) {
             throw new Exception("Entry point configuration file cannot be mainconfig.ini.php", 5);
         }
 
-        // read the local configuration of the app
-        if (file_exists($varConfigPath.'localconfig.ini.php')) {
-            IniFileMgr::readAndMergeObject($varConfigPath.'localconfig.ini.php', $config);
-        }
-
         // read the configuration of the entry point
         if (file_exists($appConfigPath.$configFile)) {
             if( false === IniFileMgr::readAndMergeObject($appConfigPath.$configFile, $config)) {
                 throw new Exception("Syntax error in the configuration file -- $configFile", 6);
             }
         }
 
+        // read the local configuration of the app
+        if (file_exists($varConfigPath.'localconfig.ini.php')) {
+            IniFileMgr::readAndMergeObject($varConfigPath.'localconfig.ini.php', $config);
+        }
+
         // read the local configuration of the entry point
         if (file_exists($varConfigPath.$configFile)) {
             if( false === IniFileMgr::readAndMergeObject($varConfigPath.$configFile, $config)) {

diff --git a/lib/Jelix/Core/Infos/InfosAbstract.php b/lib/Jelix/Core/Infos/InfosAbstract.php
@@ -9,20 +9,20 @@
 
 abstract class InfosAbstract {
 
-    /** @var the path to the module/app */
+    /** @var string the path to the module/app */
     protected $path = '';
     protected $isXml = false;
     protected $_exists = false;
 
-    /** @var the name of the module, used as identifier in jelix selectors or other part of the code */
+    /** @var string the name of the module, used as identifier in jelix selectors or other part of the code */
     public $name = '';
 
-    /** @var the birth date of the module/app. optional */
+    /** @var string the birth date of the module/app. optional */
     public $createDate = '';
 
-    /** @var version of the module/app. required for modules */
+    /** @var string version of the module/app. required for modules */
     public $version = '';
-    /** @var the release date of the module/app. required for modules */
+    /** @var string the release date of the module/app. required for modules */
     public $versionDate = '';
 
     public $versionStability = '';
@@ -49,14 +49,23 @@ abstract class InfosAbstract {
     public function getPath() {
         return $this->path;
     }
-
+
+    /**
+     * @return bool
+     */
     public function isXmlFile() {
         return $this->isXml;
     }
 
+    /**
+     * @return bool
+     */
     public function exists() {
         return $this->_exists;
     }
 
+    /**
+     * @return string the file name
+     */
     public abstract function getFile();
 }