Permalink
Browse files

Merge branch 'release-0.6.1'

  • Loading branch information...
2 parents 8bdcc2b + 728f60f commit 141e9788f1a4c8c45e84b34817116b2db5c90203 @trq trq committed Aug 8, 2012
Showing with 6,484 additions and 594 deletions.
  1. +1 −0 .gitignore
  2. +0 −3 .gitmodules
  3. +12 −5 Phakefile
  4. +11 −15 README.md
  5. +5 −2 composer.json
  6. +153 −0 docs/Makefile
  7. BIN docs/_build/doctrees/environment.pickle
  8. BIN docs/_build/doctrees/index.doctree
  9. +4 −0 docs/_build/html/.buildinfo
  10. +22 −0 docs/_build/html/_sources/index.txt
  11. BIN docs/_build/html/_static/ajax-loader.gif
  12. +540 −0 docs/_build/html/_static/basic.css
  13. BIN docs/_build/html/_static/comment-bright.png
  14. BIN docs/_build/html/_static/comment-close.png
  15. BIN docs/_build/html/_static/comment.png
  16. +256 −0 docs/_build/html/_static/default.css
  17. +247 −0 docs/_build/html/_static/doctools.js
  18. BIN docs/_build/html/_static/down-pressed.png
  19. BIN docs/_build/html/_static/down.png
  20. BIN docs/_build/html/_static/file.png
  21. +154 −0 docs/_build/html/_static/jquery.js
  22. BIN docs/_build/html/_static/minus.png
  23. BIN docs/_build/html/_static/plus.png
  24. +62 −0 docs/_build/html/_static/pygments.css
  25. +560 −0 docs/_build/html/_static/searchtools.js
  26. +151 −0 docs/_build/html/_static/sidebar.js
  27. +23 −0 docs/_build/html/_static/underscore.js
  28. BIN docs/_build/html/_static/up-pressed.png
  29. BIN docs/_build/html/_static/up.png
  30. +808 −0 docs/_build/html/_static/websupport.js
  31. +95 −0 docs/_build/html/genindex.html
  32. +113 −0 docs/_build/html/index.html
  33. BIN docs/_build/html/objects.inv
  34. +99 −0 docs/_build/html/search.html
  35. +1 −0 docs/_build/html/searchindex.js
  36. +242 −0 docs/conf.py
  37. +22 −0 docs/index.rst
  38. +18 −43 lib/Proem/Api/Bootstrap/Filter/Event/Dispatch.php
  39. +18 −43 lib/Proem/Api/Bootstrap/Filter/Event/Request.php
  40. +19 −44 lib/Proem/Api/Bootstrap/Filter/Event/Response.php
  41. +35 −53 lib/Proem/Api/Bootstrap/Filter/Event/Route.php
  42. +20 −10 lib/Proem/Api/Controller/Standard.php
  43. +4 −8 lib/Proem/Api/Controller/Template.php
  44. +39 −36 lib/Proem/Api/Dispatch/Stage.php
  45. +3 −6 lib/Proem/Api/Dispatch/Standard.php
  46. +7 −2 lib/Proem/Api/Filter/Manager/Standard.php
  47. +3 −1 lib/Proem/Api/Filter/Manager/Template.php
  48. +2 −2 lib/Proem/Api/IO/Request/Http/Standard.php
  49. +1 −1 lib/Proem/Api/IO/Request/Template.php
  50. +12 −7 lib/Proem/Api/IO/Response/Http/Standard.php
  51. +49 −35 lib/Proem/Api/Proem.php
  52. +40 −15 lib/Proem/Api/Routing/Route/Generic.php
  53. +19 −14 lib/Proem/Api/Routing/Route/Standard.php
  54. +66 −0 lib/Proem/Api/Routing/Route/StaticRoute.php
  55. +11 −2 lib/Proem/Api/Routing/Route/Template.php
  56. +13 −10 lib/Proem/Api/Routing/Router/Standard.php
  57. +1 −2 lib/Proem/Api/Routing/Router/Template.php
  58. +43 −0 lib/Proem/Api/Routing/Signal/Event/RouteDispatch.php
  59. +1 −1 lib/Proem/Api/Routing/Signal/Event/RouteExhausted.php
  60. +8 −0 lib/Proem/Api/Service/Asset/Standard.php
  61. +5 −0 lib/Proem/Api/Service/Asset/Template.php
  62. +23 −0 lib/Proem/Api/Service/Manager/Standard.php
  63. +17 −0 lib/Proem/Api/Service/Manager/Template.php
  64. +19 −42 lib/Proem/Api/Signal/Event/Standard.php
  65. +12 −26 lib/Proem/Api/Signal/Event/Template.php
  66. +39 −79 lib/Proem/Api/Signal/Manager/Standard.php
  67. +7 −3 lib/Proem/Api/Signal/Manager/Template.php
  68. +128 −63 lib/Proem/Api/Util/Opt/Option.php
  69. +5 −1 lib/Proem/Api/Util/Opt/Options.php
  70. +6 −10 lib/Proem/Api/Util/Storage/KeyValStore.php
  71. +45 −9 lib/Proem/Autoloader.php
  72. +0 −1 tests
  73. +11 −0 tests/bootstrap.php
  74. +83 −0 tests/lib/Proem/Tests/AutoloaderTest.php
  75. +70 −0 tests/lib/Proem/Tests/ControllerTest.php
  76. +16 −0 tests/lib/Proem/Tests/Ext/Fixtures/MyApp/Module/Foo.php
  77. +64 −0 tests/lib/Proem/Tests/ExtTest.php
  78. +77 −0 tests/lib/Proem/Tests/FilterTest.php
  79. +23 −0 tests/lib/Proem/Tests/Fixtures/Controller/Bar.php
  80. +11 −0 tests/lib/Proem/Tests/Fixtures/Controller/Foo.php
  81. +30 −0 tests/lib/Proem/Tests/Fixtures/Namespaced/Bar.php
  82. +35 −0 tests/lib/Proem/Tests/Fixtures/Namespaced/Boo.php
  83. +30 −0 tests/lib/Proem/Tests/Fixtures/Namespaced/Foo.php
  84. +28 −0 tests/lib/Proem/Tests/Fixtures/Pear/Bar.php
  85. +28 −0 tests/lib/Proem/Tests/Fixtures/Pear/Foo.php
  86. +54 −0 tests/lib/Proem/Tests/Fixtures/Proem/Ext/Plugin/Foo.php
  87. +11 −0 tests/lib/Proem/Tests/Fixtures/Proem/Proem.php
  88. +35 −0 tests/lib/Proem/Tests/Fixtures/Proem/Service/Asset/Bar.php
  89. +58 −0 tests/lib/Proem/Tests/Fixtures/Proem/Service/Asset/Foo.php
  90. +73 −0 tests/lib/Proem/Tests/IO/Http/FakeRequestTest.php
  91. +64 −0 tests/lib/Proem/Tests/IO/Http/ResponseTest.php
  92. +35 −0 tests/lib/Proem/Tests/Override/Namespaced/Boo.php
  93. +114 −0 tests/lib/Proem/Tests/ProemTest.php
  94. +117 −0 tests/lib/Proem/Tests/Routing/RouterTest.php
  95. +120 −0 tests/lib/Proem/Tests/Routing/StandardRouteTest.php
  96. +214 −0 tests/lib/Proem/Tests/ServiceTest.php
  97. +124 −0 tests/lib/Proem/Tests/SignalTest.php
  98. +242 −0 tests/lib/Proem/Tests/Util/OptTest.php
  99. +72 −0 tests/lib/Proem/Tests/Util/Options/Fixtures/OptionsFixture.php
  100. +59 −0 tests/lib/Proem/Tests/Util/Options/Fixtures/OptionsFixture2.php
  101. +54 −0 tests/lib/Proem/Tests/Util/Options/Fixtures/OptionsFixture3.php
  102. +31 −0 tests/lib/Proem/Tests/Util/Options/Fixtures/ProemFixture.php
  103. +74 −0 tests/lib/Proem/Tests/Util/ProcessTest.php
  104. +54 −0 tests/lib/Proem/Tests/Util/StorageTest.php
  105. +35 −0 tests/phar-test.php
  106. +19 −0 tests/phpunit.xml
View
@@ -1,3 +1,4 @@
build
tests/log/*
+tests/coverage
vendor
View
@@ -1,3 +0,0 @@
-[submodule "tests"]
- path = tests
- url = git://github.com/proem/proem-test-suite.git
View
@@ -3,7 +3,7 @@
require_once 'lib/Proem/Autoloader.php';
(new \Proem\Autoloader)
- ->registerNamespace('Proem', 'lib')
+ ->attachNamespace('Proem', 'lib')
->register();
group('proem', function() {
@@ -17,10 +17,17 @@ group('dev', function() {
desc('Run the unit tests');
task('tests', function($args) {
+ $report = ' ';
+ if (isset($args['coverage'])) {
+ if (!is_dir('tests/coverage')) {
+ mkdir('tests/coverage');
+ }
+ $report = ' --coverage-html tests/coverage ';
+ }
if (isset($args['verbose'])) {
- system('phpunit --colors --debug --verbose --configuration tests/phpunit.xml');
+ system('vendor/bin/phpunit' . $report . '--colors --debug --verbose --configuration tests/phpunit.xml');
} else {
- system('phpunit --colors --configuration tests/phpunit.xml');
+ system('vendor/bin/phpunit' . $report . '--colors --configuration tests/phpunit.xml');
}
});
@@ -35,13 +42,13 @@ group('dev', function() {
$phar->setStub("<?php
Phar::mapPhar('proem.phar');
require_once 'phar://proem.phar/Proem/Autoloader.php';
- (new Proem\Autoloader())->registerNamespaces(['Proem' => 'phar://proem.phar'])->register();
+ (new Proem\Autoloader())->attachNamespaces(['Proem' => 'phar://proem.phar'])->register();
__HALT_COMPILER();
?>");
rename('proem.phar', '../build/proem.phar');
chdir('../');
if (isset($args['runtests'])) {
- system('phpunit --colors tests/phar-test.php');
+ system('vendor/bin/phpunit --colors tests/phar-test.php');
}
});
View
@@ -18,25 +18,21 @@ The main objective here is to create a lightweight, simple & fast MVC implementa
## INSTALLATION
-Installation is simple. Place the root Proem directory wherever you like and insure that the
-lib directory is on php's include_path. That's it !
+http://proemframework.org/docs/installation.html
+
+## DOCUMENTATION
+
+http://proemframework.org/docs
## CONTRIBUTING
-We have made available a PHP5.4 sandbox for users wishing to contibute to the project. Becuase PHP5.4 is still in release cadidate stages and is as yet not marked stable and probably wont be popular for a little while to come yet, any users wishing to contribute might not be able to get there hands on a PHP5.4 install.
-If you are serious about helping out but don't have access to PHP5.4 please get in contact. I can set you up shell access to our sandbox and you can start contributing today.
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Added some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
-#### Feeds & IRC
+## FEEDS & IRC
Proem now has a dedicated twitter feed http://twitter.com/proem which will automatically post any commits as well as news. If you plan on helping out, you should follow this.
Also available now is an irc channel (#proem) on freenode. Join if you have any questions.
-
-#### Committing and Pull Requests
-
-If you wish to contribute code to Proem please make sure you check out the [Issue Tracker](https://proemframework.atlassian.net).
-
-Next, [create an account on Github](https://github.com/signup/free) (if you haven't done so already).
-
-Create a fork of the [Proem Github project](http://github.com/proem/proem) ([More details on forking](http://help.github.com/forking/)).
-
-We (I) follow the git-flow branching model as described by nvie [here](http://nvie.com/posts/a-successful-git-branching-model).
View
@@ -12,8 +12,11 @@
"homepage": "http://thorpesystems.com"
}
],
+ "require": {
+ "php": ">=5.4.0"
+ },
"require-dev": {
- "php": ">=5.4.0",
- "jaz303/phake": "dev-master"
+ "jaz303/phake": "dev-master",
+ "EHER/PHPUnit": ">=1.6"
}
}
View
@@ -0,0 +1,153 @@
+# Makefile for Sphinx documentation
+#
+
+# You can set these variables from the command line.
+SPHINXOPTS =
+SPHINXBUILD = sphinx-build
+PAPER =
+BUILDDIR = _build
+
+# Internal variables.
+PAPEROPT_a4 = -D latex_paper_size=a4
+PAPEROPT_letter = -D latex_paper_size=letter
+ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+# the i18n builder cannot share the environment and doctrees with the others
+I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+
+.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+
+help:
+ @echo "Please use \`make <target>' where <target> is one of"
+ @echo " html to make standalone HTML files"
+ @echo " dirhtml to make HTML files named index.html in directories"
+ @echo " singlehtml to make a single large HTML file"
+ @echo " pickle to make pickle files"
+ @echo " json to make JSON files"
+ @echo " htmlhelp to make HTML files and a HTML help project"
+ @echo " qthelp to make HTML files and a qthelp project"
+ @echo " devhelp to make HTML files and a Devhelp project"
+ @echo " epub to make an epub"
+ @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
+ @echo " latexpdf to make LaTeX files and run them through pdflatex"
+ @echo " text to make text files"
+ @echo " man to make manual pages"
+ @echo " texinfo to make Texinfo files"
+ @echo " info to make Texinfo files and run them through makeinfo"
+ @echo " gettext to make PO message catalogs"
+ @echo " changes to make an overview of all changed/added/deprecated items"
+ @echo " linkcheck to check all external links for integrity"
+ @echo " doctest to run all doctests embedded in the documentation (if enabled)"
+
+clean:
+ -rm -rf $(BUILDDIR)/*
+
+html:
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+dirhtml:
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+singlehtml:
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+pickle:
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+json:
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+htmlhelp:
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+qthelp:
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+ ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
+ @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/ProemFramework.qhcp"
+ @echo "To view the help file:"
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/ProemFramework.qhc"
+
+devhelp:
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+ @echo "To view the help file:"
+ @echo "# mkdir -p $$HOME/.local/share/devhelp/ProemFramework"
+ @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/ProemFramework"
+ @echo "# devhelp"
+
+epub:
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+latex:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+ @echo "Run \`make' in that directory to run these through (pdf)latex" \
+ "(use \`make latexpdf' here to do that automatically)."
+
+latexpdf:
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+text:
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+man:
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+texinfo:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo
+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+ @echo "Run \`make' in that directory to run these through makeinfo" \
+ "(use \`make info' here to do that automatically)."
+
+info:
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo "Running Texinfo files through makeinfo..."
+ make -C $(BUILDDIR)/texinfo info
+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+gettext:
+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+ @echo
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+changes:
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+linkcheck:
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+doctest:
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,4 @@
+# Sphinx build info version 1
+# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
+config: dba6bef33fac8b72f05a66ea2464885c
+tags: fbb0d17656682115ca4d033fb2f83ba1
@@ -0,0 +1,22 @@
+.. Proem Framework documentation master file, created by
+ sphinx-quickstart on Mon Aug 6 21:42:28 2012.
+ You can adapt this file completely to your liking, but it should at least
+ contain the root `toctree` directive.
+
+Welcome to Proem Framework's documentation!
+===========================================
+
+Contents:
+
+.. toctree::
+ :maxdepth: 2
+
+
+
+Indices and tables
+==================
+
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
+
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 141e978

Please sign in to comment.