Jelix scripts generates jelix-*.json files instead of module.xml or p…

…roject.xml

README.md

@@ -1,15 +1,15 @@
 What is Jelix?
 ==============
 
-Jelix is an open-source framework for PHP5.
+Jelix is an open-source framework for PHP 5.5 and higher.
 
 It has a modular and extensible architecture. Applications based on Jelix are made
 with modules, which allow to reuse features in several projects.
 
 For more informations, read http://jelix.org/articles/en/features
 
 About stable versions and branches
-==============================
+==================================
 
 **WARNING**: many changes occurs in the master branch, because of a "namespacification"
 which is not finished yet. So API may change or may be broken (even if we try to no do it)
@@ -41,10 +41,7 @@ package dependency:
     "require": {
         "php": ">=5.4",
         "jelix/jelix": "dev-master"
-    },
-    "repositories" : [
-        { "type": "composer", "url":"http://packages.jelix.org" }
-    ]
+    }
 }
 ```
 
@@ -60,7 +57,7 @@ Documentation and community
 ========================
 
 [The documentation](http://docs.jelix.org) is not updated yet with all changes since the
-release of Jelix 1.6.x. But it should be ok for most of things.
+release of Jelix 1.7.x. But it should be ok for most of things.
 
 You can ask your questions [on the forum](http://jelix.org/forums/forum/cat/2-english) or
 on our IRC Channel, #jelix, on the irc.freenode.net network.

UPGRADE-TO-2.0.md

@@ -4,7 +4,6 @@ Migration
 Here are instructions to migrate your Jelix application from Jelix 1.6 to the dev-master
 version.
 
-
 ## Composerify your application
 
 

build/manifests/jelix-deprecated-dev.mn

@@ -35,6 +35,10 @@ cd lib/jelix-scripts/templates
   template.tpl
   zone.tpl
   locales.tpl
+  project.xml.tpl
+
+cd lib/jelix-scripts/templates/module
+  module.xml.tpl
 
 cd lib/jelix-scripts/templates/var/config/
    dbprofils.ini.php.tpl

build/manifests/jelix-scripts.mn

@@ -36,7 +36,7 @@ cd lib/jelix-scripts/includes
   JelixScriptCommandConfig.class.php
   scripts.inc.php
 cd lib/jelix-scripts/templates
-  project.xml.tpl
+  jelix-app.json.tpl
   application.init.php.tpl
   cmd.php.tpl
   composer.json.tpl
@@ -63,7 +63,7 @@ cd lib/jelix-scripts/templates/module/
   locales.tpl
   main.tpl.tpl
   masteradminmenu.listener.php.tpl
-  module.xml.tpl
+  jelix-module.json.tpl
   template.tpl
   urls.xml.tpl
   zone.tpl

composer.json

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.5",
         "phpmailer/phpmailer": "5.2.9",
         "tecnick.com/tcpdf": "6.0.*",
         "mrclay/minify": "2.2.0",

lib/Jelix/Core/Config/Autoloader.php

@@ -9,7 +9,7 @@
 namespace Jelix\Core\Config;
 
 /**
- * Autoloader for informations stored in module.xml files
+ * Autoloader for informations stored in jelix-module.json or module.xml files
  */
 class Autoloader {
 

lib/Jelix/Core/Config/defaultconfig.ini.php

@@ -349,7 +349,7 @@
 ; dao_db_profile = ""
 
 ; list of selectors of classes to load before the session_start
-; @deprecated please use autoload configuration in module.xml files instead
+; @deprecated please use autoload configuration in jelix-app.json/module.xml files instead
 loadClasses=
 
 [forms]

lib/Jelix/Core/Infos/AppInfos.php

@@ -69,4 +69,47 @@ public function getEntryPointInfo($name) {
 
         return null;
     }
+
+    public function addEntryPointInfo($fileName, $configFileName, $type) {
+        $this->entrypoints[$fileName] = $entrypoint = array('file'=>$fileName,
+                                                    'config'=>$configFileName, 'type'=>$type);
+        if ($this->isXmlFile()) {
+            $doc = new \DOMDocument();
+
+            if (!$doc->load($this->path.'project.xml')) {
+                throw new Exception("addEntryPointInfo: cannot load project.xml");
+            }
+            if ($doc->documentElement->namespaceURI != JELIX_NAMESPACE_BASE.'project/1.0'){
+                throw new Exception("addEntryPointInfo: bad namespace in project.xml");
+            }
+
+            $elem = $doc->createElementNS(JELIX_NAMESPACE_BASE.'project/1.0', 'entry');
+            $elem->setAttribute("file", $fileName);
+            $elem->setAttribute("config", $configFileName);
+            $elem->setAttribute("type", $type);
+
+            $ep = $doc->documentElement->getElementsByTagName("entrypoints");
+            if (!$ep->length) {
+                $ep = $doc->createElementNS(JELIX_NAMESPACE_BASE.'project/1.0', 'entrypoints');
+                $doc->documentElement->appendChild($ep);
+                $ep->appendChild($elem);
+            }
+            else {
+                $ep->item(0)->appendChild($elem);
+            }
+
+            $doc->save($this->path.'project.xml');
+        }
+        else {
+            $json = @json_decode(file_get_contents($this->path.'jelix-app.json'), true);
+            if (!is_array($json)) {
+                throw new \Exception($this->path ."jelix-app.json is not a JSON file");
+            }
+            if (!isset($json['entrypoints'])) {
+                $json['entrypoints'] = array();
+            }
+            $json['entrypoints'][] = $entrypoint;
+            file_put_contents($this->path.'jelix-app.json', json_encode($json));
+        }
+    }
 }

lib/Jelix/Installer/ModuleInstallLauncher.php

@@ -185,7 +185,7 @@ function getUpgraders(EntryPoint $ep) {
                     continue;
                 }
                 if (\jVersionComparator::compareVersion($this->moduleInfos->version, $version) < 0 ) {
-                    // we don't execute upgraders having a version higher than the version indicated in the module.xml
+                    // we don't execute upgraders having a version higher than the version indicated in the module.xml/jelix-module.json
                     continue;
                 }
                 $foundVersion = $version;

lib/jelix-legacy/plugins/configcompiler/session/session.configcompiler.php

@@ -22,7 +22,7 @@ function atStart($config) {
 
         $config->sessions['_class_to_load'] = array();
         if ($config->sessions['loadClasses'] != '') {
-            trigger_error("Configuration: loadClasses is deprecated, use instead autoload configuration in module.xml files", E_USER_NOTICE);
+            trigger_error("Configuration: loadClasses is deprecated, use instead autoload configuration in jelix-module.json or module.xml files", E_USER_NOTICE);
             $list = preg_split('/ *, */',$config->sessions['loadClasses']);
             foreach($list as $sel) {
                 if(preg_match("/^([a-zA-Z0-9_\.]+)~([a-zA-Z0-9_\.\\/]+)$/", $sel, $m)){

lib/jelix-legacy/plugins/urls/significant/jSignificantUrlsCompiler.class.php

@@ -145,7 +145,7 @@ public function compile($aSelector) {
         $this->createUrlContent = "<?php \nif (jApp::config()->compilation['checkCacheFiletime'] &&( \n";
         $this->createUrlContent .= "filemtime('".$sourceFile.'\') > '.filemtime($sourceFile);
         $this->createUrlContentInc = '';
-        $this->readProjectXml();
+        $this->readAppInfos();
         $this->modulesPath = jApp::getAllModulesPath();
 
         // for an app on a simple http server behind an https proxy, we shouldn't check HTTPS
@@ -308,22 +308,20 @@ public function compile($aSelector) {
         return true;
     }
 
-    protected function readProjectXml() {
-        $xml = simplexml_load_file(jApp::appPath('project.xml'));
-        foreach ($xml->entrypoints->entry as $entrypoint) {
-            $file = (string)$entrypoint['file'];
-            if (substr($file, -4) != '.php')
-                $file.='.php';
-            $configFile = (string)$entrypoint['config'];
-            $this->entryPoints[$file] = $configFile;
+    protected function readAppInfos() {
+        $infos = new \Jelix\Core\Infos\AppInfos(jApp::appPath());
+        foreach ($infos->entrypoints as $file => $entrypoint) {
+            $this->entryPoints[$file] = $entrypoint['config'];
         }
     }
 
     protected function getEntryPointConfig($entrypoint) {
-        if (substr($entrypoint, -4) != '.php')
+        if (substr($entrypoint, -4) != '.php') {
             $entrypoint.='.php';
-        if (!isset($this->entryPoints[$entrypoint]))
-            throw new Exception('The entry point "'.$entrypoint.'" is not declared into project.xml');
+        }
+        if (!isset($this->entryPoints[$entrypoint])) {
+            throw new Exception('The entry point "'.$entrypoint.'" is not declared into project.xml/jelix-app.json');
+        }
         return jApp::configPath($this->entryPoints[$entrypoint]);
     }
     /**

lib/jelix-scripts/commands-single/createapp.cmd.php

@@ -83,7 +83,7 @@ public function run() {
         $appName = basename($appPath);
         $appPath .= '/';
 
-        if (file_exists($appPath.'/project.xml')) {
+        if (file_exists($appPath.'/jelix-app.json') || file_exists($appPath.'/project.xml')) {
             throw new Exception("this application is already created");
         }
 
@@ -171,7 +171,8 @@ public function run() {
 
         $this->createFile($appPath.'.htaccess', 'htaccess_deny', $param, "Configuration file for Apache");
         $this->createFile($appPath.'.gitignore','git_ignore.tpl', $param, ".gitignore");
-        $this->createFile($appPath.'project.xml','project.xml.tpl', $param, "Project description file");
+
+        $this->createFile($appPath.'jelix-app.json','jelix-app.json.tpl', $param, "Project description file");
         $this->createFile($appPath.'composer.json','composer.json.tpl', $param, "Composer file");
         $this->createFile($appPath.'cmd.php','cmd.php.tpl', $param, "Script for developer commands");
         $this->createFile($configPath.'mainconfig.ini.php', 'var/config/mainconfig.ini.php.tpl', $param, "Main configuration file");

lib/jelix-scripts/commands/createentrypoint.cmd.php

@@ -83,7 +83,7 @@ public function run() {
 
         $entryPointDir = dirname($entryPointFullPath).'/';
 
-        $this->loadProjectXml();
+        $this->loadAppInfos();
 
         // retrieve the config file name
         $configFile = $this->getParam('config');
@@ -154,33 +154,14 @@ public function run() {
             $inifile->save();
         }
 
-        $this->updateProjectXml($name.".php", $configFile , $type);
-        if ($this->verbose())
-            echo "Project.xml has been updated.\n";
+        $this->appInfos->addEntryPointInfo($name.".php", $configFile , $type);
+        if ($this->verbose()) {
+            echo "Project.xml/jelix-app.json has been updated.\n";
+        }
 
         $installer = new \Jelix\Installer\Installer(new \Jelix\Installer\Reporter\Console('warning'));
         $installer->installEntryPoint($name.".php");
         if ($this->verbose())
             echo "All modules have been initialized for the new entry point.\n";
     }
-
-    protected function updateProjectXml ($fileName, $configFileName, $type) {
-
-        $elem = $this->projectXml->createElementNS(JELIX_NAMESPACE_BASE.'project/1.0', 'entry');
-        $elem->setAttribute("file", $fileName);
-        $elem->setAttribute("config", $configFileName);
-        $elem->setAttribute("type", $type);
-
-        $ep = $this->projectXml->documentElement->getElementsByTagName("entrypoints");
-
-        if (!$ep->length) {
-            $ep = $this->projectXml->createElementNS(JELIX_NAMESPACE_BASE.'project/1.0', 'entrypoints');
-            $doc->documentElement->appendChild($ep);
-            $ep->appendChild($elem);
-        }
-        else
-            $ep->item(0)->appendChild($elem);
-
-        $this->projectXml->save(App::appPath('project.xml'));
-    }
 }

lib/jelix-scripts/commands/createmodule.cmd.php

@@ -26,7 +26,7 @@ class createmoduleCommand extends JelixScriptCommand {
     public  $syntaxhelp = "[-nosubdir] [-nocontroller] [-cmdline] [-addinstallzone] [-defaultmodule] [-admin] MODULE [REPOSITORY]";
     public  $help=array(
         'fr'=>"
-    Crée un nouveau module, avec son fichier module.xml, et un contrôleur
+    Crée un nouveau module, avec son fichier jelix-module.json, et un contrôleur
     par défaut, ainsi que tous les sous-répertoires courants
     (zones, templates, daos, locales, classes...).
 
@@ -108,7 +108,7 @@ public function run(){
         $param['default_id'] = $module.$this->config->infoIDSuffix;
         $param['version'] = $initialVersion;
 
-        $this->createFile($path.'module.xml', 'module/module.xml.tpl', $param);
+        $this->createFile($path.'jelix-module.json', 'module/jelix-module.json.tpl', $param);
 
         // create all sub directories of a module
         if (!$this->getOption('-nosubdir')) {
@@ -149,7 +149,7 @@ public function run(){
         $install = new jIniFileModifier(App::configPath('installer.ini.php'));
 
         // install the module for all needed entry points
-        foreach ($list as $k => $entryPoint) {
+        foreach ($list as $entryPoint) {
 
             $configFile = App::configPath($entryPoint['config']);
             $epconfig = new jIniFileModifier($configFile);

lib/jelix-scripts/commands/initadmin.cmd.php

@@ -65,7 +65,7 @@ public function run(){
                 $cmd = JelixScript::getCommand('createentrypoint', $this->config);
                 $cmd->initOptParam(array(),array('name'=>$entrypoint));
                 $cmd->run();
-                $this->projectXml = null;
+                $this->appInfos = null;
                 $ep = $this->getEntryPointInfo($entrypoint);
             }
             catch (Exception $e) {