From 4ad12b76b4a1dafecb6c7a91f57675b59ae7e862 Mon Sep 17 00:00:00 2001 From: "Nathanael d. Noblet" Date: Thu, 8 Jul 2010 15:39:25 -0600 Subject: [PATCH 1/2] fix output file name --- .../Command/ConvertDoctrine1SchemaDoctrineCommand.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Framework/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php b/src/Symfony/Framework/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php index 2e2d9eba6840d..65b01145fdcaf 100644 --- a/src/Symfony/Framework/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php +++ b/src/Symfony/Framework/DoctrineBundle/Command/ConvertDoctrine1SchemaDoctrineCommand.php @@ -80,6 +80,11 @@ protected function execute(InputInterface $input, OutputInterface $output) $destPath .= '/Resources/config/doctrine/metadata'; } + // adjust so file naming works + if ($type === 'yaml') { + $type = 'yml'; + } + $cme = new ClassMetadataExporter(); $exporter = $cme->getExporter($type); @@ -99,7 +104,7 @@ protected function execute(InputInterface $input, OutputInterface $output) if ($type === 'annotation') { $path = $destPath.'/'.$className.'.php'; } else { - $path = $destPath.'/'.str_replace('\\', '.', $class->name).'.dcm.xml'; + $path = $destPath.'/'.str_replace('\\', '.', $class->name).'.dcm.'.$type; } $output->writeln(sprintf(' > writing %s', $path)); $code = $exporter->exportClassMetadata($class); @@ -109,4 +114,4 @@ protected function execute(InputInterface $input, OutputInterface $output) $output->writeln('Database does not have any mapping information.'.PHP_EOL, 'ERROR'); } } -} \ No newline at end of file +} From b1c2a9d9c3c9786f3e731e652047f44b3c0bfb54 Mon Sep 17 00:00:00 2001 From: "Nathanael D. Noblet" Date: Fri, 6 Sep 2013 10:44:53 -0600 Subject: [PATCH 2/2] don't pass the http scheme and host as the uri is signed without it --- .../Component/HttpKernel/EventListener/FragmentListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php index ef3fad3d4cfe4..7b3b3d49ad8fc 100644 --- a/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php +++ b/src/Symfony/Component/HttpKernel/EventListener/FragmentListener.php @@ -86,7 +86,7 @@ protected function validateRequest(Request $request) // is the Request signed? // we cannot use $request->getUri() here as we want to work with the original URI (no query string reordering) - if ($this->signer->check($request->getSchemeAndHttpHost().$request->getBaseUrl().$request->getPathInfo().(null !== ($qs = $request->server->get('QUERY_STRING')) ? '?'.$qs : ''))) { + if ($this->signer->check($request->getBaseUrl().$request->getPathInfo().(null !== ($qs = $request->server->get('QUERY_STRING')) ? '?'.$qs : ''))) { return; } 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