2011/9/26/ v0.8 主线分支第三次合并

yishuo · yishuo · commit 1942dba72aad · 2011-09-29T09:08:50.000Z
merge: from laboratory trunk version: 2896 features: v0.8 git-svn-id: http://svn.simba.taobao.com/svn/PW_WindFramework/trunk@2897 18ba2127-5a84-46d4-baec-3457e417f034
diff --git a/_compile/config/components_config.xml b/_compile/config/components_config.xml
@@ -9,7 +9,7 @@
 
 <components>
 	<component name='windApplication' path='WIND:web.WindWebApplication'
-		scope='singleton' proxy='true'>
+		scope='singleton'>
 		<properties>
 			<property name='dispatcher' ref='dispatcher' />
 			<property name='handlerAdapter' ref='router' />
@@ -84,8 +84,6 @@
 	</component>
 	<component name='windSession' path='WIND:http.session.WindSession'
 		scope='singleton' destroy='commit'>
-		<!--<constructor-args>
-			<constructor-arg name='0' ref='windCache' />
-		</constructor-args>
-	--></component>
+		<!--<constructor-args> <constructor-arg name='0' ref='windCache' /> </constructor-args> -->
+	</component>
 </components>
diff --git a/demos/blog/compile/template/layout.tpl b/demos/blog/compile/template/layout.tpl
@@ -37,7 +37,7 @@
 			</div>
 		</div>
 		<div class="main">
-			<?php $this->content()?>
+			<?php $this->content();?>
 		</div>
 <div id="footer">
 			<div class="footer">
diff --git a/demos/blog/template/layout.htm b/demos/blog/template/layout.htm
@@ -37,7 +37,7 @@
 			</div>
 		</div>
 		<div class="main">
-			<!--#$this->content()#-->
+			<!--#$this->content();#-->
 		</div>
 <div id="footer">
 			<div class="footer">
diff --git a/wind/base/WindEnableValidateModule.php b/wind/base/WindEnableValidateModule.php
@@ -34,7 +34,7 @@ class WindEnableValidateModule {
 	 *
 	 * @var array
 	 */
-	private $_errors = array();
+	protected $_errors = array();
 	/**
 	 * &#39564;&#35777;&#20013;&#20135;&#29983;&#38169;&#35823;&#20449;&#24687;&#26102;&#20351;&#29992;&#30340;&#40664;&#35748;&#38169;&#35823;&#20449;&#24687;
 	 *
diff --git a/wind/base/WindForwardException.php b/wind/base/WindForwardException.php
@@ -9,7 +9,7 @@
  * @copyright &copy;2003-2103 phpwind.com
  * @license http://www.windframework.com
  * @version $Id$
- * @package package_name
+ * @package wind.base
  */
 class WindForwardException extends WindException {
 	/**
diff --git a/wind/components_config.php b/wind/components_config.php
@@ -2,7 +2,6 @@
 	'windApplication' => array(
 		'path' => 'WIND:web.WindWebApplication',
 		'scope' => 'singleton',
-		'proxy' => true,
 		'properties' => array(
 			'dispatcher' => array(
 				'ref' => 'dispatcher',
diff --git a/wind/db/AbstractWindPdoAdapter.php b/wind/db/AbstractWindPdoAdapter.php
@@ -28,8 +28,8 @@ protected function _getPdoDataType($variable) {
 	/* (non-PHPdoc)
 	 * @see PDO::quote()
 	 */
-	public function quote($value) {
-		return parent::quote($value, $this->_getPdoDataType(gettype($value)));
+	public function quote($value, $type = null) {
+		return parent::quote($value, $type ? $type : $this->_getPdoDataType(gettype($value)));
 	}
 
 	/**
diff --git a/wind/filter/WindActionFilter.php b/wind/filter/WindActionFilter.php
@@ -75,7 +75,7 @@ public function __construct($forward, $errorMessage, $router, $args = array()) {
 		$this->errorMessage = $errorMessage;
 		$this->router = $router;
 		foreach ($args as $key => $value)
-			property_exists(get_class($this), $key) && $this->$key = $value;
+			property_exists($this, $key) && $this->$key = $value;
 	}
 
 	/**
diff --git a/wind/readme b/wind/readme
@@ -1,8 +1,29 @@
-&#29256;&#26412;&#35828;&#26126;&#65306;
-wind_0.3.0.v1882_20110315_b  #&#40664;&#35748;&#37197;&#32622;&#20026; php
-wind_0.3.0.v1882_20110315	#&#40664;&#35748;&#37197;&#32622;&#20026;xml
+&#24403;&#21069; &#29256;&#26412;&#35828;&#26126;&#65306;
+wind_0.8.0
+release date: 2011.09.29
+description:
+8.0&#36825;&#20010;&#29256;&#26412;&#38598;&#20013;&#30340;&#20248;&#21270;&#20102;&#26694;&#26550;&#30340;&#26680;&#24515;&#26426;&#21046;,&#35843;&#25972;&#20102;&#26694;&#26550;&#30340;&#20307;&#31995;&#26550;&#26500;,&#20351;&#20854;&#24615;&#33021;&#25928;&#29575;&#19978;&#26377;&#20102;&#38750;&#24120;&#26126;&#26174;&#30340;&#25913;&#36827;,&#25193;&#23637;&#33021;&#21147;&#19978;&#20063;&#26356;&#20986;&#33394;.
+
+&#21382;&#21490;&#29256;&#26412;:
+wind_0.3.0.v1882_20110315_b
+wind_0.3.0.v1882_20110315
 wind_0.1.0.v849_20101227
 
-Feature list&#65306; sfsfsdfs
+Feature list:
+1. &#21435;&#25481;&#40664;&#35748;&#27169;&#26495;&#30340;&#40664;&#35748;&#35774;&#32622;.
+2. &#22686;&#21152;log&#31435;&#21363;flush&#25903;&#25345;.
+3. &#22686;&#21152;windcache&#32452;&#20214;,&#22522;&#20110;&#26694;&#26550;cache&#32452;&#20214;&#26426;&#21046;.&#23454;&#29616;cache&#31574;&#30053;&#30340;&#26080;&#32541;&#20999;&#25442;.
+4. &#23433;&#20840;,&#22522;&#20110;&#27169;&#26495;&#20307;&#31995;&#30340;&#36755;&#20986;&#23433;&#20840;&#36807;&#28388;.
+5. &#22810;&#36335;&#30001;&#21327;&#35758;&#25903;&#25345;,UrlRewrite&#25903;&#25345;.
+6. &#22522;&#20110;action&#30417;&#21548;&#36807;&#28388;&#30340;&#34920;&#21333;&#22788;&#29702;&#26426;&#21046;.
+7. &#25903;&#25345;action&#30417;&#21548;&#36807;&#28388;&#38142;.
+8. &#37325;&#23450;&#20041;&#40664;&#35748;&#24212;&#29992;&#37197;&#32622;.
+9. &#32452;&#20214;&#23545;&#35937;,&#37197;&#32622;&#20449;&#24687;&#27880;&#20876;.
+10.&#25903;&#25345;&#22810;&#24212;&#29992;&#22788;&#29702;&#33021;&#21147;.
 
-Fixed bug list&#65306;sdfsdf
+Fixed bug list:
+BUG[2106] WindHttpRequest &#20013;&#22686;&#21152;getRequest()&#26041;&#27861;
+BUG[2129] module/view&#37197;&#32622;&#25991;&#20214;&#33719;&#21462;&#38169;&#35823;
+BUG[2133] &#20851;&#20110;Call to undefined method WindDbException::getError() &#30340;&#24322;&#24120;&#38169;&#35823;
+BUG[2351] &#24322;&#24120;&#22788;&#29702;;&#24403;&#27809;&#26377;&#22788;&#29702;action&#21477;&#26564;&#34987;&#25214;&#21040;&#25110;&#32773;&#21477;&#26564;&#38169;&#35823;&#26102;&#25243;&#20986;&#38169;&#35823;
+BUG[2366] &#36755;&#20986;&#21464;&#37327;&#23433;&#20840;&#36807;&#28388;
diff --git a/wind/router/WindRouter.php b/wind/router/WindRouter.php
@@ -42,7 +42,7 @@ class WindRouter extends AbstractWindRouter {
 	public function route() {
 		$this->setCallBack(array($this, 'defaultRoute'));
 		$params = $this->getHandler()->handle();
-		$this->setParams($params);
+		$params && $this->setParams($params);
 	}
 
 	/* (non-PHPdoc)
@@ -70,8 +70,15 @@ public function assemble($action, $args = array(), $route = null) {
 	 * @return array
 	 */
 	public function defaultRoute() {
-		$_pathInfo = $this->getRequest()->getPathInfo();
-		return $_pathInfo ? WindUrlHelper::urlToArgs($_pathInfo) : array();
+		$action = $this->getRequest()->getRequest($this->actionKey);
+		$controller = $this->getRequest()->getRequest($this->controllerKey);
+		$module = $this->getRequest()->getRequest($this->moduleKey);
+		$action && $this->setAction($action);
+		$controller && $this->setController($controller);
+		$module && $this->setModule($module);
+		return;
+		/*$_pathInfo = $this->getRequest()->getPathInfo();
+		return $_pathInfo ? WindUrlHelper::urlToArgs($_pathInfo) : array();*/
 	}
 }
 
diff --git a/wind/viewer/compiler/WindTemplateCompilerTemplate.php b/wind/viewer/compiler/WindTemplateCompilerTemplate.php
@@ -34,7 +34,7 @@ public function compile($key, $content) {
 			if ($this->load === 'false') {
 				list($compileFile) = $this->windViewerResolver->compile($this->source, $this->suffix);
 				if (!empty($_tmp)) $compileFile = str_replace($this->source, '{$' . $_tmp[1] . '}', $compileFile);
-				$content = '<?php include_once("' . addslashes($compileFile) . '"); ?>';
+				$content = '<?php include("' . addslashes($compileFile) . '"); ?>';
 			} else {
 				list(, $content) = $this->windViewerResolver->compile($this->source, $this->suffix, true);
 			}
diff --git a/wind/viewer/compiler/WindViewTemplate.php b/wind/viewer/compiler/WindViewTemplate.php
@@ -121,7 +121,8 @@ protected function getTags() {
 		$_tags['expression'] = $this->createTag('expression', 'WIND:viewer.compiler.WindTemplateCompilerEcho', '/({@|{\$[\w$]{1})[^}{@=\n]*}/i');
 		$_tags['echo'] = $this->createTag('echo', 'WIND:viewer.compiler.WindTemplateCompilerEcho', '/\$[\w_]+/i');
 		/* &#22359;&#32534;&#35793;&#26631;&#31614;&#65292;&#23884;&#22871;&#21464;&#37327;&#22788;&#29702; */
-		$_tags['script'] = $this->createTag('script', 'WIND:viewer.compiler.WindTemplateCompilerScript', '/(<!--\[[\w\s]*\]>[\n\s]*)*<(script)[^<>\n]*(\/>|>(.|\n)*<\/\2>)([\n\s]*<!\[[\w\s]*\]-->)*/Ui');
+		$_tags['script1'] = $this->createTag('script1', 'WIND:viewer.compiler.WindTemplateCompilerScript', '/<!--\[[\w\s]*\]>(.|\n)*<!\[[\w\s]*\]-->/Ui');
+		$_tags['script'] = $this->createTag('script', 'WIND:viewer.compiler.WindTemplateCompilerScript', '/<(script)[^<>\n]*(\/>|>(.|\n)*<\/\1>)/Ui');
 		//$_tags['link'] = $this->createTag('link', 'WIND:viewer.compiler.WindTemplateCompilerCss');
 		//$_tags['style'] = $this->createTag('style', 'WIND:viewer.compiler.WindTemplateCompilerCss');
 		return $_tags;
diff --git a/wind/web/WindWebApplication.php b/wind/web/WindWebApplication.php
@@ -49,7 +49,11 @@ public function __construct($config, $factory) {
 		$this->request = new WindHttpRequest();
 		$this->response = $this->request->getResponse(@$config['charset']);
 		$this->windFactory = $factory;
-		$this->setConfig($config);
+		if ($config) {
+			$this->setConfig($config);
+			$this->checkConfig();
+		}
+		$this->setModules('default', $this->defaultModule, true);
 	}
 
 	/* (non-PHPdoc)
@@ -68,25 +72,17 @@ public function run() {
 			$this->started = true;
 			set_error_handler('WindHelper::errorHandle');
 			set_exception_handler('WindHelper::exceptionHandle');
-			if ($default = $this->getModules('default')) {
-				$this->defaultModule = WindUtility::mergeArray($this->defaultModule, $default);
-			}
-			$this->setModules('default', $this->defaultModule, true);
 			$this->_getHandlerAdapter()->route();
 			$__state = true;
 		}
 		try {
-			if (!$this->handlerAdapter->getModule()) {
-				$this->handlerAdapter->setModule('default');
-			}
+			if (!$this->handlerAdapter->getModule()) $this->handlerAdapter->setModule('default');
 			$this->checkProcess();
 			if (!($module = $this->getModules())) {
 				throw new WindActionException(
 					'[web.WindWebApplication.run] Your requested \'' . $this->handlerAdapter->getModule() . '\' was not found on this server.', 
 					404);
 			}
-			$module = WindUtility::mergeArray($this->getModules('default'), $module);
-			$this->setModules($this->handlerAdapter->getModule(), $module, true);
 			$handlerPath = $module['controller-path'] . '.' . ucfirst($this->handlerAdapter->getController()) . $module['controller-suffix'];
 			if (WIND_DEBUG & 2) {
 				Wind::getApp()->getComponent('windLogger')->info(
@@ -107,7 +103,7 @@ public function run() {
 					'[web.WindWebApplication.run] Your requested \'' . $handlerPath . '\' was not found on this server.', 
 					404);
 			}
-			if (isset($__state) && $__state === true && $this->_proxy && $filters = $this->getConfig('filters')) {
+			if (isset($__state) && $__state === true && $filters = $this->getConfig('filters')) {
 				$this->resolveActionMapping($filters, $handler);
 				$this->_proxy->runProcess($handler);
 			} else
@@ -129,6 +125,20 @@ public function run() {
 		}
 	}
 
+	/**
+	 * &#26816;&#26597;&#29615;&#22659;&#20013;&#37197;&#32622;&#20449;&#24687;&#30340;&#23436;&#25972;&#24615;
+	 */
+	private function checkConfig() {
+		if ($default = $this->getModules('default')) $this->defaultModule = WindUtility::mergeArray(
+			$this->defaultModule, $default);
+		$_modules = $this->getConfig('modules', '', array());
+		foreach ($_modules as $key => $value) {
+			if ($key == 'default') continue;
+			$value = WindUtility::mergeArray($this->defaultModule, $value);
+			$this->setModules($key, $value, true);
+		}
+	}
+
 	/**
 	 * &#25191;&#34892;&#35831;&#27714;&#30340;&#36827;&#31243;
 	 * 
@@ -250,6 +260,7 @@ public function getComponent($componentName) {
 	 * @return void
 	 */
 	protected function resolveActionMapping($filters, $handler) {
+		$this->_proxy || $this->_proxy = new WindClassProxy($this);
 		/* @var $cache AbstractWindCache */
 		$_filters = array();
 		if ($cache = $this->getComponent('windCache')) {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ class WindEnableValidateModule {`
`34`	`34`	`*`
`35`	`35`	`* @var array`
`36`	`36`	`*/`
`37`		`- private $_errors = array();`
	`37`	`+ protected $_errors = array();`
`38`	`38`	`/**`
`39`	`39`	`* 验证中产生错误信息时使用的默认错误信息`
`40`	`40`	`*`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public function __construct($forward, $errorMessage, $router, $args = array()) {`
`75`	`75`	`$this->errorMessage = $errorMessage;`
`76`	`76`	`$this->router = $router;`
`77`	`77`	`foreach ($args as $key => $value)`
`78`		`- property_exists(get_class($this), $key) && $this->$key = $value;`
	`78`	`+ property_exists($this, $key) && $this->$key = $value;`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
-Original file line number
+Diff line change
@@ @@ -1,8 +1,29 @@ @@
 -版本说明：
 -wind_0.3.0.v1882_20110315_b  #默认配置为 php
 -wind_0.3.0.v1882_20110315	#默认配置为xml
 +当前 版本说明：
 +wind_0.8.0
 +release date: 2011.09.29
 +description:
 +8.0这个版本集中的优化了框架的核心机制,调整了框架的体系架构,使其性能效率上有了非常明显的改进,扩展能力上也更出色.
++
 +历史版本:
 +wind_0.3.0.v1882_20110315_b
 +wind_0.3.0.v1882_20110315
 wind_0.1.0.v849_20101227
 -Feature list： sfsfsdfs
 +Feature list:
 +1. 去掉默认模板的默认设置.
 +2. 增加log立即flush支持.
 +3. 增加windcache组件,基于框架cache组件机制.实现cache策略的无缝切换.
 +4. 安全,基于模板体系的输出安全过滤.
 +5. 多路由协议支持,UrlRewrite支持.
 +6. 基于action监听过滤的表单处理机制.
 +7. 支持action监听过滤链.
 +8. 重定义默认应用配置.
 +9. 组件对象,配置信息注册.
 +10.支持多应用处理能力.
 -Fixed bug list：sdfsdf
 +Fixed bug list:
 +BUG[2106] WindHttpRequest 中增加getRequest()方法
 +BUG[2129] module/view配置文件获取错误
 +BUG[2133] 关于Call to undefined method WindDbException::getError() 的异常错误
 +BUG[2351] 异常处理;当没有处理action句柄被找到或者句柄错误时抛出错误
 +BUG[2366] 输出变量安全过滤