Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'release-0.4.0'

  • Loading branch information...
commit 8bdcc2b8bc137597ce291b7a212aee49fc05816a 2 parents 47d9829 + e9621ef
@trq trq authored
View
3  .gitmodules
@@ -0,0 +1,3 @@
+[submodule "tests"]
+ path = tests
+ url = git://github.com/proem/proem-test-suite.git
View
2  .travis.yml
@@ -3,7 +3,7 @@ language: php
php:
- 5.4
-before_install: curl -s http://getcomposer.org/installer | php -- && php composer.phar install --dev
+before_script: curl -s http://getcomposer.org/installer | php -- && php composer.phar install --dev
script: ./vendor/bin/phake dev:tests
notifications:
View
17 Phakefile
@@ -1,13 +1,26 @@
<?php
+require_once 'lib/Proem/Autoloader.php';
+
+(new \Proem\Autoloader)
+ ->registerNamespace('Proem', 'lib')
+ ->register();
+
+group('proem', function() {
+ desc('Get curreent version of proem');
+ task('version', function() {
+ echo Proem\Proem::VERSION . "\n";
+ });
+});
+
group('dev', function() {
desc('Run the unit tests');
task('tests', function($args) {
if (isset($args['verbose'])) {
- system('phpunit --colors --debug --verbose --configuration vendor/proem/proem-test-suite/phpunit.xml');
+ system('phpunit --colors --debug --verbose --configuration tests/phpunit.xml');
} else {
- system('phpunit --colors --configuration vendor/proem/proem-test-suite/phpunit.xml');
+ system('phpunit --colors --configuration tests/phpunit.xml');
}
});
View
3  composer.json
@@ -14,7 +14,6 @@
],
"require-dev": {
"php": ">=5.4.0",
- "jaz303/phake": "dev-master",
- "proem/proem-test-suite": "dev-develop"
+ "jaz303/phake": "dev-master"
}
}
View
13 lib/Proem/Api/Bootstrap/Filter/Event/Route.php
@@ -106,10 +106,10 @@ public function inBound(Manager $assets)
])
)
->map(
- 'default-nomodule-controller',
+ 'default-nomodule-controller-action',
new StandardRoute([
- 'rule' => '/:controller',
- 'targets' => ['module' => 'index', 'action' => 'index']
+ 'rule' => '/:controller/:action',
+ 'targets' => ['module' => 'index']
])
)
->map(
@@ -120,6 +120,13 @@ public function inBound(Manager $assets)
])
)
->map(
+ 'default-nomodule-controller',
+ new StandardRoute([
+ 'rule' => '/:controller',
+ 'targets' => ['module' => 'index', 'action' => 'index']
+ ])
+ )
+ ->map(
'default-params',
new StandardRoute([
'rule' => '/:params',
View
4 lib/Proem/Api/Proem.php
@@ -45,14 +45,14 @@
/**
* The Proem boostrap wrapper
*
- * Responsible for aiding in the boostrap process
+ * Responsible for aiding in the bootstrap process
*/
class Proem
{
/**
* Store the framework version
*/
- const VERSION = '0.3.1';
+ const VERSION = '0.4.0';
/**
* Store events
View
2  lib/Proem/Api/Service/Asset/Standard.php
@@ -123,7 +123,7 @@ public function __set($index, $value) {
* @param array $params
* @return Proem\Api\Service\Asset\Template
*/
- public function setParams(Array $params)
+ public function setParams(array $params)
{
$this->params = array_merge($this->params, $params);
return $this;
1  tests
@@ -0,0 +1 @@
+Subproject commit f92bc629a17b12f3651ffe28dad0afcfceb05a98

0 comments on commit 8bdcc2b

Please sign in to comment.
Something went wrong with that request. Please try again.