Skip to content
Browse files

Merge pull request #56 from auraphp/revert-55-psr2-compliance

Revert "Fixes all PSR-2 compliance issues other than index.php view l…
  • Loading branch information...
2 parents 82cbfd9 + 5b2b209 commit 85f384082c3bca2fc3a5543ce09aff09fea239e1 @harikt harikt committed Sep 14, 2015
View
6 config/default.php
@@ -40,9 +40,8 @@
*/
$di->params['Aura\Framework\Cli\Factory']['forge'] = $di->getForge();
$cli_path = $system . DIRECTORY_SEPARATOR . 'package' . DIRECTORY_SEPARATOR .
- 'Aura.Framework' . DIRECTORY_SEPARATOR . 'cli' . DIRECTORY_SEPARATOR;
-$di->params['Aura\Framework\Cli\Factory']['map'][$cli_path . 'cache-classmap'] =
- 'Aura\Framework\Cli\CacheClassmap\Command';
+ 'Aura.Framework' . DIRECTORY_SEPARATOR . 'cli' . DIRECTORY_SEPARATOR;
+$di->params['Aura\Framework\Cli\Factory']['map'][$cli_path . 'cache-classmap'] = 'Aura\Framework\Cli\CacheClassmap\Command';
$di->params['Aura\Framework\Cli\Factory']['map'][$cli_path . 'cache-config'] = 'Aura\Framework\Cli\CacheConfig\Command';
$di->params['Aura\Framework\Cli\Factory']['map'][$cli_path . 'server'] = 'Aura\Framework\Cli\Server\Command';
@@ -138,3 +137,4 @@
*/
$di->params['Aura\View\HelperLocator']['registry']['assetHref'] = $di->lazyNew('Aura\Framework\View\Helper\AssetHref');
$di->params['Aura\View\HelperLocator']['registry']['route'] = $di->lazyNew('Aura\Framework\View\Helper\Route');
+
View
2 scripts/skelgen-bootstrap.php
@@ -1,5 +1,5 @@
<?php
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
// split the class into namespace parts
$parts = explode('\\', $class);
View
1 tests/Aura/Framework/Cli/AbstractCommandTest.php
@@ -1,6 +1,5 @@
<?php
namespace Aura\Framework\Cli;
-
use Aura\Cli\ExceptionFactory;
use Aura\Cli\Getopt;
use Aura\Cli\Stdio;
View
3 tests/Aura/Framework/Mock/Controller.php
@@ -3,8 +3,7 @@
use Aura\Web\Response;
-class Controller
-{
+class Controller {
public function __construct()
{
View
3 tests/Aura/Framework/Mock/NotFound.php
@@ -3,8 +3,7 @@
use Aura\Web\Response;
-class NotFound
-{
+class NotFound {
public function __construct()
{
View
2 tests/Aura/Framework/Mock/views/index.php
@@ -1 +1 @@
-mock view
+mock view
View
2 tests/Aura/Framework/SystemTest.php
@@ -30,7 +30,7 @@ public function testGetRootPath()
}
- public function testMagicToString()
+ public function test__toString()
{
$expect = $this->root;
$actual = (string) $this->system;
View
2 tests/Aura/Framework/View/Helper/RouteTest.php
@@ -19,7 +19,7 @@ protected function setUp()
$this->route = new Route($map);
}
- public function testMagicInvoke()
+ public function test__invoke()
{
$actual = $this->route->__invoke('mock', ['bar' => 'zim']);
$expect = '/foo/zim';
View
16 tests/Aura/Framework/Web/Controller/FrontTest.php
@@ -82,13 +82,13 @@ public function tearDown()
parent::tearDown();
}
- public function testMagicGet()
+ public function test__get()
{
$front = $this->newFront('/');
- $this->assertSame($this->signal, $front->signal);
- $this->assertSame($this->context, $front->context);
- $this->assertSame($this->router, $front->router);
- $this->assertSame($this->factory, $front->factory);
+ $this->assertSame($this->signal, $front->signal);
+ $this->assertSame($this->context, $front->context);
+ $this->assertSame($this->router, $front->router);
+ $this->assertSame($this->factory, $front->factory);
$this->assertSame($this->response, $front->response);
}
@@ -102,7 +102,7 @@ public function testExec()
$this->assertSame($expect, $actual);
}
- public function testExecIndexPhp()
+ public function testExec_indexPhp()
{
$front = $this->newFront('/index.php/mock');
$response = $front->exec();
@@ -112,7 +112,7 @@ public function testExecIndexPhp()
$this->assertSame($expect, $actual);
}
- public function testExecIndexPhpEmpty()
+ public function testExec_indexPhpEmpty()
{
$front = $this->newFront('/index.php');
$response = $front->exec();
@@ -122,7 +122,7 @@ public function testExecIndexPhpEmpty()
$this->assertSame($expect, $actual);
}
- public function testExecNotFound()
+ public function testExec_notFound()
{
$front = $this->newFront('/no-such-controller');
$response = $front->exec();
View
2 tests/Aura/Framework/Web/Renderer/AuraViewTwoStepTest.php
@@ -55,7 +55,7 @@ protected function setUp()
);
}
- public function testMagicCall()
+ public function test__call()
{
$this->renderer->addInnerPath('/foo/bar');
$dir = dirname(dirname(__DIR__));
View
2 tests/bootstrap.php
@@ -1,3 +1,3 @@
This package cannot be tested independently from an Aura system.
Please check out an Aura system and test it instead.
-<?php exit(0);
+<?php exit(0); ?>

0 comments on commit 85f3840

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