Merge pull request #530 from pradosoft/prado-3.2.4

Backports for Prado 3.2.4
pradosoft · Aug 26, 2014 · 74b31be · 74b31be
2 parents 2b11341 + 0c5026b
commit 74b31be
Show file tree

Hide file tree

Showing 987 changed files with 10,275 additions and 9,708 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,5 @@ bin/coveralls
 bin/dbunit.php
 
 #OSX
-.DS_Store
+.DS_Store
+bin/dbunit
diff --git a/.travis.yml b/.travis.yml
@@ -9,10 +9,9 @@ before_script:
   - composer self-update
   - composer install --prefer-source --dev
   - export PATH=./bin/:$PATH
-  - phpenv config-add travis.php.ini
 
 script:
-  - ./bin/phing coverage
+  - bash -c 'if [ "$TRAVIS_PHP_VERSION" == "5.3" ]; then phing test; else phing coverage ; fi;'
 
 after_script:
-  - php ./bin/coveralls -v
+  - php ./bin/coveralls -v
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,7 +1,7 @@
 The PRADO framework and the included demos are free software.
 They are released under the terms of the following BSD License.
 
-Copyright 2004-2013, The PRADO Group (http://www.pradosoft.com)
+Copyright 2004-2014, The PRADO Group (http://www.pradosoft.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

diff --git a/HISTORY b/HISTORY
@@ -1,3 +1,30 @@
+Version 3.2.4 Aug 26, 2014
+
+BUG: Issue #492 - Prado generates json_error when encoding an exception with non UTF-8 data (david0)
+ENH: Issue #494 - Adding toArray() and toJSON() to TActiveRecord (dmarko484)
+BUG: Issue #498 - Typo in TActiveFileUpload (Jens-mB)
+BUG: Issue #499 - Avoid scrolling when calling TControl::focus() (david0)
+BUG: Issue #502 - TSlider behaves strangely in TTabView (ctrlaltca)
+BUG: Issue #504 - Default Button cannot be referenced by <subControlId>.<controlId> (ctrlaltca)
+BUG: Issue #506 - Unused lines of code in TLiteralColumn::initializeCell (cross)
+BUG: Issue #511 - TActivePager's ButtonCssClass property is not rendered in buttons (ctrlaltca)
+BUG: Issue #515 - THtmlArea should override Readonly property (ctrlaltca)
+BUG: Issue #516 - Check Validators in TActiveEditCommandColumn (ctrlaltca)
+BUG: Issue #517 - TXmlDocument adjustment (gnit)
+BUG: Issue #518 - Runtime Notice in Gettext::factory() (ctrlaltca)
+BUG: Issue #519 - For MySQL in case PDO::CASE_LOWER creating table info does not work (ganiuszka)
+BUG: Issue #246 - Refix: User date() instead of gmdate() in TLogRoute (drigolin)
+BUG: Issue #520 - Unknown runtime error with Internet Explorer 8 (david0)
+BUG: Issue #524 - JSON error (5): Malformed UTF-8 characters when encoding callback response (david0)
+BUG: Issue #526 - TJsonRpcProtocol::callMethod, requested method is called twice (jojoinside)
+BUG: Issue #527 - TJsonRpcProtocol::callMethod, semicolon must be removed (jojoinside)
+ENH: Ported tests to Selenium2
+BUG: Avoid an exception loop on callback error when headers have already been sent (ctrlaltca)
+BUG: Avoid rendering <script> blocks in callbacks (ctrlaltca)
+BUG: Avoid dependency loop between TRadioButton and TRadioButtonList (ctrlaltca)
+ENH: Dropped Markdown for Parsedown (ctrlaltca)
+ENH: Web site administration tool (WSAT) (Daniel Sampedro) 
+
 Version 3.2.3 Nov 26, 2013
 
 BUG: Issue #467 - TSafeHtml error on php 5.5 (ctrlaltca)

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@ PRADO stands for PHP Rapid Application Development Object-oriented.
 
 [![Build Status](https://travis-ci.org/pradosoft/prado.png?branch=master)](https://travis-ci.org/pradosoft/prado)
 [![Coverage Status](https://coveralls.io/repos/pradosoft/prado/badge.png?branch=master)](https://coveralls.io/r/pradosoft/prado?branch=master)
-[![Dependencies Status](https://d2xishtp1ojlk0.cloudfront.net/d/8499593)](http://depending.in/pradosoft/prado)
+[![Dependencies Status](http://depending.in/pradosoft/prado.png)](http://depending.in/pradosoft/prado)
 [![Total Downloads](https://poser.pugx.org/pradosoft/prado/downloads.png)](https://packagist.org/packages/pradosoft/prado)
 [![Latest Stable Version](https://poser.pugx.org/pradosoft/prado/v/stable.png)](https://packagist.org/packages/pradosoft/prado)
 

diff --git a/UPGRADE b/UPGRADE
@@ -1,5 +1,5 @@
 
-         Upgrading Instructions for PRADO Framework v3.2.3
+         Upgrading Instructions for PRADO Framework v3.2.4
          =================================================
 
 !!!IMPORTANT!!!
@@ -9,9 +9,11 @@ if you want to upgrade from version A to version C and there is
 version B between A and C, you need to following the instructions
 for both A and B.
 
-Upgrading from v3.2.2
+Upgrading from v3.2.3
 ---------------------
 
+- TMarkdown is using Parsedown instead of Markdown, adding GitHub Flavored Markdown support.
+
 Upgrading from v3.2.1
 ---------------------
 - TEmailAddressValidator's CheckMXRecord property now defaults to false.

diff --git a/bin/prado-cli.php b/bin/prado-cli.php
@@ -5,9 +5,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  */
 
 if(!isset($_SERVER['argv']) || php_sapi_name()!=='cli')
@@ -58,7 +57,6 @@ function __shell_print_var($shell,$var)
  * Command line interface, configures the action classes and dispatches the command actions.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  * @since 3.0.5
  */
 class PradoCommandLineInterpreter
@@ -136,7 +134,6 @@ public function printHelp()
  * Base class for command line actions.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  * @since 3.0.5
  */
 abstract class PradoCommandLineAction
@@ -227,7 +224,6 @@ protected function initializePradoApplication($directory)
  * Create a Prado project skeleton, including directories and files.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  * @since 3.0.5
  */
 class PradoCommandLineCreateProject extends PradoCommandLineAction
@@ -305,8 +301,7 @@ protected function renderIndexFile()
 
 $application=new TApplication;
 $application->run();
-
-?>';
+';
 	}
 
 	protected function renderConfigFile($appName)
@@ -379,7 +374,6 @@ protected function renderDefaultPage()
  * Creates test fixtures for a Prado application.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  * @since 3.0.5
  */
 class PradoCommandLineCreateTests extends PradoCommandLineAction
@@ -431,8 +425,7 @@ protected function renderUnitTestFixture()
 
 $tester = new PradoUnitTester($test_cases, $app_directory);
 $tester->run(new HtmlReporter());
-
-?>';
+';
 	}
 
 	protected function renderFunctionalTestFixture()
@@ -446,8 +439,7 @@ protected function renderFunctionalTestFixture()
 
 $tester=new PradoFunctionalTester($test_cases);
 $tester->run(new SimpleReporter());
-
-?>';
+';
 	}
 
 }
@@ -456,7 +448,6 @@ protected function renderFunctionalTestFixture()
  * Creates and run a Prado application in a PHP Shell.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  * @since 3.0.5
  */
 class PradoCommandLinePhpShell extends PradoCommandLineAction
@@ -478,7 +469,6 @@ public function performAction($args)
  * Runs unit test cases.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  * @since 3.0.5
  */
 class PradoCommandLineUnitTest extends PradoCommandLineAction
@@ -594,7 +584,6 @@ protected function hasMatch($match,$entry)
  * Create active record skeleton
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  * @since 3.1
  */
 class PradoCommandLineActiveRecordGen extends PradoCommandLineAction
@@ -737,7 +726,7 @@ public static function finder(\$className=__CLASS__)
 		return parent::finder(\$className);
 	}
 }
-?>
+
 EOD;
 	}
 }
@@ -747,7 +736,6 @@ public static function finder(\$className=__CLASS__)
  *
  * @author Matthias Endres <me[at]me23[dot]de>
  * @author Daniel Sampedro Bello <darthdaniel85[at]gmail[dot]com>
- * @version $Id: prado-cli.php 3316 2013-08-20 13:51:25Z ctrlaltca $
  * @since 3.2
  */
 class PradoCommandLineActiveRecordGenAll extends PradoCommandLineAction {

diff --git a/build.xml b/build.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  PRADO 3.2 build file - Copyright (C) 2013 PradoSoft
+  PRADO 3.2 build file - Copyright (C) 2014 PradoSoft
 
   Requirements
   ============

diff --git a/buildscripts/apigen/pradosoft/@layout.latte b/buildscripts/apigen/pradosoft/@layout.latte
@@ -182,7 +182,7 @@ the file LICENSE.md that was distributed with this source code.
   <a href="/support/">Contact Us</a>
   <br/>
   {$config->title} API documentation generated by <a href="http://apigen.org">{$generator} {$version}</a>
-  <br/>Copyright &copy; 2006-2013 by the PRADO Group.<br/>
+  <br/>Copyright &copy; 2006-2014 by the PRADO Group.<br/>
   <a title="Powered by PRADO" href="http://www.pradosoft.com/"><img src="http://www.pradosoft.com/images/powered2.gif" style="border-width:0px;" alt="Powered by PRADO" /></a>
 </div>
 

diff --git a/buildscripts/classtree/DWExtension.php b/buildscripts/classtree/DWExtension.php
@@ -252,4 +252,3 @@ public function getXML()
 		return $this->_document->saveXML();
 	}
 }
-?>
diff --git a/buildscripts/index/build.php b/buildscripts/index/build.php
@@ -61,5 +61,3 @@
 {
 	echo "Usage: 'php build.php quickstart' or 'php build.php api'\n";
 }
-
-?>
diff --git a/buildscripts/index/quickstart_index.php b/buildscripts/index/quickstart_index.php
@@ -104,4 +104,3 @@ public function commit()
 		echo "\nSaving search index ({$count}) to {$this->_dir}\n\n";
 	}
 }
-?>
diff --git a/buildscripts/index/search.php b/buildscripts/index/search.php
@@ -11,7 +11,7 @@
 
 if($keyword!=='')
 {
-	$search=new Zend_Search_Lucene(realpath(dirname(__FILE__)));		
+	$search=new Zend_Search_Lucene(realpath(dirname(__FILE__)));
 	$results=$search->find(strtolower($keyword));
 	$content='';
 	foreach($results as $entry)
@@ -32,5 +32,3 @@
 if($keyword!=='')
 	$page=preg_replace('/<input type="text" name="keyword"/','<input type="text" name="keyword" value="'.htmlentities($keyword).'"',$page);
 echo $page;
-
-?>
diff --git a/buildscripts/phing/tasks/PradoPearTask.php b/buildscripts/phing/tasks/PradoPearTask.php
@@ -129,5 +129,3 @@ function main()
 			echo $e->getMessage();
 	}
 }
-
-?>
diff --git a/buildscripts/phpbuilder/build.php b/buildscripts/phpbuilder/build.php
@@ -144,5 +144,3 @@ function unfold_file($fileName)
 	}
 	return $content;
 }
-
-?>
diff --git a/buildscripts/setup.php b/buildscripts/setup.php
diff --git a/buildscripts/texbuilder/Page2Tex.php b/buildscripts/texbuilder/Page2Tex.php
@@ -343,5 +343,3 @@ function add_p($matches)
 		 return "<p id=\"".($page + (++self::$p_count))."\" class=\"block-content\">";
 	}
 }
-
-?>
diff --git a/buildscripts/texbuilder/quickstart/build.php b/buildscripts/texbuilder/quickstart/build.php
@@ -76,6 +76,3 @@
 		echo " Unable to find pdfLatex executable $pdflatexExec";
 	}
 }
-
-
-?>
diff --git a/buildscripts/texbuilder/quickstart/pages.php b/buildscripts/texbuilder/quickstart/pages.php
@@ -9,13 +9,14 @@
 	'GettingStarted/AboutPrado.page',
 	'GettingStarted/Installation.page',
 	'GettingStarted/NewFeatures.page',
-	'GettingStarted/Upgrading.page'
+	'GettingStarted/Upgrading.page',
+	'GettingStarted/Wsat.page',
+	'GettingStarted/CommandLine.page'
 	);
 
 $pages['Tutorials'] = array(
 	'GettingStarted/HelloWorld.page',
 	'Fundamentals/Hangman.page',
-	'GettingStarted/CommandLine.page'
 	);
 
 $pages['Tutorial: Currency Converter'] = array(
@@ -26,13 +27,10 @@
 	'Tutorial/AjaxChat.page'
 	);
 
-$pages['Tutorial: Addressbook'] = array(
-	'Tutorial/AddressBook.page'
-	);
-
 $pages['Fundamentals'] = array(
 	'Fundamentals/Architecture.page',
-	'Fundamentals/Components.page',
+	'Fundamentals/Components1.page',
+	'Fundamentals/Components2.page',
 	'Fundamentals/Controls.page',
 	'Fundamentals/Pages.page',
 	'Fundamentals/Modules.page',
@@ -66,6 +64,7 @@
 	'Controls/Head.page',
 	'Controls/HiddenField.page',
 	'Controls/HtmlArea.page',
+	'Controls/HtmlArea4.page',
 	'Controls/HyperLink.page',
 	'Controls/Image.page',
 	'Controls/ImageButton.page',
@@ -76,6 +75,7 @@
 	'Controls/Label.page',
 	'Controls/LinkButton.page',
 	'Controls/Literal.page',
+	'Controls/Markdown.page',
 	'Controls/MultiView.page',
 	'Controls/OutputCache.page',
 	'Controls/Pager.page',
@@ -177,5 +177,3 @@
 
 return $pages;
 //-------------- END CONFIG ----------------
-
-?>
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -52,8 +52,8 @@
 
 %----------------- TITLE --------------
 
-\title{\Huge \bfseries PRADO v3.2.3 Quickstart Tutorial
-    \thanks{Copyright 2004-2013. All Rights Reserved.}
+\title{\Huge \bfseries PRADO v3.2.4 Quickstart Tutorial
+    \thanks{Copyright 2004-2014. All Rights Reserved.}
 }
 \author{Qiang Xue and Wei Zhuo}
 \date{\today}
@@ -78,7 +78,7 @@ \chapter*{Preface}
 \chapter*{License}
 \addcontentsline{toc}{chapter}{License}
 PRADO is free software released under the terms of the following BSD license.\\
-Copyright 2004-2013, The PRADO Group (http://www.pradosoft.com)
+Copyright 2004-2014, The PRADO Group (http://www.pradosoft.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,4 +252,3 @@ public function getXML() @@
     		return $this->_document->saveXML();
     	}
     }
-    ?>