Changeset 476
- Timestamp:
- 06/29/07 18:09:54 (2 years ago)
- Files:
-
- trunk/build/manifests/jelix-ext-php.mn (modified) (1 diff)
- trunk/build/manifests/jelix-ext-php.mn (modified) (1 diff)
- trunk/build/manifests/jelix-no-ext.mn (modified) (1 diff)
- trunk/build/manifests/jelix-no-ext.mn (modified) (1 diff)
- trunk/ext/jelix/jelix_interfaces.c (modified) (4 diffs)
- trunk/ext/jelix/jelix_interfaces.c (modified) (4 diffs)
- trunk/ext/jelix/jelix_interfaces.h (modified) (1 diff)
- trunk/ext/jelix/jelix_interfaces.h (modified) (1 diff)
- trunk/ext/jelix/tests/jicoordplugin_001.phpt (moved) (moved from trunk/ext/jelix/tests/jiplugin_001.phpt) (1 diff)
- trunk/ext/jelix/tests/jicoordplugin_001.phpt (moved) (moved from trunk/ext/jelix/tests/jiplugin_001.phpt) (1 diff)
- trunk/ext/jelix/tests/jicoordplugin_002.phpt (moved) (moved from trunk/ext/jelix/tests/jiplugin_002.phpt) (1 diff)
- trunk/ext/jelix/tests/jicoordplugin_002.phpt (moved) (moved from trunk/ext/jelix/tests/jiplugin_002.phpt) (1 diff)
- trunk/ext/jelix/tests/jicoordplugin_003.phpt (moved) (moved from trunk/ext/jelix/tests/jiplugin_003.phpt) (2 diffs)
- trunk/ext/jelix/tests/jicoordplugin_003.phpt (moved) (moved from trunk/ext/jelix/tests/jiplugin_003.phpt) (2 diffs)
- trunk/lib/jelix-plugins/coord/auth/auth.plugin.php (modified) (1 diff)
- trunk/lib/jelix-plugins/coord/auth/auth.plugin.php (modified) (1 diff)
- trunk/lib/jelix-plugins/coord/autolocale/autolocale.plugin.php (modified) (1 diff)
- trunk/lib/jelix-plugins/coord/autolocale/autolocale.plugin.php (modified) (1 diff)
- trunk/lib/jelix-plugins/coord/magicquotes/magicquotes.plugin.php (modified) (1 diff)
- trunk/lib/jelix-plugins/coord/magicquotes/magicquotes.plugin.php (modified) (1 diff)
- trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jCoordinator.class.php (modified) (1 diff)
- trunk/lib/jelix/core/jICoordPlugin.iface.php (moved) (moved from trunk/lib/jelix/core/jIPlugin.iface.php) (1 diff)
- trunk/lib/jelix/core/jICoordPlugin.iface.php (moved) (moved from trunk/lib/jelix/core/jIPlugin.iface.php) (1 diff)
- trunk/lib/jelix/db/drivers (deleted)
- trunk/lib/jelix/db/drivers (deleted)
- trunk/lib/jelix/init.php (modified) (2 diffs)
- trunk/lib/jelix/init.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/build/manifests/jelix-ext-php.mn
r418 r476 38 38 read_ini_003.phpt 39 39 scan_module_sel_001.phpt 40 ji plugin_001.phpt40 jicoordplugin_001.phpt 41 41 jelix_const_001.phpt 42 ji plugin_002.phpt43 ji plugin_003.phpt42 jicoordplugin_002.phpt 43 jicoordplugin_003.phpt 44 44 scan_module_sel_002.phpt 45 45 scan_action_sel_001.phpt trunk/build/manifests/jelix-ext-php.mn
r418 r476 38 38 read_ini_003.phpt 39 39 scan_module_sel_001.phpt 40 ji plugin_001.phpt40 jicoordplugin_001.phpt 41 41 jelix_const_001.phpt 42 ji plugin_002.phpt43 ji plugin_003.phpt42 jicoordplugin_002.phpt 43 jicoordplugin_003.phpt 44 44 scan_module_sel_002.phpt 45 45 scan_action_sel_001.phpt trunk/build/manifests/jelix-no-ext.mn
r357 r476 1 1 cd lib/jelix/core 2 jI Plugin.iface.php2 jICoordPlugin.iface.php trunk/build/manifests/jelix-no-ext.mn
r357 r476 1 1 cd lib/jelix/core 2 jI Plugin.iface.php2 jICoordPlugin.iface.php trunk/ext/jelix/jelix_interfaces.c
r387 r476 22 22 23 23 24 PHPAPI zend_class_entry * jelix_ce_jI Plugin;24 PHPAPI zend_class_entry * jelix_ce_jICoordPlugin; 25 25 PHPAPI zend_class_entry * jelix_ce_jIAuthDriver; 26 26 PHPAPI zend_class_entry * jelix_ce_jIUrlEngine; … … 31 31 32 32 33 // declaration des arguments aux méthodes 34 35 /* ------------------------------------- 36 interface jIPlugin{ 33 34 /* ------------------------------------- 35 interface jICoordPlugin{ 37 36 public function beforeAction($param); 38 37 public function beforeOutput(); … … 42 41 43 42 static 44 ZEND_BEGIN_ARG_INFO_EX(arginfo_jI Plugin_beforeAction, 0, 0, 1)43 ZEND_BEGIN_ARG_INFO_EX(arginfo_jICoordPlugin_beforeAction, 0, 0, 1) 45 44 ZEND_ARG_INFO(0, params) 46 45 ZEND_END_ARG_INFO(); 47 46 48 47 49 zend_function_entry zend_funcs_jI Plugin[] = {50 ZEND_ABSTRACT_ME(jI Plugin, beforeAction, arginfo_jIPlugin_beforeAction)51 ZEND_ABSTRACT_ME(jI Plugin, beforeOutput, NULL)52 ZEND_ABSTRACT_ME(jI Plugin, afterProcess, NULL)48 zend_function_entry zend_funcs_jICoordPlugin[] = { 49 ZEND_ABSTRACT_ME(jICoordPlugin, beforeAction, arginfo_jICoordPlugin_beforeAction) 50 ZEND_ABSTRACT_ME(jICoordPlugin, beforeOutput, NULL) 51 ZEND_ABSTRACT_ME(jICoordPlugin, afterProcess, NULL) 53 52 {NULL, NULL, NULL} 54 53 }; … … 232 231 zend_class_entry _ce; 233 232 234 JELIX_DECLARE_INTERFACE(jI Plugin)233 JELIX_DECLARE_INTERFACE(jICoordPlugin) 235 234 JELIX_DECLARE_INTERFACE(jIAuthDriver) 236 235 JELIX_DECLARE_INTERFACE(jIUrlEngine) trunk/ext/jelix/jelix_interfaces.c
r387 r476 22 22 23 23 24 PHPAPI zend_class_entry * jelix_ce_jI Plugin;24 PHPAPI zend_class_entry * jelix_ce_jICoordPlugin; 25 25 PHPAPI zend_class_entry * jelix_ce_jIAuthDriver; 26 26 PHPAPI zend_class_entry * jelix_ce_jIUrlEngine; … … 31 31 32 32 33 // declaration des arguments aux méthodes 34 35 /* ------------------------------------- 36 interface jIPlugin{ 33 34 /* ------------------------------------- 35 interface jICoordPlugin{ 37 36 public function beforeAction($param); 38 37 public function beforeOutput(); … … 42 41 43 42 static 44 ZEND_BEGIN_ARG_INFO_EX(arginfo_jI Plugin_beforeAction, 0, 0, 1)43 ZEND_BEGIN_ARG_INFO_EX(arginfo_jICoordPlugin_beforeAction, 0, 0, 1) 45 44 ZEND_ARG_INFO(0, params) 46 45 ZEND_END_ARG_INFO(); 47 46 48 47 49 zend_function_entry zend_funcs_jI Plugin[] = {50 ZEND_ABSTRACT_ME(jI Plugin, beforeAction, arginfo_jIPlugin_beforeAction)51 ZEND_ABSTRACT_ME(jI Plugin, beforeOutput, NULL)52 ZEND_ABSTRACT_ME(jI Plugin, afterProcess, NULL)48 zend_function_entry zend_funcs_jICoordPlugin[] = { 49 ZEND_ABSTRACT_ME(jICoordPlugin, beforeAction, arginfo_jICoordPlugin_beforeAction) 50 ZEND_ABSTRACT_ME(jICoordPlugin, beforeOutput, NULL) 51 ZEND_ABSTRACT_ME(jICoordPlugin, afterProcess, NULL) 53 52 {NULL, NULL, NULL} 54 53 }; … … 232 231 zend_class_entry _ce; 233 232 234 JELIX_DECLARE_INTERFACE(jI Plugin)233 JELIX_DECLARE_INTERFACE(jICoordPlugin) 235 234 JELIX_DECLARE_INTERFACE(jIAuthDriver) 236 235 JELIX_DECLARE_INTERFACE(jIUrlEngine) trunk/ext/jelix/jelix_interfaces.h
r383 r476 15 15 16 16 17 extern PHPAPI zend_class_entry * jelix_ce_jI Plugin;17 extern PHPAPI zend_class_entry * jelix_ce_jICoordPlugin; 18 18 extern PHPAPI zend_class_entry * jelix_ce_jIAuthDriver; 19 19 extern PHPAPI zend_class_entry * jelix_ce_jIUrlEngine; trunk/ext/jelix/jelix_interfaces.h
r383 r476 15 15 16 16 17 extern PHPAPI zend_class_entry * jelix_ce_jI Plugin;17 extern PHPAPI zend_class_entry * jelix_ce_jICoordPlugin; 18 18 extern PHPAPI zend_class_entry * jelix_ce_jIAuthDriver; 19 19 extern PHPAPI zend_class_entry * jelix_ce_jIUrlEngine; trunk/ext/jelix/tests/jicoordplugin_001.phpt
r383 r476 1 1 --TEST-- 2 Check for jI Plugin interface2 Check for jICoordPlugin interface 3 3 --SKIPIF-- 4 4 <?php if (!extension_loaded("jelix")) print "skip"; ?> 5 5 --FILE-- 6 6 <?php 7 if(interface_exists('jI Plugin', false)) echo "YES"; else echo "NO";7 if(interface_exists('jICoordPlugin', false)) echo "YES"; else echo "NO"; 8 8 ?> 9 9 --EXPECT-- trunk/ext/jelix/tests/jicoordplugin_001.phpt
r383 r476 1 1 --TEST-- 2 Check for jI Plugin interface2 Check for jICoordPlugin interface 3 3 --SKIPIF-- 4 4 <?php if (!extension_loaded("jelix")) print "skip"; ?> 5 5 --FILE-- 6 6 <?php 7 if(interface_exists('jI Plugin', false)) echo "YES"; else echo "NO";7 if(interface_exists('jICoordPlugin', false)) echo "YES"; else echo "NO"; 8 8 ?> 9 9 --EXPECT-- trunk/ext/jelix/tests/jicoordplugin_002.phpt
r383 r476 1 1 --TEST-- 2 check reflection of jI Plugin interface2 check reflection of jICoordPlugin interface 3 3 --SKIPIF-- 4 4 <?php if (!extension_loaded("jelix")) print "skip"; ?> 5 5 --FILE-- 6 6 <?php 7 Reflection::export(new ReflectionClass('jI Plugin'));7 Reflection::export(new ReflectionClass('jICoordPlugin')); 8 8 ?> 9 9 --EXPECT-- 10 Interface [ <internal:jelix> interface jI Plugin ] {10 Interface [ <internal:jelix> interface jICoordPlugin ] { 11 11 12 12 - Constants [0] { trunk/ext/jelix/tests/jicoordplugin_002.phpt
r383 r476 1 1 --TEST-- 2 check reflection of jI Plugin interface2 check reflection of jICoordPlugin interface 3 3 --SKIPIF-- 4 4 <?php if (!extension_loaded("jelix")) print "skip"; ?> 5 5 --FILE-- 6 6 <?php 7 Reflection::export(new ReflectionClass('jI Plugin'));7 Reflection::export(new ReflectionClass('jICoordPlugin')); 8 8 ?> 9 9 --EXPECT-- 10 Interface [ <internal:jelix> interface jI Plugin ] {10 Interface [ <internal:jelix> interface jICoordPlugin ] { 11 11 12 12 - Constants [0] { trunk/ext/jelix/tests/jicoordplugin_003.phpt
r383 r476 1 1 --TEST-- 2 Use of jI Plugin interface2 Use of jICoordPlugin interface 3 3 --SKIPIF-- 4 4 <?php if (!extension_loaded("jelix")) print "skip"; ?> … … 6 6 <?php 7 7 8 class myClass implements jI Plugin {8 class myClass implements jICoordPlugin { 9 9 10 10 function beforeAction($param){ trunk/ext/jelix/tests/jicoordplugin_003.phpt
r383 r476 1 1 --TEST-- 2 Use of jI Plugin interface2 Use of jICoordPlugin interface 3 3 --SKIPIF-- 4 4 <?php if (!extension_loaded("jelix")) print "skip"; ?> … … 6 6 <?php 7 7 8 class myClass implements jI Plugin {8 class myClass implements jICoordPlugin { 9 9 10 10 function beforeAction($param){ trunk/lib/jelix-plugins/coord/auth/auth.plugin.php
r455 r476 18 18 require_once(JELIX_LIB_AUTH_PATH.'jAuthUser.class.php'); 19 19 20 class AuthPlugin implements jI Plugin {20 class AuthPlugin implements jICoordPlugin { 21 21 public $config; 22 22 trunk/lib/jelix-plugins/coord/auth/auth.plugin.php
r455 r476 18 18 require_once(JELIX_LIB_AUTH_PATH.'jAuthUser.class.php'); 19 19 20 class AuthPlugin implements jI Plugin {20 class AuthPlugin implements jICoordPlugin { 21 21 public $config; 22 22 trunk/lib/jelix-plugins/coord/autolocale/autolocale.plugin.php
r444 r476 11 11 * plugin for language auto detection 12 12 */ 13 class AutoLocalePlugin implements jI Plugin {13 class AutoLocalePlugin implements jICoordPlugin { 14 14 15 15 public $config; trunk/lib/jelix-plugins/coord/autolocale/autolocale.plugin.php
r444 r476 11 11 * plugin for language auto detection 12 12 */ 13 class AutoLocalePlugin implements jI Plugin {13 class AutoLocalePlugin implements jICoordPlugin { 14 14 15 15 public $config; trunk/lib/jelix-plugins/coord/magicquotes/magicquotes.plugin.php
r386 r476 21 21 * @subpackage plugins 22 22 */ 23 class MagicQuotesPlugin implements jI Plugin {23 class MagicQuotesPlugin implements jICoordPlugin { 24 24 25 25 /** trunk/lib/jelix-plugins/coord/magicquotes/magicquotes.plugin.php
r386 r476 21 21 * @subpackage plugins 22 22 */ 23 class MagicQuotesPlugin implements jI Plugin {23 class MagicQuotesPlugin implements jICoordPlugin { 24 24 25 25 /** trunk/lib/jelix/core/jCoordinator.class.php
r474 r476 286 286 * @param string $pluginName the name of the plugin 287 287 * @param boolean $required says if the plugin is required or not. If true, will generate an exception if the plugin is not registered. 288 * @return jI Plugin288 * @return jICoordPlugin 289 289 */ 290 290 public function getPlugin ($pluginName, $required = true){ trunk/lib/jelix/core/jCoordinator.class.php
r474 r476 286 286 * @param string $pluginName the name of the plugin 287 287 * @param boolean $required says if the plugin is required or not. If true, will generate an exception if the plugin is not registered. 288 * @return jI Plugin288 * @return jICoordPlugin 289 289 */ 290 290 public function getPlugin ($pluginName, $required = true){ trunk/lib/jelix/core/jICoordPlugin.iface.php
r334 r476 16 16 * @subpackage core 17 17 */ 18 interface jI Plugin {18 interface jICoordPlugin { 19 19 20 20 /** trunk/lib/jelix/core/jICoordPlugin.iface.php
r334 r476 16 16 * @subpackage core 17 17 */ 18 interface jI Plugin {18 interface jICoordPlugin { 19 19 20 20 /** trunk/lib/jelix/init.php
r472 r476 91 91 #includephp core/jIncluder.class.php 92 92 #ifnot ENABLE_PHP_JELIX 93 #includephp core/jI Plugin.iface.php93 #includephp core/jICoordPlugin.iface.php 94 94 #endif 95 95 #else … … 109 109 require_once (JELIX_LIB_CORE_PATH . 'jIncluder.class.php'); 110 110 #ifnot ENABLE_PHP_JELIX 111 require_once (JELIX_LIB_CORE_PATH . 'jI Plugin.iface.php');111 require_once (JELIX_LIB_CORE_PATH . 'jICoordPlugin.iface.php'); 112 112 #endif 113 113 #endif trunk/lib/jelix/init.php
r472 r476 91 91 #includephp core/jIncluder.class.php 92 92 #ifnot ENABLE_PHP_JELIX 93 #includephp core/jI Plugin.iface.php93 #includephp core/jICoordPlugin.iface.php 94 94 #endif 95 95 #else … … 109 109 require_once (JELIX_LIB_CORE_PATH . 'jIncluder.class.php'); 110 110 #ifnot ENABLE_PHP_JELIX 111 require_once (JELIX_LIB_CORE_PATH . 'jI Plugin.iface.php');111 require_once (JELIX_LIB_CORE_PATH . 'jICoordPlugin.iface.php'); 112 112 #endif 113 113 #endif
