From 2dc8c4f71b7a7491217ad693653c5a86133bd5ea Mon Sep 17 00:00:00 2001 From: Damien Pitard Date: Tue, 31 Aug 2010 19:09:29 +0200 Subject: [PATCH 1/2] fixed wrong test in FlattenException::getStatusCode() --- .../Component/HttpKernel/Exception/FlattenException.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php index 53a9dbe588efe..f1246235069bf 100644 --- a/src/Symfony/Component/HttpKernel/Exception/FlattenException.php +++ b/src/Symfony/Component/HttpKernel/Exception/FlattenException.php @@ -44,7 +44,9 @@ static public function create(\Exception $exception) public function getStatusCode() { - return $this->getClass() instanceof HttpException ? $this->getCode() : 500; + return $this->getClass() == 'Symfony\Component\HttpKernel\Exception\HttpException' || + is_subclass_of($this->getClass(), 'Symfony\Component\HttpKernel\Exception\HttpException') ? + $this->getCode():500; } public function getStatusText() From bc14b57d597d7b45683a5a997fbd16d93ca1e9fa Mon Sep 17 00:00:00 2001 From: Damien Pitard Date: Fri, 8 Oct 2010 21:26:35 +0200 Subject: [PATCH 2/2] set default annotation namespace to Doctrine\ORM\Mapping --- src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml index 2a01ae14d0f60..f80b62218b51e 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml +++ b/src/Symfony/Bundle/DoctrineBundle/Resources/config/orm.xml @@ -52,6 +52,9 @@ Doctrine\ORM\Mapping\ orm + + Doctrine\ORM\Mapping\ + @@ -64,4 +67,4 @@ %doctrine.orm.metadata_driver.mapping_dirs% - \ No newline at end of file + pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy