Skip to content
This repository has been archived by the owner on Dec 26, 2021. It is now read-only.

Commit

Permalink
prepare stable release 3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
llaville committed May 11, 2015
1 parent 1094db1 commit a01cee4
Show file tree
Hide file tree
Showing 13 changed files with 204 additions and 141 deletions.
4 changes: 2 additions & 2 deletions build/build.xml
Expand Up @@ -21,8 +21,8 @@
Project properties
======================================================================
-->
<property name="build.short-version" value="3.0" />
<property name="build.version" value="${build.short-version}.1" />
<property name="build.short-version" value="3.1" />
<property name="build.version" value="${build.short-version}.0" />

<!--
======================================================================
Expand Down
16 changes: 8 additions & 8 deletions docs/getting-started.asciidoc
Expand Up @@ -2,7 +2,7 @@
:description: How to download, configure and use it in a basic way.
include::revision.asciidoc[]
include::attributes.asciidoc[]
:pharstable: http://bartlett.laurent-laville.org/get/phpreflect-3.0.1.phar
:pharstable: http://bartlett.laurent-laville.org/get/phpreflect-3.1.0.phar


== Download
Expand All @@ -20,25 +20,25 @@ endif::basebackend-bootstrap[]
Make it executable, and put it into your `$PATH`.
[source,bash]
----
$ chmod +x phpreflect-3.0.1.phar
$ mv phpreflect-3.0.1.phar /usr/local/bin/phpreflect
$ chmod +x phpreflect-3.1.0.phar
$ mv phpreflect-3.1.0.phar /usr/local/bin/phpreflect
$ phpreflect --version
----

You can also immediately use the PHAR after you have downloaded it.
[source,bash]
----
$ wget http://bartlett.laurent-laville.org/get/phpreflect-3.0.1.phar
$ php phpreflect-3.0.1.phar --version
$ wget http://bartlett.laurent-laville.org/get/phpreflect-3.1.0.phar
$ php phpreflect-3.1.0.phar --version
----

With both methods then you have this output :

[role="output"]
====
----
phpReflect version 3.0.1
phpReflect version 3.1.0
----
====

Expand Down Expand Up @@ -178,10 +178,10 @@ endif::basebackend-docbook[]
upgrade to the new major version 2, and keep your old environment still running,
have a look on
ifdef::basebackend-html[]
link:migration-guide.html[migration's guide]
link:migration-guide-30.html[migration's guide]
endif::basebackend-html[]
ifdef::basebackend-docbook[]
xref:_migration_guide[]
xref:_migration_guide_30[]
endif::basebackend-docbook[]
************************************************
42 changes: 21 additions & 21 deletions docs/loc_analysis.out.asciidoc
@@ -1,21 +1,21 @@

Data Source Analysed

Directories 20
Files 73

Size
Lines of Code (LOC) 3620
Comment Lines of Code (CLOC) 137 (3.78%)
Non-Comment Lines of Code (NCLOC) 3483 (96.22%)
Logical Lines of Code (LLOC) 1194 (32.98%)
Classes 1115 (93.38%)
Average Class Length 17
Average Method Length 3
Functions 79 (6.62%)
Average Function Length 6
Not in classes or functions 0 (0.00%)

Complexity
Cyclomatic Complexity / LLOC 0.51
Cyclomatic Complexity / Number of Methods 2.72

Data Source Analysed

Directories 20
Files 72

Size
Lines of Code (LOC) 3721
Comment Lines of Code (CLOC) 136 (3.65%)
Non-Comment Lines of Code (NCLOC) 3585 (96.35%)
Logical Lines of Code (LLOC) 1196 (32.14%)
Classes 1116 (93.31%)
Average Class Length 17
Average Method Length 3
Functions 80 (6.69%)
Average Function Length 6
Not in classes or functions 0 (0.00%)

Complexity
Cyclomatic Complexity / LLOC 0.55
Cyclomatic Complexity / Number of Methods 2.88
61 changes: 30 additions & 31 deletions docs/loc_analysis.raw.asciidoc
Expand Up @@ -56,45 +56,44 @@ Array
[51] => /home/github/php-reflect/src/Bartlett/Reflect/Output/Diagram.php
[52] => /home/github/php-reflect/src/Bartlett/Reflect/Output/Plugin.php
[53] => /home/github/php-reflect/src/Bartlett/Reflect/Output/Reflection.php
[54] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NameResolver.php
[55] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NodeProcessor.php
[56] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NodeProcessorAbstract.php
[57] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/CacheAdapterInterface.php
[58] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/CacheStorageInterface.php
[59] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/DefaultCacheStorage.php
[60] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/DoctrineCacheAdapter.php
[61] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/CachePlugin.php
[62] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Log/DefaultLogger.php
[63] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/LogPlugin.php
[64] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Notifier/GrowlNotifier.php
[65] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Notifier/NotifierInterface.php
[66] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/NotifierPlugin.php
[67] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/PluginInterface.php
[68] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/PluginManager.php
[69] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/ProfilerPlugin.php
[70] => /home/github/php-reflect/src/Bartlett/Reflect/Tokenizer/DefaultTokenizer.php
[71] => /home/github/php-reflect/src/Bartlett/Reflect/Util/Timer.php
[72] => /home/github/php-reflect/src/Bartlett/Reflect.php
[54] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NodeProcessor.php
[55] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NodeProcessorAbstract.php
[56] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/CacheAdapterInterface.php
[57] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/CacheStorageInterface.php
[58] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/DefaultCacheStorage.php
[59] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/DoctrineCacheAdapter.php
[60] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/CachePlugin.php
[61] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Log/DefaultLogger.php
[62] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/LogPlugin.php
[63] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Notifier/GrowlNotifier.php
[64] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Notifier/NotifierInterface.php
[65] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/NotifierPlugin.php
[66] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/PluginInterface.php
[67] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/PluginManager.php
[68] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/ProfilerPlugin.php
[69] => /home/github/php-reflect/src/Bartlett/Reflect/Tokenizer/DefaultTokenizer.php
[70] => /home/github/php-reflect/src/Bartlett/Reflect/Util/Timer.php
[71] => /home/github/php-reflect/src/Bartlett/Reflect.php
)

[Bartlett\Reflect\Analyser\LocAnalyser] => Array
(
[llocClasses] => 1115
[llocClasses] => 1116
[llocByNoc] => 0
[llocByNom] => 0
[llocFunctions] => 79
[llocFunctions] => 80
[llocByNof] => 0
[llocGlobal] => 0
[classes] => 65
[functions] => 12
[methods] => 323
[cloc] => 137
[eloc] => 3117
[lloc] => 1194
[wloc] => 366
[loc] => 3620
[ccn] => 610
[ccnMethods] => 556
[classes] => 64
[functions] => 13
[methods] => 321
[cloc] => 136
[eloc] => 3207
[lloc] => 1196
[wloc] => 378
[loc] => 3721
[ccn] => 656
[ccnMethods] => 602
)

)
27 changes: 27 additions & 0 deletions docs/php_filters.asciidoc
@@ -0,0 +1,27 @@
<?php
$closure = function ($data) {
$filterOnKeys = array(
'namespaces',
'interfaces',
'traits',
'classes', 'abstractClasses', 'concreteClasses',
'functions', 'namedFunctions', 'anonymousFunctions',
'classConstants', 'globalConstants', 'magicConstants',
);

foreach ($data as $title => &$keys) {
if (strpos($title, 'StructureAnalyser') === false) {
continue;
}
// looking into Structure Analyser metrics only
foreach ($keys as $key => $val) {
if (!in_array($key, $filterOnKeys)) {
unset($keys[$key]); // "removed" unsolicited values
continue;
}
}
}
return $data;
};

return $closure;
8 changes: 4 additions & 4 deletions docs/revision.asciidoc
@@ -1,6 +1,6 @@
:revdate: 2015-04-16
:revnumber: 3.0.1
:revdate: 2015-05-11
:revnumber: 3.1.0
:deprecated: 2.6.3
:deprecatedPubDate: April 15, 2015
:stable: 3.0.1
:stablePubDate: April 16, 2015
:stable: 3.1.0
:stablePubDate: May 11, 2015
62 changes: 31 additions & 31 deletions docs/structure_analysis.out.asciidoc
@@ -1,31 +1,31 @@

Data Source Analysed

Directories 20
Files 73

Structure
Namespaces 20
Interfaces 8
Traits 0
Classes 65
Abstract Classes 6 (9.23%)
Concrete Classes 59 (90.77%)
Methods 295
Scope
Non-Static Methods 282 (95.59%)
Static Methods 13 (4.41%)
Visibility
Public Method 251 (85.08%)
Protected Method 34 (11.53%)
Private Method 10 (3.39%)
Functions 12
Named Functions 0 (0.00%)
Anonymous Functions 12 (100.00%)
Constants 22
Global Constants 0 (0.00%)
Magic Constants 3 (13.64%)
Class Constants 19 (86.36%)
Tests
Classes 0
Methods 0

Data Source Analysed

Directories 20
Files 72

Structure
Namespaces 20
Interfaces 8
Traits 0
Classes 64
Abstract Classes 6 (9.38%)
Concrete Classes 58 (90.62%)
Methods 293
Scope
Non-Static Methods 280 (95.56%)
Static Methods 13 (4.44%)
Visibility
Public Method 250 (85.32%)
Protected Method 34 (11.60%)
Private Method 9 (3.07%)
Functions 13
Named Functions 0 (0.00%)
Anonymous Functions 13 (100.00%)
Constants 22
Global Constants 0 (0.00%)
Magic Constants 3 (13.64%)
Class Constants 19 (86.36%)
Tests
Classes 0
Methods 0
53 changes: 26 additions & 27 deletions docs/structure_analysis.raw.asciidoc
Expand Up @@ -56,43 +56,42 @@ Array
[51] => /home/github/php-reflect/src/Bartlett/Reflect/Output/Diagram.php
[52] => /home/github/php-reflect/src/Bartlett/Reflect/Output/Plugin.php
[53] => /home/github/php-reflect/src/Bartlett/Reflect/Output/Reflection.php
[54] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NameResolver.php
[55] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NodeProcessor.php
[56] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NodeProcessorAbstract.php
[57] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/CacheAdapterInterface.php
[58] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/CacheStorageInterface.php
[59] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/DefaultCacheStorage.php
[60] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/DoctrineCacheAdapter.php
[61] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/CachePlugin.php
[62] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Log/DefaultLogger.php
[63] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/LogPlugin.php
[64] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Notifier/GrowlNotifier.php
[65] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Notifier/NotifierInterface.php
[66] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/NotifierPlugin.php
[67] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/PluginInterface.php
[68] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/PluginManager.php
[69] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/ProfilerPlugin.php
[70] => /home/github/php-reflect/src/Bartlett/Reflect/Tokenizer/DefaultTokenizer.php
[71] => /home/github/php-reflect/src/Bartlett/Reflect/Util/Timer.php
[72] => /home/github/php-reflect/src/Bartlett/Reflect.php
[54] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NodeProcessor.php
[55] => /home/github/php-reflect/src/Bartlett/Reflect/PhpParser/NodeProcessorAbstract.php
[56] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/CacheAdapterInterface.php
[57] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/CacheStorageInterface.php
[58] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/DefaultCacheStorage.php
[59] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Cache/DoctrineCacheAdapter.php
[60] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/CachePlugin.php
[61] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Log/DefaultLogger.php
[62] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/LogPlugin.php
[63] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Notifier/GrowlNotifier.php
[64] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/Notifier/NotifierInterface.php
[65] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/NotifierPlugin.php
[66] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/PluginInterface.php
[67] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/PluginManager.php
[68] => /home/github/php-reflect/src/Bartlett/Reflect/Plugin/ProfilerPlugin.php
[69] => /home/github/php-reflect/src/Bartlett/Reflect/Tokenizer/DefaultTokenizer.php
[70] => /home/github/php-reflect/src/Bartlett/Reflect/Util/Timer.php
[71] => /home/github/php-reflect/src/Bartlett/Reflect.php
)

[Bartlett\Reflect\Analyser\StructureAnalyser] => Array
(
[namespaces] => 20
[interfaces] => 8
[traits] => 0
[classes] => 65
[classes] => 64
[abstractClasses] => 6
[concreteClasses] => 59
[functions] => 12
[concreteClasses] => 58
[functions] => 13
[namedFunctions] => 0
[anonymousFunctions] => 12
[methods] => 295
[publicMethods] => 251
[anonymousFunctions] => 13
[methods] => 293
[publicMethods] => 250
[protectedMethods] => 34
[privateMethods] => 10
[nonStaticMethods] => 282
[privateMethods] => 9
[nonStaticMethods] => 280
[staticMethods] => 13
[constants] => 0
[classConstants] => 19
Expand Down
20 changes: 20 additions & 0 deletions docs/structure_analysis_filtered.out.asciidoc
@@ -0,0 +1,20 @@

Data Source Analysed

Directories 20
Files 72

Structure
Namespaces 20
Interfaces 8
Traits 0
Classes 64
Abstract Classes 6 (9.38%)
Concrete Classes 58 (90.62%)
Functions 13
Named Functions 0 (0.00%)
Anonymous Functions 13 (100.00%)
Constants 22
Global Constants 0 (0.00%)
Magic Constants 3 (13.64%)
Class Constants 19 (86.36%)

11 comments on commit a01cee4

@GrahamCampbell
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this on the 3.0 branch?

@llaville
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because I've in mind to merge source code in master branch but only at the end of this year. Due to LTS for 2.6 that end in December 2015

And I don't think it really necessary to create a new branch for major version 3.x

@llaville
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GrahamCampbell I'll probably not wait end of this year and put major 3.x code on master branch.
But to keep LTS, I'll create a branch 2.6 for legacy code
No date planned for this operation.

BTW, php-reflect 3 is not suppose to evoluate as v2, due to its new architecture. And php-compatinfo may be evolved without php-reflect (or almost)

@GrahamCampbell
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pushing this to a branch called 3.0 means that people using 3.0.*@dev are actually getting 3.1 code...

@GrahamCampbell
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is surely wrong.

@GrahamCampbell
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 3.0 branch should be renamed to 3.1.

@llaville
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, probably. Naming it 3.0 was a bad idea at origin, but I don't think at least to reached the 3.1 before end of LTS for 2.6 ;-)

@llaville
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3.0 is compatible with 3.1 (that will add a filter feature: more details will come soon on the blog project)

@GrahamCampbell
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3.0 is compatible with 3.1 (that will add a filter feature: more details will come soon on the blog project)

That doesn't matter at all. You are literally saying that 3.1 is 3.0, which is total rubbish.

@llaville
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So I'll merge the 3.0 branch into master tomorrow, and removed it.

@llaville
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll have the same problem with CompatInfo 4.0 branch.
Branches maintenance will be applied tomorrow (I've no time to it before)

Please sign in to comment.