Skip to content

Fix memcache in doctrine, fix textarea field #25

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

Closed
wants to merge 2 commits into from
Closed

Fix memcache in doctrine, fix textarea field #25

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eebd651
Fix bug in Doctrine extension class. Now Memcache work correct. Befor…
WhiteOwlUk Oct 9, 2010
15310c9
Change method to data because $field has no method getDisplayedData
WhiteOwlUk Oct 9, 2010
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
Next Next commit
Fix bug in Doctrine extension class. Now Memcache work correct. Befor… 
…e call to a member function get on a none object. Because $cacheDriver is a string
  • Loading branch information
@WhiteOwlUk
WhiteOwlUk committed Oct 9, 2010
commit eebd6510981eef26dbc00e413002d8dfa74f02ad
14 changes: 8 additions & 6 deletions src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,17 +427,19 @@ protected function loadOrmEntityManagerResultCacheDriver(array $entityManager, C
protected function getEntityManagerCacheDefinition(array $entityManager, $cacheDriver, ContainerBuilder $container)
{
$type = is_array($cacheDriver) && isset($cacheDriver['type']) ? $cacheDriver['type'] : $cacheDriver;
if ($type === 'memcache') {
$memcacheClass = isset($cacheDriver['class']) ? $cacheDriver['class'] : '%'.sprintf('doctrine.orm.cache.%s_class', $type).'%';
if ($type === 'memcache' || $type === 'Memcache') {

$memcacheClass = (is_array($cacheDriver) && isset($cacheDriver['class'])) ? $cacheDriver['class'] : '%'.sprintf('doctrine.orm.cache.%s_class', strtolower($type)).'%';
$cacheDef = new Definition($memcacheClass);
$memcacheHost = isset($cacheDriver['host']) ? $cacheDriver['host'] : '%doctrine.orm.cache.memcache_host%';
$memcachePort = isset($cacheDriver['port']) ? $cacheDriver['port'] : '%doctrine.orm.cache.memcache_port%';
$memcacheInstanceClass = isset($cacheDriver['instance_class']) ? $cacheDriver['instance_class'] : '%doctrine.orm.cache.memcache_instance_class%';
$memcacheHost = (is_array($cacheDriver) && isset($cacheDriver['host'])) ? $cacheDriver['host'] : '%doctrine.orm.cache.memcache_host%';
$memcachePort = (is_array($cacheDriver) && isset($cacheDriver['host'])) ? $cacheDriver['port'] : '%doctrine.orm.cache.memcache_port%';
$memcacheInstanceClass = (is_array($cacheDrive) && isset($cacheDriver['instance_class'])) ? $cacheDriver['instance_class'] : '%doctrine.orm.cache.memcache_instance_class%';

$memcacheInstance = new Definition($memcacheInstanceClass);
$memcacheInstance->addMethodCall('connect', array($memcacheHost, $memcachePort));
$container->setDefinition(sprintf('doctrine.orm.%s_memcache_instance', $entityManager['name']), $memcacheInstance);
$cacheDef->addMethodCall('setMemcache', array(new Reference(sprintf('doctrine.orm.%s_memcache_instance', $entityManager['name']))));
} else {
}else {
$cacheDef = new Definition('%'.sprintf('doctrine.orm.cache.%s_class', $type).'%');
}
return $cacheDef;
Expand Down
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