Skip to content

Rename class to ProxyDetection #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2018
Merged

Rename class to ProxyDetection #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ In Slim 3:

```php
$trustedProxies = ['10.0.0.1', '10.0.0.2'];
$app->add(new RKA\Middleware\SchemeAndHost($trustedProxies));
$app->add(new RKA\Middleware\ProxyDetection($trustedProxies));

$app->get('/', function ($request, $response, $args) {
$scheme = $request->getUri()->getScheme();
Expand Down
2 changes: 1 addition & 1 deletion src/SchemeAndHost.php → src/ProxyDetection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Message\UriInterface;

class SchemeAndHost
class ProxyDetection
{
/**
* List of trusted proxy IP addresses
Expand Down
14 changes: 7 additions & 7 deletions tests/SchemeAndHostTest.php → tests/ProxyDetectionTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?php
namespace RKA\Middleware\Test;

use RKA\Middleware\SchemeAndHost;
use RKA\Middleware\ProxyDetection;
use Zend\Diactoros\ServerRequestFactory;
use Zend\Diactoros\Response;

class SchemeAndHostTest extends \PHPUnit_Framework_TestCase
class ProxyDetectionTest extends \PHPUnit_Framework_TestCase
{
public function testSchemeAndHostAndPortWithPortInHostHeader()
{
Expand All @@ -18,7 +18,7 @@ public function testSchemeAndHostAndPortWithPortInHostHeader()

$response = new Response();

$middleware = new SchemeAndHost();
$middleware = new ProxyDetection();
$middleware($request, $response, function ($request, $response) use (&$scheme, &$host, &$port) {
// simply store the values
$scheme = $request->getUri()->getScheme();
Expand All @@ -44,7 +44,7 @@ public function testSchemeAndHostAndPortWithPortInPortHeader()

$response = new Response();

$middleware = new SchemeAndHost();
$middleware = new ProxyDetection();
$middleware($request, $response, function ($request, $response) use (&$scheme, &$host, &$port) {
// simply store the values
$scheme = $request->getUri()->getScheme();
Expand All @@ -70,7 +70,7 @@ public function testSchemeAndHostAndPortWithPortInHostAndPortHeader()

$response = new Response();

$middleware = new SchemeAndHost();
$middleware = new ProxyDetection();
$middleware($request, $response, function ($request, $response) use (&$scheme, &$host, &$port) {
// simply store the values
$scheme = $request->getUri()->getScheme();
Expand All @@ -95,7 +95,7 @@ public function testTrustedProxies()

$response = new Response();

$middleware = new SchemeAndHost(['192.168.0.1']);
$middleware = new ProxyDetection(['192.168.0.1']);
$middleware($request, $response, function ($request, $response) use (&$scheme, &$host, &$port) {
// simply store the values
$scheme = $request->getUri()->getScheme();
Expand All @@ -119,7 +119,7 @@ public function testNonTrustedProxies()

$response = new Response();

$middleware = new SchemeAndHost(['192.168.0.1']);
$middleware = new ProxyDetection(['192.168.0.1']);
$middleware($request, $response, function ($request, $response) use (&$scheme, &$host, &$port) {
// simply store the values
$scheme = $request->getUri()->getScheme();
Expand Down