Skip to content

Commit 305b7f5

Browse files
enumagenumag
committed
Update coding style
1 parent 5790c5e commit 305b7f5

File tree

15 files changed

+542
-554
lines changed

15 files changed

+542
-554
lines changed

‎src/Connector/Nette.php

Lines changed: 46 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the Arachne
55
*
66
* Copyright (c) Jáchym Toušek (enumag@gmail.com)
@@ -26,59 +26,57 @@
2626
*/
2727
class Nette extends Client
2828
{
29+
/** @var Container */
30+
protected $container;
2931

30-
/** @var Container */
31-
protected $container;
32-
33-
public function setContainer(Container $container)
34-
{
35-
$this->container = $container;
36-
}
37-
38-
/**
39-
* @param Request $request
40-
* @return Response
41-
*/
42-
public function doRequest($request)
43-
{
44-
$_COOKIE = $request->getCookies();
45-
$_SERVER = $request->getServer();
46-
$_FILES = $request->getFiles();
47-
48-
$_SERVER['REQUEST_METHOD'] = $method = strtoupper($request->getMethod());
49-
$_SERVER['REQUEST_URI'] = $uri = str_replace('http://localhost', '', $request->getUri());
50-
$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
32+
public function setContainer(Container $container)
33+
{
34+
$this->container = $container;
35+
}
5136

52-
if ($method === 'HEAD' || $method === 'GET') {
53-
$_GET = $request->getParameters();
54-
$_POST = [];
55-
} else {
56-
$_POST = $request->getParameters();
57-
$_GET = [];
58-
}
37+
/**
38+
* @param Request $request
39+
*
40+
* @return Response
41+
*/
42+
public function doRequest($request)
43+
{
44+
$_COOKIE = $request->getCookies();
45+
$_SERVER = $request->getServer();
46+
$_FILES = $request->getFiles();
5947

60-
$httpRequest = $this->container->getByType(IRequest::class);
61-
$httpResponse = $this->container->getByType(IResponse::class);
62-
if (!$httpRequest instanceof HttpRequest || !$httpResponse instanceof HttpResponse) {
63-
throw new Exception('Arachne\Codeception\DI\CodeceptionExtension is not used or conflicts with another extension.');
64-
}
65-
$httpRequest->reset();
66-
$httpResponse->reset();
48+
$_SERVER['REQUEST_METHOD'] = $method = strtoupper($request->getMethod());
49+
$_SERVER['REQUEST_URI'] = $uri = str_replace('http://localhost', '', $request->getUri());
50+
$_SERVER['REMOTE_ADDR'] = '127.0.0.1';
6751

68-
try {
69-
ob_start();
70-
$this->container->getByType(Application::class)->run();
71-
$content = ob_get_clean();
52+
if ($method === 'HEAD' || $method === 'GET') {
53+
$_GET = $request->getParameters();
54+
$_POST = [];
55+
} else {
56+
$_POST = $request->getParameters();
57+
$_GET = [];
58+
}
7259

73-
} catch (Exception $e) {
74-
ob_end_clean();
75-
throw $e;
76-
}
60+
$httpRequest = $this->container->getByType(IRequest::class);
61+
$httpResponse = $this->container->getByType(IResponse::class);
62+
if (!$httpRequest instanceof HttpRequest || !$httpResponse instanceof HttpResponse) {
63+
throw new Exception('Arachne\Codeception\DI\CodeceptionExtension is not used or conflicts with another extension.');
64+
}
65+
$httpRequest->reset();
66+
$httpResponse->reset();
7767

78-
$code = $httpResponse->getCode();
79-
$headers = $httpResponse->getHeaders();
68+
try {
69+
ob_start();
70+
$this->container->getByType(Application::class)->run();
71+
$content = ob_get_clean();
72+
} catch (Exception $e) {
73+
ob_end_clean();
74+
throw $e;
75+
}
8076

81-
return new Response($content, $code, $headers);
82-
}
77+
$code = $httpResponse->getCode();
78+
$headers = $httpResponse->getHeaders();
8379

80+
return new Response($content, $code, $headers);
81+
}
8482
}

‎src/Console/RunTestInput.php

Lines changed: 33 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the Arachne
55
*
66
* Copyright (c) Jáchym Toušek (enumag@gmail.com)
@@ -10,48 +10,46 @@
1010

1111
namespace Arachne\Codeception\Console;
1212

13-
use Symfony\Component\Console\Input\InputDefinition;
1413
use Symfony\Component\Console\Input\ArgvInput;
14+
use Symfony\Component\Console\Input\InputDefinition;
1515

1616
/**
17-
* Codeception run command input for Symfony console
17+
* Codeception run command input for Symfony console.
1818
*
1919
* This should only be used when debugging using xDebug and NetBeans (or different IDE).
2020
*
2121
* @author Jáchym Toušek <enumag@gmail.com>
2222
*/
2323
class RunTestInput extends ArgvInput
2424
{
25-
26-
public function __construct(InputDefinition $definition = null)
27-
{
28-
$parameters = [ $_SERVER['argv'][0], 'run' ];
29-
30-
if (isset($_SERVER['argv'][1])) {
31-
$filename = $this->normalizePath($_SERVER['argv'][1]);
32-
$cwd = $this->normalizePath(getcwd()) . '/';
33-
34-
// IDE always provides absolute path but Codeception only accepts relative path without leading "./".
35-
// If path is not absolute, make it that way and call realpath to remove "./".
36-
if (strpos($filename, $cwd) !== 0 && file_exists($cwd . $filename)) {
37-
$filename = $this->normalizePath(realpath($cwd . $filename));
38-
}
39-
40-
if (!file_exists($filename)) {
41-
echo 'File "' . $filename . '" could not be found.';
42-
exit;
43-
}
44-
45-
// Cut of the absolute part for Codeception.
46-
$parameters[] = substr($filename, strlen($cwd));
47-
}
48-
49-
parent::__construct($parameters, $definition);
50-
}
51-
52-
private function normalizePath($path)
53-
{
54-
return str_replace('\\', '/', $path);
55-
}
56-
25+
public function __construct(InputDefinition $definition = null)
26+
{
27+
$parameters = [$_SERVER['argv'][0], 'run'];
28+
29+
if (isset($_SERVER['argv'][1])) {
30+
$filename = $this->normalizePath($_SERVER['argv'][1]);
31+
$cwd = $this->normalizePath(getcwd()).'/';
32+
33+
// IDE always provides absolute path but Codeception only accepts relative path without leading "./".
34+
// If path is not absolute, make it that way and call realpath to remove "./".
35+
if (strpos($filename, $cwd) !== 0 && file_exists($cwd.$filename)) {
36+
$filename = $this->normalizePath(realpath($cwd.$filename));
37+
}
38+
39+
if (!file_exists($filename)) {
40+
echo 'File "'.$filename.'" could not be found.';
41+
exit;
42+
}
43+
44+
// Cut of the absolute part for Codeception.
45+
$parameters[] = substr($filename, strlen($cwd));
46+
}
47+
48+
parent::__construct($parameters, $definition);
49+
}
50+
51+
private function normalizePath($path)
52+
{
53+
return str_replace('\\', '/', $path);
54+
}
5755
}

‎src/DI/CodeceptionExtension.php

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
/**
3+
/*
44
* This file is part of the Arachne
55
*
66
* Copyright (c) Jáchym Toušek (enumag@gmail.com)
@@ -11,31 +11,28 @@
1111
namespace Arachne\Codeception\DI;
1212

1313
use Nette\DI\CompilerExtension;
14-
use Nette\Http\IResponse;
1514

1615
/**
1716
* @author Jáchym Toušek <enumag@gmail.com>
1817
*/
1918
class CodeceptionExtension extends CompilerExtension
2019
{
21-
22-
public function beforeCompile()
23-
{
24-
$builder = $this->getContainerBuilder();
25-
26-
$request = $builder->getByType('Nette\Http\IRequest') ?: 'httpRequest';
27-
if ($builder->hasDefinition($request)) {
28-
$builder->getDefinition($request)
29-
->setClass('Nette\Http\Request')
30-
->setFactory('Arachne\Codeception\Http\Request');
31-
}
32-
33-
$response = $builder->getByType('Nette\Http\IResponse') ?: 'httpResponse';
34-
if ($builder->hasDefinition($response)) {
35-
$builder->getDefinition($response)
36-
->setClass('Nette\Http\IResponse')
37-
->setFactory('Arachne\Codeception\Http\Response');
38-
}
39-
}
40-
20+
public function beforeCompile()
21+
{
22+
$builder = $this->getContainerBuilder();
23+
24+
$request = $builder->getByType('Nette\Http\IRequest') ?: 'httpRequest';
25+
if ($builder->hasDefinition($request)) {
26+
$builder->getDefinition($request)
27+
->setClass('Nette\Http\Request')
28+
->setFactory('Arachne\Codeception\Http\Request');
29+
}
30+
31+
$response = $builder->getByType('Nette\Http\IResponse') ?: 'httpResponse';
32+
if ($builder->hasDefinition($response)) {
33+
$builder->getDefinition($response)
34+
->setClass('Nette\Http\IResponse')
35+
->setFactory('Arachne\Codeception\Http\Response');
36+
}
37+
}
4138
}

0 commit comments

Comments
 (0)