From 466e5b87b0d23657612c4804734d22a5bcf147a1 Mon Sep 17 00:00:00 2001 From: Inal DJAFAR Date: Tue, 25 Feb 2014 11:12:31 +0100 Subject: [PATCH 1/4] Add tests for RequestStack class --- .../HttpFoundation/Tests/RequestStackTest.php | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php new file mode 100644 index 0000000000..e26b806fd2 --- /dev/null +++ b/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php @@ -0,0 +1,69 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation\Tests; + +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\RequestStack; + +class RequestStackTest extends \PHPUnit_Framework_TestCase +{ + public function testGetCurrentRequest() + { + $requestStack = new RequestStack(); + $this->assertNull($requestStack->getCurrentRequest()); + + $request = Request::create('/foo'); + + $requestStack->push($request); + $this->assertSame($request, $requestStack->getCurrentRequest()); + + $this->assertSame($request, $requestStack->pop()); + $this->assertNull($requestStack->getCurrentRequest()); + + $this->assertNull($requestStack->pop()); + } + + public function testGetMasterRequest() + { + $requestStack = new RequestStack(); + $this->assertNull($requestStack->getMasterRequest()); + + $masterRequest = Request::create('/foo'); + $subRequest = Request::create('/bar'); + + $requestStack->push($masterRequest); + $requestStack->push($subRequest); + + $this->assertSame($masterRequest, $requestStack->getMasterRequest()); + } + + public function testGetParentRequest() + { + $requestStack = new RequestStack(); + $this->assertNull($requestStack->getParentRequest()); + + $masterRequest = Request::create('/foo'); + + $requestStack->push($masterRequest); + $this->assertNull($requestStack->getParentRequest()); + + $firstSubRequest = Request::create('/bar'); + + $requestStack->push($firstSubRequest); + $this->assertSame($masterRequest, $requestStack->getParentRequest()); + + $secondSubRequest = Request::create('/baz'); + + $requestStack->push($secondSubRequest); + $this->assertSame($firstSubRequest, $requestStack->getParentRequest()); + } +} From 7539e4197e5f823abcb253c83c47b5ea2fc6869c Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Mar 2014 08:21:33 +0100 Subject: [PATCH 2/4] [HttpKernel] fixed CS --- .../Profiler/MemcacheProfilerStorage.php | 14 ++++++-------- .../Profiler/MemcachedProfilerStorage.php | 14 ++++++-------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php index 2034a19db1..ad70b97b9b 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/MemcacheProfilerStorage.php @@ -11,8 +11,6 @@ namespace Symfony\Component\HttpKernel\Profiler; -use Memcache; - /** * Memcache Profiler Storage * @@ -21,14 +19,14 @@ use Memcache; class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage { /** - * @var Memcache + * @var \Memcache */ private $memcache; /** * Internal convenience method that returns the instance of the Memcache * - * @return Memcache + * @return \Memcache * * @throws \RuntimeException */ @@ -42,7 +40,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage $host = $matches[1] ?: $matches[2]; $port = $matches[3]; - $memcache = new Memcache(); + $memcache = new \Memcache(); $memcache->addServer($host, $port); $this->memcache = $memcache; @@ -54,7 +52,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage /** * Set instance of the Memcache * - * @param Memcache $memcache + * @param \Memcache $memcache */ public function setMemcache($memcache) { @@ -94,7 +92,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage if (method_exists($memcache, 'append')) { - //Memcache v3.0 + // Memcache v3.0 if (!$result = $memcache->append($key, $value, false, $expiration)) { return $memcache->set($key, $value, false, $expiration); } @@ -102,7 +100,7 @@ class MemcacheProfilerStorage extends BaseMemcacheProfilerStorage return $result; } - //simulate append in Memcache <3.0 + // simulate append in Memcache <3.0 $content = $memcache->get($key); return $memcache->set($key, $content.$value, false, $expiration); diff --git a/src/Symfony/Component/HttpKernel/Profiler/MemcachedProfilerStorage.php b/src/Symfony/Component/HttpKernel/Profiler/MemcachedProfilerStorage.php index 31f3136390..94a562694b 100644 --- a/src/Symfony/Component/HttpKernel/Profiler/MemcachedProfilerStorage.php +++ b/src/Symfony/Component/HttpKernel/Profiler/MemcachedProfilerStorage.php @@ -11,8 +11,6 @@ namespace Symfony\Component\HttpKernel\Profiler; -use Memcached; - /** * Memcached Profiler Storage * @@ -21,14 +19,14 @@ use Memcached; class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage { /** - * @var Memcached + * @var \Memcached */ private $memcached; /** * Internal convenience method that returns the instance of the Memcached * - * @return Memcached + * @return \Memcached * * @throws \RuntimeException */ @@ -42,10 +40,10 @@ class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage $host = $matches[1] ?: $matches[2]; $port = $matches[3]; - $memcached = new Memcached(); + $memcached = new \Memcached(); - //disable compression to allow appending - $memcached->setOption(Memcached::OPT_COMPRESSION, false); + // disable compression to allow appending + $memcached->setOption(\Memcached::OPT_COMPRESSION, false); $memcached->addServer($host, $port); @@ -58,7 +56,7 @@ class MemcachedProfilerStorage extends BaseMemcacheProfilerStorage /** * Set instance of the Memcached * - * @param Memcached $memcached + * @param \Memcached $memcached */ public function setMemcached($memcached) { From 60ed3880d70b3051ba6b6de30c2b7737ad3ea46e Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Mar 2014 08:33:02 +0100 Subject: [PATCH 3/4] [HttpFoundation] removed test file not related to 2.3 --- .../HttpFoundation/Tests/RequestStackTest.php | 69 ------------------- 1 file changed, 69 deletions(-) delete mode 100644 src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php deleted file mode 100644 index e26b806fd2..0000000000 --- a/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php +++ /dev/null @@ -1,69 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Symfony\Component\HttpFoundation\Tests; - -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RequestStack; - -class RequestStackTest extends \PHPUnit_Framework_TestCase -{ - public function testGetCurrentRequest() - { - $requestStack = new RequestStack(); - $this->assertNull($requestStack->getCurrentRequest()); - - $request = Request::create('/foo'); - - $requestStack->push($request); - $this->assertSame($request, $requestStack->getCurrentRequest()); - - $this->assertSame($request, $requestStack->pop()); - $this->assertNull($requestStack->getCurrentRequest()); - - $this->assertNull($requestStack->pop()); - } - - public function testGetMasterRequest() - { - $requestStack = new RequestStack(); - $this->assertNull($requestStack->getMasterRequest()); - - $masterRequest = Request::create('/foo'); - $subRequest = Request::create('/bar'); - - $requestStack->push($masterRequest); - $requestStack->push($subRequest); - - $this->assertSame($masterRequest, $requestStack->getMasterRequest()); - } - - public function testGetParentRequest() - { - $requestStack = new RequestStack(); - $this->assertNull($requestStack->getParentRequest()); - - $masterRequest = Request::create('/foo'); - - $requestStack->push($masterRequest); - $this->assertNull($requestStack->getParentRequest()); - - $firstSubRequest = Request::create('/bar'); - - $requestStack->push($firstSubRequest); - $this->assertSame($masterRequest, $requestStack->getParentRequest()); - - $secondSubRequest = Request::create('/baz'); - - $requestStack->push($secondSubRequest); - $this->assertSame($firstSubRequest, $requestStack->getParentRequest()); - } -} From 91ceddcb429b286a2955ebc25a5e9970a6f8fdf4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 4 Mar 2014 08:36:26 +0100 Subject: [PATCH 4/4] Revert "[HttpFoundation] removed test file not related to 2.3" This reverts commit 60ed3880d70b3051ba6b6de30c2b7737ad3ea46e. --- .../HttpFoundation/Tests/RequestStackTest.php | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php diff --git a/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php b/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php new file mode 100644 index 0000000000..e26b806fd2 --- /dev/null +++ b/src/Symfony/Component/HttpFoundation/Tests/RequestStackTest.php @@ -0,0 +1,69 @@ + + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Symfony\Component\HttpFoundation\Tests; + +use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\HttpFoundation\RequestStack; + +class RequestStackTest extends \PHPUnit_Framework_TestCase +{ + public function testGetCurrentRequest() + { + $requestStack = new RequestStack(); + $this->assertNull($requestStack->getCurrentRequest()); + + $request = Request::create('/foo'); + + $requestStack->push($request); + $this->assertSame($request, $requestStack->getCurrentRequest()); + + $this->assertSame($request, $requestStack->pop()); + $this->assertNull($requestStack->getCurrentRequest()); + + $this->assertNull($requestStack->pop()); + } + + public function testGetMasterRequest() + { + $requestStack = new RequestStack(); + $this->assertNull($requestStack->getMasterRequest()); + + $masterRequest = Request::create('/foo'); + $subRequest = Request::create('/bar'); + + $requestStack->push($masterRequest); + $requestStack->push($subRequest); + + $this->assertSame($masterRequest, $requestStack->getMasterRequest()); + } + + public function testGetParentRequest() + { + $requestStack = new RequestStack(); + $this->assertNull($requestStack->getParentRequest()); + + $masterRequest = Request::create('/foo'); + + $requestStack->push($masterRequest); + $this->assertNull($requestStack->getParentRequest()); + + $firstSubRequest = Request::create('/bar'); + + $requestStack->push($firstSubRequest); + $this->assertSame($masterRequest, $requestStack->getParentRequest()); + + $secondSubRequest = Request::create('/baz'); + + $requestStack->push($secondSubRequest); + $this->assertSame($firstSubRequest, $requestStack->getParentRequest()); + } +}