Changeset 91

(2009/05/01 19:50) Almost 3 years ago

begin of the change to make possible to use the code to diagram by a external link. still has a problem with the public external css link to be solved.

Affected files

components/_start.php Download diff

	90		91
1	<?php	1	<?php
2	define( "COMPONENTS_PATH" , str_replace( "\\" , "/" , str_replace( basename( __FILE__ ) , "" , __FILE__ ) ) );	2	define( "COMPONENTS_PATH" , str_replace( "\\" , "/" , str_replace( basename( __FILE__ ) , "" , __FILE__ ) ) );
3		3
4	require_once( COMPONENTS_PATH . "_start.php" );	4	Loader::requireOnce( COMPONENTS_PATH . "_start.php" );
5	require_once( COMPONENTS_PATH . "library/_start.php" );	5	Loader::requireOnce( COMPONENTS_PATH . "library/_start.php" );
6	//require_once( COMPONENTS_PATH . "backtrace/_start.php" );	6	//Loader::requireOnce( COMPONENTS_PATH . "backtrace/_start.php" );
7	require_once( COMPONENTS_PATH . "extendedReflection/_start.php" );	7	Loader::requireOnce( COMPONENTS_PATH . "extendedReflection/_start.php" );
8	require_once( COMPONENTS_PATH . "codeReflection/_start.php" );	8	Loader::requireOnce( COMPONENTS_PATH . "codeReflection/_start.php" );
9	require_once( COMPONENTS_PATH . "codeInstrumentation/_start.php" );	9	Loader::requireOnce( COMPONENTS_PATH . "codeInstrumentation/_start.php" );
10	require_once( COMPONENTS_PATH . "xmlSequence/_start.php" );	10	Loader::requireOnce( COMPONENTS_PATH . "xmlSequence/_start.php" );
11	require_once( COMPONENTS_PATH . "codeToDiagram/_start.php" );	11	Loader::requireOnce( COMPONENTS_PATH . "codeToDiagram/_start.php" );
12	?>	12	?>

components/backtrace/_start.php Download diff

	90		91
8	* Load the Backtrace package	8	* Load the Backtrace package
9	* @author Renan de Lima Barbosa <renandelima@gmail.com>	9	* @author Renan de Lima Barbosa <renandelima@gmail.com>
10	*/	10	*/
11	require_once( "Backtracephp" );	11	Loader::requireOnce( "Backtracephp" , true );
12	require_once( "BackTraceExplain.php" );	12	Loader::requireOnce( "BackTraceExplain.php" , true );
13	?>	13	?>

components/codeInstrumentation/_start.php Download diff

	90		91
7	/**	7	/**
8	* Load the Code Instrumentation package	8	* Load the Code Instrumentation package
9	*/	9	*/
10	require_once( "CodeInstrumentationException.class.php" );	10	Loader::requireOnce( "CodeInstrumentationException.class.php" , true );
11	require_once( "CodeInstrumentationReceiver.class.php" );	11	Loader::requireOnce( "CodeInstrumentationReceiver.class.php" , true );
12	require_once( "CodeInstrumentationParameter.class.php" );	12	Loader::requireOnce( "CodeInstrumentationParameter.class.php" , true );
13	require_once( "CodeInstrumentationProperty.class.php" );	13	Loader::requireOnce( "CodeInstrumentationProperty.class.php" , true );
14	require_once( "CodeInstrumentationFunction.class.php" );	14	Loader::requireOnce( "CodeInstrumentationFunction.class.php" , true );
15	require_once( "CodeInstrumentationMethod.class.php" );	15	Loader::requireOnce( "CodeInstrumentationMethod.class.php" , true );
16	require_once( "CodeInstrumentationClass.class.php" );	16	Loader::requireOnce( "CodeInstrumentationClass.class.php" , true );
17	?>	17	?>

components/codeInstrumentation/CodeInstrumentationClass.class.php Download diff

	90		91
182	{	182	{
183	return new CodeInstrumentationMethod( $this->getName() , $objOriginalReflectionMethod->getName() );	183	return new CodeInstrumentationMethod( $this->getName() , $objOriginalReflectionMethod->getName() );
184	}	184	}
185	}	185	}
		186
		187	?>

components/codeInstrumentation/CodeInstrumentationException.class.php Download diff

	90		91
10	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>	10	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
11	*/	11	*/
12	class CodeInstrumentationException extends Exception {}	12	class CodeInstrumentationException extends Exception {}
		13
		14	?>

components/codeInstrumentation/CodeInstrumentationFunction.class.php Download diff

	90		91
35	return new CodeInstrumentationParameter( $this->getDeclaringClass()->getName() , $this->getName() , $objReflectionParameter->getName() );	35	return new CodeInstrumentationParameter( $this->getDeclaringClass()->getName() , $this->getName() , $objReflectionParameter->getName() );
36	}	36	}
37		37
38	}	38	}
		39
		40	?>

components/codeInstrumentation/CodeInstrumentationMethod.class.php Download diff

	90		91
259	}	259	}
260		260
261	}	261	}
		262
		263	?>

components/codeInstrumentation/CodeInstrumentationParameter.class.php Download diff

	90		91
56	}	56	}
57	}	57	}
58	}	58	}
		59
		60	?>

components/codeInstrumentation/CodeInstrumentationProperty.class.php Download diff

	90		91
29	}	29	}
30		30
31	}	31	}
		32
		33	?>

components/codeInstrumentation/CodeInstrumentationReceiver.class.php Download diff

         // 4. clean stack //
         $this->arrStack = array();
         // 5. clean object xml sequence //
-        $this->objXmlSequence = null;
+        $this->objXmlSequence->restart();
         // 6. restart the receiver //
         $this->__construct();
         return $this;
     }
 }
+?>

components/codeReflection/_start.php Download diff

	90		91
8	* Load the CodeReflection package	8	* Load the CodeReflection package
9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>	9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
10	*/	10	*/
11	require_once( "CodeReflectionException.class.php" );	11	Loader::requireOnce( "CodeReflectionException.class.php" , true );
12	require_once( "CodeReflectionFile.class.php" );	12	Loader::requireOnce( "CodeReflectionFile.class.php" , true );
13	require_once( "CodeReflectionParameter.class.php" );	13	Loader::requireOnce( "CodeReflectionParameter.class.php" , true );
14	require_once( "CodeReflectionProperty.class.php" );	14	Loader::requireOnce( "CodeReflectionProperty.class.php" , true );
15	require_once( "CodeReflectionFunction.class.php" );	15	Loader::requireOnce( "CodeReflectionFunction.class.php" , true );
16	require_once( "CodeReflectionMethod.class.php" );	16	Loader::requireOnce( "CodeReflectionMethod.class.php" , true );
17	require_once( "CodeReflectionClass.class.php" );	17	Loader::requireOnce( "CodeReflectionClass.class.php" , true );
18	?>	18	?>

components/codeReflection/CodeReflectionClass.class.php Download diff

	90		91
16	* instrumentation.	16	* instrumentation.
17	*	17	*
18	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>	18	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
19	' *	19	*
20	*/	20	*/
21	class CodeReflectionClass extends ExtendedReflectionClass	21	class CodeReflectionClass extends ExtendedReflectionClass
22	{	22	{

components/codeToDiagram/_start.php Download diff

	90		91
8	* Load the CodeToDiagram package	8	* Load the CodeToDiagram package
9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>	9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
10	*/	10	*/
11	require_once( "CodeToDiagramException.class.php" );	11	Loader::requireOnce( "CodeToDiagramException.class.php" , true );
12	require_once( "CodeToDiagram.class.php" );	12	Loader::requireOnce( "CodeToDiagram.class.php" , true );
13	?>	13	?>

components/codeToDiagram/CodeToDiagram.class.php Download diff

	90		91
360	return $this->strPublicPath;	360	return $this->strPublicPath;
361	}	361	}
362		362
363	/**
364	* Check if a address is relative
365	*
366	* @assert( "c:\www\temp.php" ) == false
367	* @assert( "d:/www/temp.php" ) == false
368	* @assert( "temp.php" ) == true
369	* @assert( "./temp.php" ) == true
370	* @assert( "/www/something.php" ) == false
371	* @assert( "./www/something.php" ) == true
372	* @assert( ".\www\something.php" ) == true
373	* @assert( "..\www\something.php" ) == true
374	* @assert( "..\www\something.php" ) == true
375	*
376	*/
377	public function isRelativePath( $strFile )
378	{
379	$strFile = str_replace( "\\", "/", $strFile);
380	if(
381	( strpos( $strFile, "./") === 0 )
382	or
383	( strpos( $strFile, "../") === 0 )
384	)
385	{
386	return true;
387	}
388	elseif( strpos( $strFile, "/") === false )
389	{
390	return true;
391	}
392	else
393	{
394	return false;
395	}
396	}
397
398	/**	363	/**
399	* Start the log of the execution and restart if already have	364	* Start the log of the execution and restart if already have
400	*	365	*
...		...
574	* @return CodeToDiagram	539	* @return CodeToDiagram
575	*/	540	*/
576	public function CodeToDiagramRequireOnce( $strFileFrom, $strFile )	541	public function CodeToDiagramRequireOnce( $strFileFrom, $strFile )
577	{	542	{
578	$arrCodeToDiagramBackTrace = debug_backtrace();	543	$arrCodeToDiagramBackTrace = debug_backtrace();
579		544
580	if( !$this->hasFile( $strFileFrom , $strFile ) )	545	if( !$this->hasFile( $strFileFrom , $strFile ) )
...		...
844	}	809	}
845	$this->addFile( $strFileFrom, $strFile );	810	$this->addFile( $strFileFrom, $strFile );
846		811
847	if( $this->isRelativePath( $strFile ) )	812	if( CorujaFileManipulation::isRelativePath( $strFile ) )
848	{	813	{
849	$strFullFile = $this->fixFileName( $strFileFrom, $strFile );	814	$strFullFile = $this->fixFileName( $strFileFrom, $strFile );
850	}	815	}
...		...
864		829
865	return $this;	830	return $this;
866	}	831	}
867	}	832
		833	/**
		834	* Set the caller path receiving the caller file
		835	*
		836	* @param string $strCallerFile
		837	*/
		838	public function setCallerPathByFile( $strCallerFile )
		839	{
		840	$this->setCallerPath( CorujaFileManipulation::getPathOfFile( $strCallerFile ) );
		841	}
		842	}
		843
		844	?>

components/codeToDiagram/CodeToDiagramException.class.php Download diff

	90		91
14	{	14	{
15		15
16	}	16	}
17	?>	17	?>

components/extendedReflection/_start.php Download diff

	90		91
8	* Load the Extended Reflection package	8	* Load the Extended Reflection package
9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>	9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
10	*/	10	*/
11	require_once( "ExtendedReflectionParameter.class.php" );	11	Loader::requireOnce( "ExtendedReflectionParameter.class.php" , true );
12	require_once( "ExtendedReflectionProperty.class.php" );	12	Loader::requireOnce( "ExtendedReflectionProperty.class.php" , true );
13	require_once( "ExtendedReflectionFunction.class.php" );	13	Loader::requireOnce( "ExtendedReflectionFunction.class.php" , true );
14	require_once( "ExtendedReflectionMethod.class.php" );	14	Loader::requireOnce( "ExtendedReflectionMethod.class.php" , true );
15	require_once( "ExtendedReflectionClass.class.php" );	15	Loader::requireOnce( "ExtendedReflectionClass.class.php" , true );
16	?>	16	?>

components/library/_start.php Download diff

	90		91
7	/**	7	/**
8	* Load the library package	8	* Load the library package
9	*/	9	*/
10	require_once( "CorujaArrayManipulation.class.php" );	10	if( class_exists( "Loader" ) )
11	require_once( "CorujaClassManipulation.class.php" );	11	{
12	require_once( "CorujaStringManipulation.class.php" );	12	Loader::requireOnce( "CorujaArrayManipulation.class.php" , true );
13	?>	13	Loader::requireOnce( "CorujaClassManipulation.class.php" , true );
		14	Loader::requireOnce( "CorujaStringManipulation.class.php" , true );
		15	Loader::requireOnce( "CorujaFileManipulation.class.php" , true );
		16	}
		17	else
		18	{
		19	require_once( "CorujaArrayManipulation.class.php" );
		20	require_once( "CorujaClassManipulation.class.php" );
		21	require_once( "CorujaStringManipulation.class.php" );
		22	require_once( "CorujaFileManipulation.class.php" );
		23	}
		24	?>

components/library/CorujaArrayManipulation.class.php Download diff

	90		91
6		6
7	/**	7	/**
8	* Class with methods for array manipulation	8	* Class with methods for array manipulation
		9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
9	*/	10	*/
10	class CorujaArrayManipulation	11	class CorujaArrayManipulation
11	{	12	{
...		...
37	return $mixNotFound;	38	return $mixNotFound;
38	}	39	}
39	}	40	}
40		41	}
41	}	42	?>

components/library/CorujaClassManipulation.class.php Download diff

 /**
  * Class for manipulation of classes
+ * @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
  */
 class CorujaClassManipulation
 {
 		return CorujaArrayManipulation::getArrayField( explode( "::" , $strClassDefiniton )  , 1 , "" );
 	}
 }
+?>

components/library/CorujaFileManipulation.class.php

Show contents

components/library/CorujaStringManipulation.class.php Download diff

	90		91
6		6
7	/**	7	/**
8	* Class for string manipulations	8	* Class for string manipulations
		9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
9	*/	10	*/
10	class CorujaStringManipulation	11	class CorujaStringManipulation
11	{	12	{
...		...
153	$strText = $strTab . implode( $strTab , $arrText ) . $strTab;	154	$strText = $strTab . implode( $strTab , $arrText ) . $strTab;
154	return $strText;	155	return $strText;
155	}	156	}
156
157	/**
158	* Returns a path to a folder relative from another folder. Both parameters
159	* must be absolute.
160	*
161	* - check for valid parameters
162	* - in case paths are equal return './'
163	* - explode parameters using '/'
164	* - remove similar base folders
165	* - make final address
166	*
167	* @param String $strFileFrom Base from the path. This must be an absolute path.
168	* @param String $strFileTo Destination of the path. This must be an absolute path.
169	* @param Boolean $booValidPath Use false if you don't want to check for valid folders.
170	* @throws InvalidArgumentException In case of invalid values
171	*
172	* @example $path = CorujaStringManipulation::getRelativePath( "/www/folder/", "/www/another/big/" ); // "../another/big/"
173	*
174	* @assert ( "/www/folder/", "/www/another/big/", false ) == "../another/big/"
175	* @assert ( "", "" ) throws InvalidArgumentException
176	* @assert ( "hello", "" ) throws InvalidArgumentException
177	* @assert ( "", "hello" ) throws InvalidArgumentException
178	* @assert ( "cool", "hello" ) throws InvalidArgumentException
179	* @assert ( "/cool/", "hello" ) throws InvalidArgumentException
180	* @assert ( "cool", "/hello/" ) throws InvalidArgumentException
181	* @assert ( "/cool/", "/hello/", false ) == "../hello/"
182	* @assert ( "/cool/", "/hello/", false ) == "../hello/"
183	* @assert ( "/cool/", "/cool/", false ) == "./"
184	* @assert ( "/cool/more/", "/other/", false ) == "../../other/"
185	* @assert ( "/cool/", "/other/more/", false ) == "../other/more/"
186	*/
187	public static function getRelativePath( $strFileFrom, $strFileTo, $booValidPath = true )
188	{
189	// check for valid parameters
190
191	$strFileFrom = str_replace( "\\" , "/" , $strFileFrom );
192	$strFileTo = str_replace( "\\" , "/" , $strFileTo );
193
194	if( $booValidPath
195	&& ( ! is_dir( $strFileFrom ) \|\| ! is_dir( $strFileTo ) )
196	)
197	{
198	throw new InvalidArgumentException("Invalid parameter: strFileFrom: ".$strFileFrom." strFileTo: ".$strFileTo);
199	}
200
201	// special case: equal paths
202	if( $strFileFrom == $strFileTo )
203	{
204	$strReturnPath = './';
205	}
206	else
207	{
208	// explode parameters using '/'
209	$arrFileFrom = explode( '/', $strFileFrom );
210	$arrFileTo = explode( '/', $strFileTo );
211
212	// remove similar base folders
213	while(
214	current( $arrFileFrom ) == current( $arrFileTo )
215	&& count( $arrFileFrom ) > 0
216	)
217	{
218	array_shift( $arrFileFrom );
219	array_shift( $arrFileTo );
220	}
221
222	$arrReturnPath = array();
223
224	// make final address
225	foreach( $arrFileFrom as $strFolder )
226	{
227	if( $strFolder != "" ) {
228	$arrReturnPath[] = "..";
229	}
230	}
231
232	foreach( $arrFileTo as $strFolder )
233	{
234	$arrReturnPath[] = $strFolder;
235	}
236
237	$strReturnPath = implode( '/', $arrReturnPath );
238
239	}
240
241	return $strReturnPath;
242	}
243
244	}	157	}
245		158	?>
246	?>

components/loader/_start.php

Show contents

components/loader/Loader.class.php

Show contents

components/xmlSequence/_start.php Download diff

	90		91
8	* Load the XmlSequence package	8	* Load the XmlSequence package
9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>	9	* @author Thiago Henrique Ramos da Mata <thiago.henrique.mata@gmail.com>
10	*/	10	*/
11	require_once( 'XmlSequenceException.class.php' );	11	Loader::requireOnce( 'XmlSequenceException.class.php' , true );
12	require_once( 'XmlSequenceFactoryInterface.interface.php' );	12	Loader::requireOnce( 'XmlSequenceFactoryInterface.interface.php' , true );
13	require_once( 'XmlSequencePrinterInterface.interface.php' );	13	Loader::requireOnce( 'XmlSequencePrinterInterface.interface.php' , true );
14	require_once( 'XmlSequenceFactoryXml.class.php' );	14	Loader::requireOnce( 'XmlSequenceFactoryXml.class.php' , true );
15	require_once( 'XmlSequencePrinterXml.class.php' );	15	Loader::requireOnce( 'XmlSequencePrinterXml.class.php' , true );
16	require_once( 'XmlSequencePrinterDiagram.class.php' );	16	Loader::requireOnce( 'XmlSequencePrinterDiagram.class.php' , true );
17	require_once( 'XmlSequenceActor.class.php' );	17	Loader::requireOnce( 'XmlSequenceActor.class.php' , true );
18	require_once( 'XmlSequenceMessage.class.php' );	18	Loader::requireOnce( 'XmlSequenceMessage.class.php' , true );
19	require_once( 'XmlSequenceValue.class.php' );	19	Loader::requireOnce( 'XmlSequenceValue.class.php' , true );
20	require_once( 'XmlSequence.class.php' );	20	Loader::requireOnce( 'XmlSequence.class.php' , true );
21	?>	21	?>

components/xmlSequence/XmlSequence.class.php Download diff

	90		91
187	$this->arrActors[] = $objActor;	187	$this->arrActors[] = $objActor;
188	return $this;	188	return $this;
189	}	189	}
190
191	}	190	}
192		191	?>
193	?>

components/xmlSequence/XmlSequenceActor.class.php Download diff

	90		91
138	$this->strClassName = $strClassName;	138	$this->strClassName = $strClassName;
139	}	139	}
140	}	140	}
141
142	?>	141	?>

components/xmlSequence/XmlSequenceException.class.php Download diff

	90		91
13	{	13	{
14		14
15	}	15	}
16	?>	16	?>

components/xmlSequence/XmlSequenceFactoryInterface.interface.php Download diff

	90		91
40	* @see XmlSequenceFactoryInterface->perform()	40	* @see XmlSequenceFactoryInterface->perform()
41	* @return XmlSequence	41	* @return XmlSequence
42	*/	42	*/
43	public function perform();	43	public function perform();
44
45	}	44	}
46	?>	45	?>

components/xmlSequence/XmlSequenceFactoryXml.class.php Download diff

	90		91
187	$this->getXmlSequence()->setMessages( $arrMessages );	187	$this->getXmlSequence()->setMessages( $arrMessages );
188	}	188	}
189	}	189	}
190
191	?>	190	?>

components/xmlSequence/XmlSequenceMessage.class.php Download diff

	90		91
314	return( $this->objActorFrom->getId() == $this->objActorTo->getId() );	314	return( $this->objActorFrom->getId() == $this->objActorTo->getId() );
315	}	315	}
316	}	316	}
317	?>	317	?>

components/xmlSequence/XmlSequencePrinterDiagram.class.php Download diff

     {
         if( $this->objXmlSequence->getCallerPath() != null and $this->objXmlSequence->getPublicPath() != null )
         {
-            $strPublicPath = CorujaStringManipulation::getRelativePath( $this->objXmlSequence->getCallerPath(), $this->objXmlSequence->getPublicPath() );
+            $strPublicPath = CorujaFileManipulation::getRelativePath( $this->objXmlSequence->getCallerPath(), $this->objXmlSequence->getPublicPath() );
         }
+        elseif( $this->objXmlSequence->getCallerPath() == null and $this->objXmlSequence->getPublicPath() != null )
+        {
+            $strPublicPath = $this->objXmlSequence->getPublicPath();
+        }
         else
         {
             $strPublicPath = "./";

components/xmlSequence/XmlSequencePrinterXml.class.php Download diff

	90		91
160	}	160	}
161	$strXmlMessages .= "</messages>\n";	161	$strXmlMessages .= "</messages>\n";
162	return $strXmlMessages;	162	return $strXmlMessages;
163	}	163	}
164
165	}	164	}
166
167	?>	165	?>

components/xmlSequence/XmlSequenceValue.class.php Download diff

	90		91
76	return $this->strValue;	76	return $this->strValue;
77	}	77	}
78	}	78	}
79		79	?>
80	?>

public/codetodiagram.php Download diff

     $strPublicPath =str_replace( "\\" , "/" , str_replace( basename( __FILE__ ) , "" , __FILE__ ) );
     #2. Load the components of the code to diagram
-    require_once( $strPublicPath . '../components/_start.php' );
+    require_once( $strPublicPath . "../components/library/_start.php" );
+    require_once( $strPublicPath . "../components/loader/_start.php" );
+    Loader::requireOnce( $strPublicPath . '../components/_start.php' );
+//    exit();
+//    require_once( $strPublicPath . '../components/_start.php' );
     #3. redefine the error handler function to the code to diagram
     $strCallerPath = ( str_replace( basename( $strFile ) , "" , $strFile ) );
     #5. get the relative path of the code to diagram bootstrap
-    $strPathFile = CorujaStringManipulation::getRelativePath( $strCallerPath , $strPublicPath );
+    $strPathFile = CorujaFileManipulation::getRelativePath( $strCallerPath , $strPublicPath );
     #6. add a instance of the code to diagram bootstrap into the load files array for the recursive call
     CodeToDiagram::getInstance()->addFile( $strPathFile . basename( __FILE__ ) , basename( __FILE__ ) );

public/external.php

Show contents

Code to Diagram

Changeset 91

Affected files