From f9720e7ae73b2eadd909f60c52908a5e60ea0b42 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 26 Nov 2013 09:45:24 +0100 Subject: Get version hash from git while creating dist package --- buildscripts/phing/tasks/PradoVersionTask.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'buildscripts') diff --git a/buildscripts/phing/tasks/PradoVersionTask.php b/buildscripts/phing/tasks/PradoVersionTask.php index 4310cf60..15c73efd 100644 --- a/buildscripts/phing/tasks/PradoVersionTask.php +++ b/buildscripts/phing/tasks/PradoVersionTask.php @@ -38,17 +38,8 @@ class PradoVersionTask extends PropertyTask */ private function getPradoRevision() { - $svnPath=dirname(__FILE__).'/../../../.svn'; - if(is_file($svnPath.'/all-wcprops')) - $propFile=$svnPath.'/all-wcprops'; - else if(is_file($svnPath.'/dir-wcprops')) - $propFile=$svnPath.'/dir-wcprops'; - else - return 'unknown'; - $contents=file_get_contents($propFile); - if(preg_match('/\\/svn\\/\\!svn\\/ver\\/(\d+)\\//ms',$contents,$matches)>0) - return $matches[1]; - else - return 'unknown'; + $rev=shell_exec("git log -1 --pretty=format:'%h'"); + if($rev===null) $rev='unknown'; + return $rev; } } -- cgit v1.2.3 From 7f2ffe05d5f5fa2001f97790aecf2e68f91bbe6a Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Tue, 26 Nov 2013 09:58:10 +0100 Subject: Clean up checks for .svn directory --- bin/prado-cli.php | 2 +- build.xml | 12 ------------ buildscripts/classtree/build.php | 1 - framework/pradolite.php | 2 +- 4 files changed, 2 insertions(+), 15 deletions(-) (limited to 'buildscripts') diff --git a/bin/prado-cli.php b/bin/prado-cli.php index 4fa70c08..b4b43062 100755 --- a/bin/prado-cli.php +++ b/bin/prado-cli.php @@ -569,7 +569,7 @@ class PradoCommandLineUnitTest extends PradoCommandLineAction if($match==null||($match!=null && $this->hasMatch($match,$entry))) $test->addTestFile($path.'/'.$entry); } - if($entry!=='.' && $entry!=='..' && $entry!=='.svn' && is_dir($path.'/'.$entry) && $recursive) + if($entry!=='.' && $entry!=='..' && is_dir($path.'/'.$entry) && $recursive) $this->addTests($test,$path.'/'.$entry,$recursive,$match); } closedir($dir); diff --git a/build.xml b/build.xml index 582b832b..023debe2 100644 --- a/build.xml +++ b/build.xml @@ -37,7 +37,6 @@ All Source Files in framework --> - @@ -58,7 +57,6 @@ Surrounding files --> - @@ -72,7 +70,6 @@ Documentation --> - @@ -85,7 +82,6 @@ Demos --> - @@ -201,8 +197,6 @@ php="false" templateconfig="buildscripts/apigen/pradosoft/config.neon" /> - Cleaning svn directories from API manuals... - Indexing API manuals... @@ -335,7 +329,6 @@ Checking php files.. - @@ -345,7 +338,6 @@ Checking js files.. - @@ -355,7 +347,6 @@ Checking xml files.. - @@ -367,7 +358,6 @@ Checking php files.. - @@ -377,7 +367,6 @@ Checking js files.. - @@ -387,7 +376,6 @@ Checking xml files.. - diff --git a/buildscripts/classtree/build.php b/buildscripts/classtree/build.php index 44700be4..f7b8d7e7 100644 --- a/buildscripts/classtree/build.php +++ b/buildscripts/classtree/build.php @@ -12,7 +12,6 @@ $exclusions=array( 'pradolite.php', 'prado-cli.php', 'JSMin.php', - '.svn', '/I18N/core', '/3rdParty', '/Testing', diff --git a/framework/pradolite.php b/framework/pradolite.php index cb0db1f0..40ad7ccd 100644 --- a/framework/pradolite.php +++ b/framework/pradolite.php @@ -1,7 +1,7 @@ Date: Tue, 26 Nov 2013 10:04:16 +0100 Subject: Forgot to update Quickstart tutorial pdf's version --- buildscripts/texbuilder/quickstart/quickstart.tex | 2 +- .../protected/pages/Fundamentals/Components.page | 64 +++++++++++----------- framework/pradolite.php | 2 +- 3 files changed, 34 insertions(+), 34 deletions(-) (limited to 'buildscripts') diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex index deaba73c..41258800 100644 --- a/buildscripts/texbuilder/quickstart/quickstart.tex +++ b/buildscripts/texbuilder/quickstart/quickstart.tex @@ -52,7 +52,7 @@ %----------------- TITLE -------------- -\title{\Huge \bfseries PRADO v3.2.2 Quickstart Tutorial +\title{\Huge \bfseries PRADO v3.2.3 Quickstart Tutorial \thanks{Copyright 2004-2013. All Rights Reserved.} } \author{Qiang Xue and Wei Zhuo} diff --git a/demos/quickstart/protected/pages/Fundamentals/Components.page b/demos/quickstart/protected/pages/Fundamentals/Components.page index 84c6070c..11235b56 100755 --- a/demos/quickstart/protected/pages/Fundamentals/Components.page +++ b/demos/quickstart/protected/pages/Fundamentals/Components.page @@ -105,13 +105,13 @@ $button->attachEventHandler( 'OnClick' , $callback );
  • array($object,'MainContent.SubmitButton.buttonClicked') : $object->MainContent->SubmitButton->buttonClicked($sender,$param);
    • -

    Global events

    -

    +

    Global events

    +

    With the addition of behaviors, a more expansive event model is needed. There are two new event types (global and dynamic events) as well as a more comprehensive behavior model that includes class wide behaviors.

    -

    +

    A global event is defined by all events whose name starts with 'fx'. The event name is potentially a method name and is thus case-insensitive. All 'fx' events are valid as the whole 'fx' event/method space is global in nature. Any object may patch into @@ -121,7 +121,7 @@ nature of all events which start with 'fx' being valid, in effect, every object has every 'fx' global event. It is simply an issue of tapping into the desired global event.

    -

    +

    A global event that starts with 'fx' can be called even if the object does not implement the method of the global event. A call to a non-existing 'fx' method will, at minimal, function and return null. If a method argument list has a first @@ -131,7 +131,7 @@ object's global event listeners, call the object's listen and unlisten methods, respectively. An object may auto-install its global event during __construct by overriding getAutoGlobalListen and returning true.

    -

    +

    As of PHP version 5.3, nulled objects without code references will still continue to persist in the global event queue because __destruct is not automatically called. In the common __destruct method, if an object is listening to global events, then unlisten is called. @@ -139,11 +139,11 @@ __destruct method, if an object is listening to global events, then unlisten left without references if it is currently listening to any global events. This includes class wide behaviors.

    -

    +

    An object that contains a method that starts with 'fx' will have those functions automatically receive those events of the same name after listen is called on the object.

    -

    +

    An object may listen to a global event without defining an 'fx' method of the same name by adding an object method to the global event list. For example

    @@ -151,21 +151,21 @@ adding an object method to the global event list. For example $component->fxGlobalCheck=$callback; // or $component->OnClick->add($callback); $component->attachEventHandler('fxGlobalCheck',array($object, 'someMethod')); -

    Events between Objects and their behaviors, Dynamic Events

    -

    +

    Events between Objects and their behaviors, Dynamic Events

    +

    An intra-object/behavior event is defined by methods that start with 'dy'. Just as with 'fx' global events, every object has every dynamic event. Any call to a method that starts with 'dy' will be handled, regardless of whether it is implemented. These events are for communicating with attached behaviors.

    -

    +

    Dynamic events can be used in a variety of ways. They can be used to tell behaviors when a non-behavior method is called. Dynamic events could be used as data filters. They could also be used to specify when a piece of code is to be run, eg. should the loop process be performed on a particular piece of data. In this way, some control is handed to the behaviors over the process and/or data.

    -

    +

    If there are no handlers for an 'fx' or 'dy' event, it will return the first parameter of the argument list. If there are no arguments, these events will return null. If there are handlers an 'fx' method will be called directly @@ -174,36 +174,36 @@ For dynamic events where there are behaviors that respond to the dynamic events, TCallChain is developed. A call chain allows the behavior dynamic event implementations to call further implementing behaviors within a chain.

    -

    +

    If an object implements IDynamicMethods, all global and object dynamic events will be sent to __dycall. In the case of global events, all global events will trigger this method. In the case of behaviors, all undefined dynamic events which are called will be passed through to this method.

    -

    -

    Behaviors

    -

    +

    +

    Behaviors

    +

    There are two types of behaviors. There are individual object behaviors and there are class wide behaviors. Class behaviors depend upon object behaviors.

    -

    +

    When a new class implements IBehavior or IClassBehavior or extends TBehavior or TClassBehavior, it may be added to an object by calling the object's attachBehavior. The behaviors associated name can then be used to enableBehavior or disableBehavior the specific behavior.

    -

    +

    All behaviors may be turned on and off via enableBehaviors and disableBehaviors, respectively. To check if behaviors are on or off a call to getBehaviorsEnabled will provide the variable.

    -

    +

    Attaching and detaching whole sets of behaviors is done using attachBehaviors and detachBehaviors. clearBehaviors removes all of an object's behaviors.

    -

    +

    asa returns a behavior of a specific name. isa is the behavior inclusive function that acts as the PHP operator instanceof. A behavior could provide the functionality of a specific class thus causing @@ -211,13 +211,13 @@ the host object to act similarly to a completely different class. A behavior would then implement IInstanceCheck to provide the identity of the different class.

    -

    +

    Class behaviors are similar to object behaviors except that the class behavior is the implementation for all instances of the class. A class behavior will have the object upon which is being called be prepended to the parameter list. This way the object is known across the class behavior implementation.

    -

    +

    Class behaviors are attached using attachClassBehavior and detached using detachClassBehavior. Class behaviors are important in that they will be applied to all new instances of a particular class. In this way @@ -226,7 +226,7 @@ class behaviors become default behaviors to a new instances of a class in from the default set of behaviors created for an object when the object is instanced.

    -

    +

    Class behaviors are also added to all existing instances via the global 'fx' event mechanism. When a new class behavior is added, the event fxAttachClassBehavior is raised and all existing instances that are @@ -235,8 +235,8 @@ will have this new behavior attached. A similar process is used when detaching class behaviors. Any objects listening to the global 'fx' event fxDetachClassBehavior will have a class behavior removed.

    -

    Dynamic Intra-Object Events

    -

    +

    Dynamic Intra-Object Events

    +

    Dynamic events start with 'dy'. This mechanism is used to allow objects to communicate with their behaviors directly. The entire 'dy' event space is valid. All attached, enabled behaviors that implement a dynamic event @@ -249,7 +249,7 @@ parameter in the dynamic event. null == $this->dyBehaviorEvent(); 5 == $this->dyBehaviorEvent(5); //when no behaviors implement this dynamic event -

    +

    Dynamic events can be chained together within behaviors to allow for data filtering. Dynamic events are implemented within behaviors by defining the event as a method. @@ -262,12 +262,12 @@ class TObjectBehavior extends TBehavior { } } -

    +

    This implementation of a behavior and dynamic event will flow through to the next behavior implementing the dynamic event. The first parameter is always return when it is supplied. Otherwise a dynamic event returns null.

    -

    +

    In the case of a class behavior, the object is also prepended to the dynamic event.

    @@ -280,14 +280,14 @@ class TObjectClassBehavior extends TClassBehavior { }

    -

    +

    When calling a dynamic event, only the parameters are passed. The host object and the call chain are built into the framework.

    -

    Global Event and Dynamic event catching

    +

    Global Event and Dynamic event catching

    -

    +

    Given that all global 'fx' events and dynamic 'dy' events are valid and operational, there is a mechanism for catching events called that are not implemented (similar to the built-in PHP method __call). When @@ -295,12 +295,12 @@ a dynamic or global event is called but a behavior does not implement it, yet desires to know when an undefined dynamic event is run, the behavior implements the interface IDynamicMethods and method __dycall.

    -

    +

    In the case of dynamic events, __dycall is supplied with the method name and its parameters. When a global event is raised, via raiseEvent, the method is the event name and the parameters are supplied.

    -

    +

    When implemented, this catch-all mechanism is called for event global event event when implemented outside of a behavior. Within a behavior, it will also be called when the object to which the behavior is attached calls any unimplemented dynamic diff --git a/framework/pradolite.php b/framework/pradolite.php index 40ad7ccd..911db340 100644 --- a/framework/pradolite.php +++ b/framework/pradolite.php @@ -1,7 +1,7 @@