Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ All notable changes to this project will be documented in this file, in reverse

### Deprecated

- Nothing.
- `Zend\Http\Request::getHeader()` is deprecated
- `Zend\Http\Request::getHeaders()` with arguments is deprecated
- `Zend\Http\Request::getQuery()` with arguments is deprecated
- `Zend\Http\Request::getPost()` with arguments is deprecated
- `Zend\Http\Request::getFiles()` with arguments is deprecated

### Removed

Expand Down
30 changes: 30 additions & 0 deletions src/Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,11 @@ public function getQuery($name = null, $default = null)
return $this->queryParams;
}

trigger_error(
'Getting specific query parameter is deprecated',
E_USER_DEPRECATED
);

return $this->queryParams->get($name, $default);
}

Expand Down Expand Up @@ -307,6 +312,11 @@ public function getPost($name = null, $default = null)
return $this->postParams;
}

trigger_error(
'Getting specific post parameter is deprecated',
E_USER_DEPRECATED
);

return $this->postParams->get($name, $default);
}

Expand Down Expand Up @@ -351,6 +361,11 @@ public function getFiles($name = null, $default = null)
return $this->fileParams;
}

trigger_error(
'Getting specific file parameter is deprecated',
E_USER_DEPRECATED
);

return $this->fileParams->get($name, $default);
}

Expand All @@ -373,6 +388,11 @@ public function getHeaders($name = null, $default = false)
return $this->headers;
}

trigger_error(
'Getting specific header is deprecated',
E_USER_DEPRECATED
);

if ($this->headers->has($name)) {
return $this->headers->get($name);
}
Expand All @@ -390,6 +410,16 @@ public function getHeaders($name = null, $default = false)
*/
public function getHeader($name, $default = false)
{
trigger_error(
sprintf(
'%s::%s is deprecated Please get it from %s::getHeaders().',
__CLASS__,
__METHOD__,
__CLASS__
),
E_USER_DEPRECATED
);

return $this->getHeaders($name, $default);
}

Expand Down
10 changes: 10 additions & 0 deletions test/PhpEnvironment/RequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ public function tearDown()
$_SERVER = $this->originalEnvironment['server'];
$_ENV = $this->originalEnvironment['env'];
$_FILES = $this->originalEnvironment['files'];

\error_reporting(E_ALL);
}

/**
Expand Down Expand Up @@ -699,13 +701,16 @@ public function testParameterRetrievalDefaultValue()
$request->setEnv($p);

$default = 15;

\error_reporting(E_ALL ^ \E_USER_DEPRECATED);
$this->assertSame($default, $request->getQuery('baz', $default));
$this->assertSame($default, $request->getPost('baz', $default));
$this->assertSame($default, $request->getFiles('baz', $default));
$this->assertSame($default, $request->getServer('baz', $default));
$this->assertSame($default, $request->getEnv('baz', $default));
$this->assertSame($default, $request->getHeaders('baz', $default));
$this->assertSame($default, $request->getHeader('baz', $default));
\error_reporting(E_ALL);
}

public function testRetrievingASingleValueForParameters()
Expand All @@ -720,11 +725,13 @@ public function testRetrievingASingleValueForParameters()
$request->setServer($p);
$request->setEnv($p);

\error_reporting(E_ALL ^ \E_USER_DEPRECATED);
$this->assertSame('bar', $request->getQuery('foo'));
$this->assertSame('bar', $request->getPost('foo'));
$this->assertSame('bar', $request->getFiles('foo'));
$this->assertSame('bar', $request->getServer('foo'));
$this->assertSame('bar', $request->getEnv('foo'));
\error_reporting(E_ALL);

$headers = new Headers();
$h = new GenericHeader('foo', 'bar');
Expand All @@ -733,7 +740,10 @@ public function testRetrievingASingleValueForParameters()
$request->setHeaders($headers);
$this->assertSame($headers, $request->getHeaders());
$this->assertSame($h, $request->getHeaders()->get('foo'));

\error_reporting(E_ALL ^ \E_USER_DEPRECATED);
$this->assertSame($h, $request->getHeader('foo'));
\error_reporting(E_ALL);
}

/**
Expand Down
21 changes: 21 additions & 0 deletions test/RequestTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,13 @@

class RequestTest extends TestCase
{
protected function tearDown()
{
parent::tearDown();

\error_reporting(E_ALL);
}

public function testRequestFromStringFactoryCreatesValidRequest()
{
$string = "GET /foo?myparam=myvalue HTTP/1.1\r\n\r\nSome Content";
Expand Down Expand Up @@ -67,9 +74,11 @@ public function testRetrievingASingleValueForParameters()
$request->setPost($p);
$request->setFiles($p);

\error_reporting(E_ALL ^ \E_USER_DEPRECATED);
$this->assertSame('bar', $request->getQuery('foo'));
$this->assertSame('bar', $request->getPost('foo'));
$this->assertSame('bar', $request->getFiles('foo'));
\error_reporting(E_ALL);

$headers = new Headers();
$h = new GenericHeader('foo', 'bar');
Expand All @@ -78,7 +87,10 @@ public function testRetrievingASingleValueForParameters()
$request->setHeaders($headers);
$this->assertSame($headers, $request->getHeaders());
$this->assertSame($h, $request->getHeaders()->get('foo'));

\error_reporting(E_ALL ^ \E_USER_DEPRECATED);
$this->assertSame($h, $request->getHeader('foo'));
\error_reporting(E_ALL);
}

public function testParameterRetrievalDefaultValue()
Expand All @@ -92,11 +104,14 @@ public function testParameterRetrievalDefaultValue()
$request->setFiles($p);

$default = 15;

\error_reporting(E_ALL ^ \E_USER_DEPRECATED);
$this->assertSame($default, $request->getQuery('baz', $default));
$this->assertSame($default, $request->getPost('baz', $default));
$this->assertSame($default, $request->getFiles('baz', $default));
$this->assertSame($default, $request->getHeaders('baz', $default));
$this->assertSame($default, $request->getHeader('baz', $default));
\error_reporting(E_ALL);
}

public function testRequestPersistsRawBody()
Expand Down Expand Up @@ -342,11 +357,17 @@ public function testGetHeadersDoesNotRaiseExceptionForInvalidHeaderLines()
$headers = $request->getHeaders();
$this->assertFalse($headers->has('User-Agent'));
$this->assertFalse($headers->get('User-Agent'));

\error_reporting(E_ALL ^ \E_USER_DEPRECATED);
$this->assertSame('bar-baz', $request->getHeader('User-Agent', 'bar-baz'));
\error_reporting(E_ALL);

$this->assertTrue($headers->has('useragent'));
$this->assertInstanceOf(GenericHeader::class, $headers->get('useragent'));
$this->assertSame('h4ckerbot', $headers->get('useragent')->getFieldValue());

\error_reporting(E_ALL ^ \E_USER_DEPRECATED);
$this->assertSame('h4ckerbot', $request->getHeader('useragent')->getFieldValue());
\error_reporting(E_ALL);
}
}